实付配置添加：6:会员业务（积分折扣（商品）、等级折扣（商品））

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataActuallyPaidConfig.java

@@ -30,6 +30,11 @@ public class DataActuallyPaidConfig implements Serializable{
     private Integer performanceCount;
 
     /**
+     * 会员业务（积分折扣（商品）、等级折扣（商品）
+     */
+    private Integer memberBusinessOfGoods;
+
+    /**
      * 是否已经配置过会员业务
      */
     private boolean hasConfigMemberBusiness;
@@ -82,4 +87,13 @@ public class DataActuallyPaidConfig implements Serializable{
         this.hasConfigPerformanceCount = hasConfigPerformanceCount;
         return this;
     }
+
+    public Integer getMemberBusinessOfGoods() {
+        return memberBusinessOfGoods;
+    }
+
+    public DataActuallyPaidConfig setMemberBusinessOfGoods(Integer memberBusinessOfGoods) {
+        this.memberBusinessOfGoods = memberBusinessOfGoods;
+        return this;
+    }
 }

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataActuallyPaidConfigDTO.java

@@ -24,7 +24,7 @@ public class DataActuallyPaidConfigDTO implements Serializable{
     private Integer enterpriseId;
 
     /**
-     * 1:会员业务（积分计算）2:会员业务（等级升降条件（如单笔消费满XX元、当天消费满XX元）3:基础业绩 4:会员消费 5:单效
+     * 1:会员业务（积分计算）2:会员业务（等级升降条件（如单笔消费满XX元、当天消费满XX元）3:基础业绩 4:会员消费 5:单效 6:会员业务（积分折扣（商品）、等级折扣（商品））
      */
     private Integer classify;
 

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/DataConfigApiService.java

@@ -56,11 +56,12 @@ public interface DataConfigApiService {
      * @Description:
     
* @author guojuxing
      * @param enterpriseId
-     * @param memberBusiness 会员业务 1：开启 0:关闭 null则不变化会员业务
-     * @param performanceCount
业绩统计 1：开启 0：关闭 null则不变化业绩统计配置
+     * @param memberBusiness 会员业务 1：开启 0:关闭
+     * @param performanceCount
业绩统计 1：开启 0：关闭
+     * @param memberBusinessOfGoods 会员业务 （积分折扣（商品）、等级折扣（商品））1：开启 0：关闭
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

     
*/
-    ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount);
+    ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount, Integer memberBusinessOfGoods);
 
     /**
      * 是否已经配置过会员业务（实付）

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java

@@ -123,32 +123,36 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
     }
 
     @Override
-    public ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount) {
+    public ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount, Integer memberBusinessOfGoods) {
         List<DataActuallyPaidConfigDTO> list = new ArrayList<>(5);
-        if (memberBusiness != null) {
-            list.add(new DataActuallyPaidConfigDTO()
-                    .setEnterpriseId(enterpriseId)
-                    .setClassify(1)
-                    .setConfigStatus(memberBusiness));
-            list.add(new DataActuallyPaidConfigDTO()
-                    .setEnterpriseId(enterpriseId)
-                    .setClassify(2)
-                    .setConfigStatus(memberBusiness));
-        }
-        if (performanceCount != null) {
-            list.add(new DataActuallyPaidConfigDTO()
-                    .setEnterpriseId(enterpriseId)
-                    .setClassify(3)
-                    .setConfigStatus(performanceCount));
-            list.add(new DataActuallyPaidConfigDTO()
-                    .setEnterpriseId(enterpriseId)
-                    .setClassify(4)
-                    .setConfigStatus(performanceCount));
-            list.add(new DataActuallyPaidConfigDTO()
-                    .setEnterpriseId(enterpriseId)
-                    .setClassify(5)
-                    .setConfigStatus(performanceCount));
+        boolean isRight = enterpriseId != null && memberBusiness != null && performanceCount != null && memberBusinessOfGoods != null;
+        if (!isRight) {
+            ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数不能为空");
         }
+        list.add(new DataActuallyPaidConfigDTO()
+                .setEnterpriseId(enterpriseId)
+                .setClassify(1)
+                .setConfigStatus(memberBusiness));
+        list.add(new DataActuallyPaidConfigDTO()
+                .setEnterpriseId(enterpriseId)
+                .setClassify(2)
+                .setConfigStatus(memberBusiness));
+        list.add(new DataActuallyPaidConfigDTO()
+                .setEnterpriseId(enterpriseId)
+                .setClassify(3)
+                .setConfigStatus(performanceCount));
+        list.add(new DataActuallyPaidConfigDTO()
+                .setEnterpriseId(enterpriseId)
+                .setClassify(4)
+                .setConfigStatus(performanceCount));
+        list.add(new DataActuallyPaidConfigDTO()
+                .setEnterpriseId(enterpriseId)
+                .setClassify(5)
+                .setConfigStatus(performanceCount));
+        list.add(new DataActuallyPaidConfigDTO()
+                .setEnterpriseId(enterpriseId)
+                .setClassify(6)
+                .setConfigStatus(memberBusinessOfGoods));
 
         return configActuallyPaid(list);
     }
@@ -182,14 +186,16 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
             //如果没有配置，默认数据
             Integer memberBusiness = map.get("1");
             Integer performanceCount = map.get("3");
+            Integer memberBusinessOfGoods = map.get("6");
             return ServiceResponse.success(new DataActuallyPaidConfig()
                     .setEnterpriseId(enterpriseId)
                     .setMemberBusiness(memberBusiness)
                     .setPerformanceCount(performanceCount)
                     .setHasConfigMemberBusiness(dataActuallyPaidConfigService.count(enterpriseId, 1) > 0)
-                    .setHasConfigPerformanceCount(dataActuallyPaidConfigService.count(enterpriseId, 3) > 0));
+                    .setHasConfigPerformanceCount(dataActuallyPaidConfigService.count(enterpriseId, 3) > 0)
+                    .setMemberBusinessOfGoods(memberBusinessOfGoods));
         }
-        return ServiceResponse.success(new DataActuallyPaidConfig().setEnterpriseId(enterpriseId).setMemberBusiness(0).setPerformanceCount(0));
+        return ServiceResponse.success(new DataActuallyPaidConfig().setEnterpriseId(enterpriseId).setMemberBusiness(0).setPerformanceCount(0).setMemberBusinessOfGoods(0));
     }
 
     @Override

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DataConfigController.java

@@ -187,6 +187,7 @@ public class DataConfigController {
                 .getMemberConsumeConfigByEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()), MemberConsumeConfigVO.class);
     }
 
+    @Deprecated
     @RequestMapping("/config-actually-paid")
     public RestResponse configActuallyPaid(String jsonArr) {
         if (StringUtil.isBlank(jsonArr)) {
@@ -200,10 +201,11 @@ public class DataConfigController {
                 UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
     }
 
+    @Deprecated
     @RequestMapping("/config-actually-paid-new")
-    public RestResponse configActuallyPaidNew(Integer memberBusiness, Integer performanceCount) {
+    public RestResponse configActuallyPaidNew(Integer memberBusiness, Integer performanceCount, Integer memberBusinessOfGoods) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        return OperationResultUtils.operationResult(dataConfigApiService.configActuallyPaid(enterpriseId, memberBusiness, performanceCount),
+        return OperationResultUtils.operationResult(dataConfigApiService.configActuallyPaid(enterpriseId, memberBusiness, performanceCount, memberBusinessOfGoods),
                 OperationResultUtils.LOG_EDIT + "数据统计配置-实付配置",
                 UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
     }