Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

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

@@ -52,17 +52,6 @@ public class DataActuallyPaidConfigDTO implements Serializable{
 
     }
 
-    private static int count = 1;
-    public DataActuallyPaidConfigDTO(int classify) {
-        this.classify = classify;
-        //默认关闭
-        this.configStatus = 0;
-    }
-
-    public static DataActuallyPaidConfigDTO build() {
-        return new DataActuallyPaidConfigDTO(count++);
-    }
-
     public Integer getActuallyPaidConfigId() {
         return actuallyPaidConfigId;
     }

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

@@ -31,4 +31,14 @@ public interface DataConfigApiService {
 
     ServiceResponse<List<DataActuallyPaidConfigDTO>> listActuallyPaidConfig(Integer enterpriseId);
 
+    /**
+     * 新增商户的时候设置实付配置默认数据
+     * @Title: initActuallyPaidData

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
*/
+    ServiceResponse<Void> initActuallyPaidData(Integer enterpriseId);
+
 }

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

 package com.gic.enterprise.service.outer.impl;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
@@ -11,15 +19,6 @@ import com.gic.enterprise.service.DataActuallyPaidConfigService;
 import com.gic.enterprise.service.DataConfigApiService;
 import com.gic.enterprise.service.DataMemberConsumeConfigService;
 import com.gic.enterprise.service.DataWechatMemberConfigService;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service("dataConfigApiService")
 public class DataConfigApiServiceImpl implements DataConfigApiService {
@@ -76,9 +75,21 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
         List<TabDataActuallyPaidConfig> list = dataActuallyPaidConfigService.listByEnterpriseId(enterpriseId);
         if (CollectionUtils.isEmpty(list)) {
             //如果没有配置，默认数据
-            return ServiceResponse.success(Stream.generate(DataActuallyPaidConfigDTO::build)
-            .limit(5).collect(Collectors.toList()));
+            return ServiceResponse.success(EntityUtil.changeEntityListNew(DataActuallyPaidConfigDTO.class,
+                    dataActuallyPaidConfigService.listByEnterpriseId(-1)));
         }
         return ServiceResponse.success(EntityUtil.changeEntityListNew(DataActuallyPaidConfigDTO.class, list));
     }
+
+    @Override
+    public ServiceResponse<Void> initActuallyPaidData(Integer enterpriseId) {
+        List<TabDataActuallyPaidConfig> list = dataActuallyPaidConfigService.listByEnterpriseId(-1);
+        list = list
+                .stream()
+                .map(e -> e.setEnterpriseId(enterpriseId))
+                .map(e -> e.setActuallyPaidConfigId(null))
+                .collect(Collectors.toList());
+        configActuallyPaid(EntityUtil.changeEntityListNew(DataActuallyPaidConfigDTO.class, list));
+        return ServiceResponse.success();
+    }
 }

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

@@ -83,6 +83,8 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     private BusinessFrontResApiService businessFrontResApiService;
     @Autowired
     private PushMessageApiService pushMessageApiService;
+    @Autowired
+    private DataConfigApiService dataConfigApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -142,6 +144,9 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         //初始化计费中心账户
         billingAccountService.createBillingAccount(enterpriseId);
 
+        //数据配置：实付配置默认数据
+        dataConfigApiService.initActuallyPaidData(enterpriseId);
+
         UserDTO userDTO = EntityUtil.changeEntityNew(UserDTO.class, enterpriseDTO);
         //新增超级管理员
         userDTO.setEnterpriseId(enterpriseId);

gic-platform-enterprise-service/src/main/resources/mapper/TabDataActuallyPaidConfigMapper.xml

@@ -124,10 +124,10 @@
     order by classify
   </select>
 
-  <select id="delete" resultType="int">
+  <update id="delete">
     update tab_data_actually_paid_config set status = 0
     where enterprise_id = #{enterpriseId}
     and classify = #{classify}
     and status = 1
-  </select>
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.commons.util.StringUtil;
 import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.web.vo.data.ActuallyPaidConfigVO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +62,6 @@ public class DataConfigController {
     @RequestMapping("/get-actually-paid-config")
     public RestResponse getActuallyPaidConfig() {
         return ResultControllerUtils.commonResult(dataConfigApiService
-                .listActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
+                .listActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()), ActuallyPaidConfigVO.class);
     }
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/data/ActuallyPaidConfigVO.java

+package com.gic.enterprise.web.vo.data;
+
+import java.io.Serializable;
+/**
+ * 实付配置
+ * @ClassName: ActuallyPaidConfigVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/4/20 9:36 AM

+ */
+public class ActuallyPaidConfigVO implements Serializable{
+    private static final long serialVersionUID = -8440208273270132555L;
+
+    /**
+     * 1:会员业务（积分计算）2:会员业务（等级升降条件（如单笔消费满XX元、当天消费满XX元）3:基础业绩 4:会员消费 5:单效
+     */
+    private Integer classify;
+
+    /**
+     * 1:已配置 默认全关，走应付流程
+     */
+    private Integer configStatus;
+
+    public Integer getClassify() {
+        return classify;
+    }
+
+    public ActuallyPaidConfigVO setClassify(Integer classify) {
+        this.classify = classify;
+        return this;
+    }
+
+    public Integer getConfigStatus() {
+        return configStatus;
+    }
+
+    public ActuallyPaidConfigVO setConfigStatus(Integer configStatus) {
+        this.configStatus = configStatus;
+        return this;
+    }
+}