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

+package com.gic.enterprise.dto.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 实付配置
+ * @ClassName: DataActuallyPaidConfigDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/4/17 10:27 AM

+ */
+public class DataActuallyPaidConfigDTO implements Serializable{
+    private static final long serialVersionUID = -5443298335953111361L;
+
+    /**
+     *
+     */
+    private Integer actuallyPaidConfigId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 1:会员业务（积分计算）2:会员业务（等级升降条件（如单笔消费满XX元、当天消费满XX元）3:基础业绩 4:会员消费 5:单效
+     */
+    private Integer classify;
+
+    /**
+     * 1:已配置 默认全关，走应付流程
+     */
+    private Integer configStatus;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public DataActuallyPaidConfigDTO() {
+
+    }
+
+    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;
+    }
+
+    public DataActuallyPaidConfigDTO setActuallyPaidConfigId(Integer actuallyPaidConfigId) {
+        this.actuallyPaidConfigId = actuallyPaidConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public DataActuallyPaidConfigDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getClassify() {
+        return classify;
+    }
+
+    public DataActuallyPaidConfigDTO setClassify(Integer classify) {
+        this.classify = classify;
+        return this;
+    }
+
+    public Integer getConfigStatus() {
+        return configStatus;
+    }
+
+    public DataActuallyPaidConfigDTO setConfigStatus(Integer configStatus) {
+        this.configStatus = configStatus;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public DataActuallyPaidConfigDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DataActuallyPaidConfigDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public DataActuallyPaidConfigDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}

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

+package com.gic.enterprise.dto.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 微信会员配置
+ * @ClassName: DataWechatMemberConfigDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/4/17 9:47 AM

+ */
+public class DataWechatMemberConfigDTO implements Serializable{
+    private static final long serialVersionUID = 1683486475553056809L;
+
+    /**
+     *
+     */
+    private Integer wechatMemberConfigId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 会员卡ID
+     */
+    private String memberCardArea;
+
+    /**
+     * 关联服务号，可以多选，英文逗号给开
+     */
+    private String relateService;
+
+    /**
+     * 关联小程序，可以多选，英文逗号隔开，与关联服务号是或的关系
+     */
+    private String relateWechat;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getWechatMemberConfigId() {
+        return wechatMemberConfigId;
+    }
+
+    public DataWechatMemberConfigDTO setWechatMemberConfigId(Integer wechatMemberConfigId) {
+        this.wechatMemberConfigId = wechatMemberConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public DataWechatMemberConfigDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public String getMemberCardArea() {
+        return memberCardArea;
+    }
+
+    public DataWechatMemberConfigDTO setMemberCardArea(String memberCardArea) {
+        this.memberCardArea = memberCardArea;
+        return this;
+    }
+
+    public String getRelateService() {
+        return relateService;
+    }
+
+    public DataWechatMemberConfigDTO setRelateService(String relateService) {
+        this.relateService = relateService;
+        return this;
+    }
+
+    public String getRelateWechat() {
+        return relateWechat;
+    }
+
+    public DataWechatMemberConfigDTO setRelateWechat(String relateWechat) {
+        this.relateWechat = relateWechat;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public DataWechatMemberConfigDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DataWechatMemberConfigDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public DataWechatMemberConfigDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}

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

 package com.gic.enterprise.service;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
 import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
 
+import java.util.List;
+
 public interface DataConfigApiService {
     /**
      * 会员消费配置
@@ -15,4 +18,17 @@ public interface DataConfigApiService {
     ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto);
 
     ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId);
+
+    /**
+     * 新增
+     * @Title: configActuallyPaid

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

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

+    
*/
+    ServiceResponse<Void> configActuallyPaid(List<DataActuallyPaidConfigDTO> dtoList);
+
+    ServiceResponse<List<DataActuallyPaidConfigDTO>> listActuallyPaidConfig(Integer enterpriseId);
+
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabDataActuallyPaidConfigMapper.java

+package com.gic.enterprise.dao.mapper;
+
+import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TabDataActuallyPaidConfigMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param actuallyPaidConfigId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer actuallyPaidConfigId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabDataActuallyPaidConfig record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabDataActuallyPaidConfig record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param actuallyPaidConfigId 主键
+     * @return 实体对象
+     */
+    TabDataActuallyPaidConfig selectByPrimaryKey(Integer actuallyPaidConfigId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabDataActuallyPaidConfig record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabDataActuallyPaidConfig record);
+
+    List<TabDataActuallyPaidConfig> listByEnterpriseId(Integer enterpriseId);
+
+    int delete(@Param("enterpriseId") Integer enterpriseId, @Param("classify") Integer classify);
+}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabDataWechatMemberConfigMapper.java

+package com.gic.enterprise.dao.mapper;
+
+import com.gic.enterprise.entity.TabDataWechatMemberConfig;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TabDataWechatMemberConfigMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param wechatMemberConfigId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer wechatMemberConfigId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabDataWechatMemberConfig record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabDataWechatMemberConfig record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param wechatMemberConfigId 主键
+     * @return 实体对象
+     */
+    TabDataWechatMemberConfig selectByPrimaryKey(Integer wechatMemberConfigId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabDataWechatMemberConfig record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabDataWechatMemberConfig record);
+
+    TabDataWechatMemberConfig getByMemberCardId(@Param("enterpriseId") Integer enterpriseId, @Param("memberCardId") String memberCardId);
+
+    List<TabDataWechatMemberConfig> listByEnterpriseId(Integer enterpriseId);
+}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataActuallyPaidConfig.java

+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_data_actually_paid_config
+ */
+public class TabDataActuallyPaidConfig {
+    /**
+     * 
+     */
+    private Integer actuallyPaidConfigId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 1:会员业务（积分计算）2:会员业务（等级升降条件（如单笔消费满XX元、当天消费满XX元）3:基础业绩 4:会员消费 5:单效
+     */
+    private Integer classify;
+
+    /**
+     * 1:已配置 默认全关，走应付流程
+     */
+    private Integer configStatus;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getActuallyPaidConfigId() {
+        return actuallyPaidConfigId;
+    }
+
+    public TabDataActuallyPaidConfig setActuallyPaidConfigId(Integer actuallyPaidConfigId) {
+        this.actuallyPaidConfigId = actuallyPaidConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabDataActuallyPaidConfig setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getClassify() {
+        return classify;
+    }
+
+    public TabDataActuallyPaidConfig setClassify(Integer classify) {
+        this.classify = classify;
+        return this;
+    }
+
+    public Integer getConfigStatus() {
+        return configStatus;
+    }
+
+    public TabDataActuallyPaidConfig setConfigStatus(Integer configStatus) {
+        this.configStatus = configStatus;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public TabDataActuallyPaidConfig setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabDataActuallyPaidConfig setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabDataActuallyPaidConfig setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataWechatMemberConfig.java

+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_data_wechat_member_config
+ */
+public class TabDataWechatMemberConfig {
+    /**
+     * 
+     */
+    private Integer wechatMemberConfigId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 会员卡ID
+     */
+    private String memberCardArea;
+
+    /**
+     * 关联服务号，可以多选，英文逗号给开
+     */
+    private String relateService;
+
+    /**
+     * 关联小程序，可以多选，英文逗号隔开，与关联服务号是或的关系
+     */
+    private String relateWechat;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getWechatMemberConfigId() {
+        return wechatMemberConfigId;
+    }
+
+    public TabDataWechatMemberConfig setWechatMemberConfigId(Integer wechatMemberConfigId) {
+        this.wechatMemberConfigId = wechatMemberConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabDataWechatMemberConfig setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public String getMemberCardArea() {
+        return memberCardArea;
+    }
+
+    public TabDataWechatMemberConfig setMemberCardArea(String memberCardArea) {
+        this.memberCardArea = memberCardArea;
+        return this;
+    }
+
+    public String getRelateService() {
+        return relateService;
+    }
+
+    public TabDataWechatMemberConfig setRelateService(String relateService) {
+        this.relateService = relateService;
+        return this;
+    }
+
+    public String getRelateWechat() {
+        return relateWechat;
+    }
+
+    public TabDataWechatMemberConfig setRelateWechat(String relateWechat) {
+        this.relateWechat = relateWechat;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public TabDataWechatMemberConfig setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabDataWechatMemberConfig setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabDataWechatMemberConfig setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataActuallyPaidConfigService.java

+package com.gic.enterprise.service;
+
+import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
+import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
+
+import java.util.List;
+
+public interface DataActuallyPaidConfigService {
+
+    /**
+     * 新增实付配置
+     * @Title: saveActuallyPaidConfig

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

+     * @return  java.lang.Integer

+    
*/
+    Integer saveActuallyPaidConfig(DataActuallyPaidConfigDTO dto);
+
+    /**
+     * @Title: listByEnterpriseId

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

+     * @return  java.util.List<com.gic.enterprise.entity.TabDataActuallyPaidConfig>

+    
*/
+    List<TabDataActuallyPaidConfig> listByEnterpriseId(Integer enterpriseId);
+
+    /**
+     * 逻辑删除
+     * @Title: delete

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

+     * @return  int

+    
*/
+    int delete(Integer enterpriseId, Integer classify);
+}

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataWechatMemberConfigService.java

+package com.gic.enterprise.service;
+
+import com.gic.enterprise.dto.data.DataWechatMemberConfigDTO;
+import com.gic.enterprise.entity.TabDataWechatMemberConfig;
+
+import java.util.List;
+
+public interface DataWechatMemberConfigService {
+
+    /**
+     * 新增微信会员配置
+     * @Title: saveWechatMemberConfig

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

+     * @return  java.lang.Integer

+    
*/
+    Integer saveWechatMemberConfig(DataWechatMemberConfigDTO dto);
+
+    /**
+     *
+     * @Title: getByMemberCardId

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param memberCardId
会员卡ID
+     * @return  com.gic.enterprise.entity.TabDataWechatMemberConfig

+    
*/
+    TabDataWechatMemberConfig getByMemberCardId(Integer enterpriseId, String memberCardId);
+
+    List<TabDataWechatMemberConfig> listByEnterpriseId(Integer enterpriseId);
+}

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

+package com.gic.enterprise.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.dao.mapper.TabDataActuallyPaidConfigMapper;
+import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
+import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
+import com.gic.enterprise.service.DataActuallyPaidConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("dataActuallyPaidConfigService")
+public class DataActuallyPaidConfigServiceImpl implements DataActuallyPaidConfigService{
+    @Autowired
+    private TabDataActuallyPaidConfigMapper tabDataActuallyPaidConfigMapper;
+
+    @Override
+    public Integer saveActuallyPaidConfig(DataActuallyPaidConfigDTO dto) {
+        Date now = new Date();
+        dto.setCreateTime(now);
+        dto.setUpdateTime(now);
+        dto.setStatus(1);
+        TabDataActuallyPaidConfig record = EntityUtil.changeEntityNew(TabDataActuallyPaidConfig.class, dto);
+        tabDataActuallyPaidConfigMapper.insert(record);
+        return record.getActuallyPaidConfigId();
+    }
+
+    @Override
+    public List<TabDataActuallyPaidConfig> listByEnterpriseId(Integer enterpriseId) {
+        return tabDataActuallyPaidConfigMapper.listByEnterpriseId(enterpriseId);
+    }
+
+    @Override
+    public int delete(Integer enterpriseId, Integer classify) {
+        return tabDataActuallyPaidConfigMapper.delete(enterpriseId, classify);
+    }
+}

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

+package com.gic.enterprise.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.dao.mapper.TabDataWechatMemberConfigMapper;
+import com.gic.enterprise.dto.data.DataWechatMemberConfigDTO;
+import com.gic.enterprise.entity.TabDataWechatMemberConfig;
+import com.gic.enterprise.service.DataWechatMemberConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("dataWechatMemberConfigService")
+public class DataWechatMemberConfigServiceImpl implements DataWechatMemberConfigService{
+    @Autowired
+    private TabDataWechatMemberConfigMapper tabDataWechatMemberConfigMapper;
+
+    @Override
+    public Integer saveWechatMemberConfig(DataWechatMemberConfigDTO dto) {
+        Date now = new Date();
+        dto.setCreateTime(now);
+        dto.setUpdateTime(now);
+        dto.setStatus(1);
+        TabDataWechatMemberConfig record = EntityUtil.changeEntityNew(TabDataWechatMemberConfig.class, dto);
+        tabDataWechatMemberConfigMapper.insert(record);
+        return record.getWechatMemberConfigId();
+    }
+
+    @Override
+    public TabDataWechatMemberConfig getByMemberCardId(Integer enterpriseId, String memberCardId) {
+        return tabDataWechatMemberConfigMapper.getByMemberCardId(enterpriseId, memberCardId);
+    }
+
+    @Override
+    public List<TabDataWechatMemberConfig> listByEnterpriseId(Integer enterpriseId) {
+        return tabDataWechatMemberConfigMapper.listByEnterpriseId(enterpriseId);
+    }
+}

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

@@ -2,18 +2,33 @@ package com.gic.enterprise.service.outer.impl;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
 import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
+import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
 import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
 import com.gic.enterprise.error.ErrorCode;
+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 {
     @Autowired
     private DataMemberConsumeConfigService dataMemberConsumeConfigService;
+    @Autowired
+    private DataWechatMemberConfigService dataWechatMemberConfigService;
+    @Autowired
+    private DataActuallyPaidConfigService dataActuallyPaidConfigService;
 
     @Override
     public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
@@ -39,4 +54,31 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
         }
         return ServiceResponse.success(EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, record));
     }
+
+    @Override
+    public ServiceResponse<Void> configActuallyPaid(List<DataActuallyPaidConfigDTO> dtoList) {
+        if (CollectionUtils.isEmpty(dtoList)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "实付配置内容为空");
+        }
+        for (DataActuallyPaidConfigDTO dto : dtoList) {
+            if (dto.getClassify() == null) {
+                dto.setClassify(1);
+            }
+            dataActuallyPaidConfigService.delete(dto.getEnterpriseId(), dto.getClassify());
+            dto.setConfigStatus(Optional.ofNullable(dto.getConfigStatus()).orElse(0));
+            dataActuallyPaidConfigService.saveActuallyPaidConfig(dto);
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<List<DataActuallyPaidConfigDTO>> listActuallyPaidConfig(Integer enterpriseId) {
+        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, list));
+    }
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.enterprise.dao.mapper.TabDataActuallyPaidConfigMapper">
+  <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
+    <id column="actually_paid_config_id" jdbcType="INTEGER" property="actuallyPaidConfigId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="classify" jdbcType="INTEGER" property="classify" />
+    <result column="config_status" jdbcType="INTEGER" property="configStatus" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    actually_paid_config_id, enterprise_id, classify, config_status, status, create_time, 
+    update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_data_actually_paid_config
+    where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_data_actually_paid_config
+    where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig" useGeneratedKeys="true" keyProperty="actuallyPaidConfigId">
+    insert into tab_data_actually_paid_config (actually_paid_config_id, enterprise_id, 
+      classify, config_status, status, 
+      create_time, update_time)
+    values (#{actuallyPaidConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{classify,jdbcType=INTEGER}, #{configStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
+    insert into tab_data_actually_paid_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="actuallyPaidConfigId != null">
+        actually_paid_config_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="classify != null">
+        classify,
+      </if>
+      <if test="configStatus != null">
+        config_status,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="actuallyPaidConfigId != null">
+        #{actuallyPaidConfigId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null">
+        #{classify,jdbcType=INTEGER},
+      </if>
+      <if test="configStatus != null">
+        #{configStatus,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
+    update tab_data_actually_paid_config
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null">
+        classify = #{classify,jdbcType=INTEGER},
+      </if>
+      <if test="configStatus != null">
+        config_status = #{configStatus,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
+    update tab_data_actually_paid_config
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      classify = #{classify,jdbcType=INTEGER},
+      config_status = #{configStatus,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
+  </update>
+
+  <select id="listByEnterpriseId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_data_actually_paid_config
+    where enterprise_id = #{enterpriseId}
+    and status = 1
+    order by classify
+  </select>
+
+  <select id="delete" resultType="int">
+    update tab_data_actually_paid_config set status = 0
+    where enterprise_id = #{enterpriseId}
+    and classify = #{classify}
+    and status = 1
+  </select>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.enterprise.dao.mapper.TabDataWechatMemberConfigMapper">
+  <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataWechatMemberConfig">
+    <id column="wechat_member_config_id" jdbcType="INTEGER" property="wechatMemberConfigId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="member_card_area" jdbcType="VARCHAR" property="memberCardArea" />
+    <result column="relate_service" jdbcType="VARCHAR" property="relateService" />
+    <result column="relate_wechat" jdbcType="VARCHAR" property="relateWechat" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    wechat_member_config_id, enterprise_id, member_card_area, relate_service, relate_wechat, 
+    status, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_data_wechat_member_config
+    where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_data_wechat_member_config
+    where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig" useGeneratedKeys="true" keyProperty="wechatMemberConfigId">
+    insert into tab_data_wechat_member_config (wechat_member_config_id, enterprise_id, 
+      member_card_area, relate_service, relate_wechat, 
+      status, create_time, update_time
+      )
+    values (#{wechatMemberConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{memberCardArea,jdbcType=VARCHAR}, #{relateService,jdbcType=VARCHAR}, #{relateWechat,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig">
+    insert into tab_data_wechat_member_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="wechatMemberConfigId != null">
+        wechat_member_config_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="memberCardArea != null">
+        member_card_area,
+      </if>
+      <if test="relateService != null">
+        relate_service,
+      </if>
+      <if test="relateWechat != null">
+        relate_wechat,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="wechatMemberConfigId != null">
+        #{wechatMemberConfigId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="memberCardArea != null">
+        #{memberCardArea,jdbcType=VARCHAR},
+      </if>
+      <if test="relateService != null">
+        #{relateService,jdbcType=VARCHAR},
+      </if>
+      <if test="relateWechat != null">
+        #{relateWechat,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig">
+    update tab_data_wechat_member_config
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="memberCardArea != null">
+        member_card_area = #{memberCardArea,jdbcType=VARCHAR},
+      </if>
+      <if test="relateService != null">
+        relate_service = #{relateService,jdbcType=VARCHAR},
+      </if>
+      <if test="relateWechat != null">
+        relate_wechat = #{relateWechat,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig">
+    update tab_data_wechat_member_config
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      member_card_area = #{memberCardArea,jdbcType=VARCHAR},
+      relate_service = #{relateService,jdbcType=VARCHAR},
+      relate_wechat = #{relateWechat,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
+  </update>
+
+  <select id="getByMemberCardId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_data_wechat_member_config
+    where enterprise_id = #{enterpriseId}
+    and member_card_area = #{memberCardId}
+    and status = 1
+  </select>
+
+  <select id="listByEnterpriseId" resultMap="BaseResultMap">
+    SELECT <include refid="Base_Column_List"></include>
+    from tab_data_wechat_member_config
+    where enterprise_id = #{enterpriseId}
+    and status = 1
+    order by create_time desc
+  </select>
+</mapper>
\ No newline at end of file

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

 package com.gic.enterprise.web.controller;
 
+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 org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +17,9 @@ import com.gic.enterprise.service.DataConfigApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/data-config")
 public class DataConfigController {
@@ -34,4 +41,26 @@ public class DataConfigController {
         return ResultControllerUtils.commonResult(dataConfigApiService
                 .getMemberConsumeConfigByEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()));
     }
+
+    @RequestMapping("/config-actually-paid")
+    public RestResponse configActuallyPaid(String jsonArr) {
+        if (StringUtil.isBlank(jsonArr)) {
+            return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "实付配置内容为空");
+        }
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        List<DataActuallyPaidConfigDTO> dtoList = JSON.parseArray(jsonArr, DataActuallyPaidConfigDTO.class);
+        dtoList = dtoList
+                .stream()
+                .map(e -> e.setEnterpriseId(enterpriseId))
+                .collect(Collectors.toList());
+        return OperationResultUtils.operationResult(dataConfigApiService.configActuallyPaid(dtoList),
+                OperationResultUtils.LOG_EDIT + "数据统计配置-实付配置",
+                UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
+    }
+
+    @RequestMapping("/get-actually-paid-config")
+    public RestResponse getActuallyPaidConfig() {
+        return ResultControllerUtils.commonResult(dataConfigApiService
+                .listActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
+    }
 }