Merge branch 'developer' into 'master'

Developer

See merge request !3

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() {
+
+    }
+
+    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/DataPerformanceConfigDTO.java

+package com.gic.enterprise.dto.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class DataPerformanceConfigDTO implements Serializable{
+
+    private static final long serialVersionUID = -4011724836821764949L;
+    /**
+     *
+     */
+    private Integer performanceConfigId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 订单数 指标 1:『『订单总数』2:『销售单数』 3:有效订单数』 4:『成交单数』
+     */
+    private Integer orderNumber;
+
+    /**
+     * 订单人数 1:『消费人数』 2:『有效成交人数』 3:『『成交人数』
+     */
+    private Integer orderPeopleNumber;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getPerformanceConfigId() {
+        return performanceConfigId;
+    }
+
+    public DataPerformanceConfigDTO setPerformanceConfigId(Integer performanceConfigId) {
+        this.performanceConfigId = performanceConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public DataPerformanceConfigDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getOrderNumber() {
+        return orderNumber;
+    }
+
+    public DataPerformanceConfigDTO setOrderNumber(Integer orderNumber) {
+        this.orderNumber = orderNumber;
+        return this;
+    }
+
+    public Integer getOrderPeopleNumber() {
+        return orderPeopleNumber;
+    }
+
+    public DataPerformanceConfigDTO setOrderPeopleNumber(Integer orderPeopleNumber) {
+        this.orderPeopleNumber = orderPeopleNumber;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public DataPerformanceConfigDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DataPerformanceConfigDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public DataPerformanceConfigDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}

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

+package com.gic.enterprise.dto.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 单效配置
+ * @ClassName: DataSingleEffectConfigDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/4/20 3:26 PM

+ */
+public class DataSingleEffectConfigDTO implements Serializable{
+    private static final long serialVersionUID = 5165511090745633488L;
+
+    /**
+     *
+     */
+    private Integer singleEffectConfigId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
+     */
+    private Integer sale;
+
+    /**
+     * 单效吊牌价 1:『吊牌价总额』 2:『销售单吊牌价』 3:『有效吊牌价』
+     */
+    private Integer tag;
+
+    /**
+     * 单效订单数 1:『订单总数』 2:『销售单数』 3:『有效订单数』 4:『成交单数』
+     */
+    private Integer orderNumber;
+
+    /**
+     * 单效销售件数 是否剔除物料,默认是 1:是 0:否
+     */
+    private Integer saleNumber;
+
+    /**
+     * 单效销售件数 1:『净销售件数』 2:『销售件数』3:『有效销售件数』
+     */
+    private Integer saleNumberTarget;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getSingleEffectConfigId() {
+        return singleEffectConfigId;
+    }
+
+    public DataSingleEffectConfigDTO setSingleEffectConfigId(Integer singleEffectConfigId) {
+        this.singleEffectConfigId = singleEffectConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public DataSingleEffectConfigDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getSale() {
+        return sale;
+    }
+
+    public DataSingleEffectConfigDTO setSale(Integer sale) {
+        this.sale = sale;
+        return this;
+    }
+
+    public Integer getTag() {
+        return tag;
+    }
+
+    public DataSingleEffectConfigDTO setTag(Integer tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    public Integer getOrderNumber() {
+        return orderNumber;
+    }
+
+    public DataSingleEffectConfigDTO setOrderNumber(Integer orderNumber) {
+        this.orderNumber = orderNumber;
+        return this;
+    }
+
+    public Integer getSaleNumber() {
+        return saleNumber;
+    }
+
+    public DataSingleEffectConfigDTO setSaleNumber(Integer saleNumber) {
+        this.saleNumber = saleNumber;
+        return this;
+    }
+
+    public Integer getSaleNumberTarget() {
+        return saleNumberTarget;
+    }
+
+    public DataSingleEffectConfigDTO setSaleNumberTarget(Integer saleNumberTarget) {
+        this.saleNumberTarget = saleNumberTarget;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public DataSingleEffectConfigDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DataSingleEffectConfigDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public DataSingleEffectConfigDTO 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 com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
+import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
+
+import java.util.List;
 
 public interface DataConfigApiService {
     /**
@@ -15,4 +20,87 @@ 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);
+
+    /**
+     * 新增商户的时候设置实付配置默认数据
+     * @Title: initActuallyPaidData

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

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

+    
*/
+    ServiceResponse<Void> initActuallyPaidData(Integer enterpriseId);
+
+    /**
+     * 单效取值配置
+     * @Title: configSingleEffect

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

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

+    
*/
+    ServiceResponse<Void> configSingleEffect(DataSingleEffectConfigDTO dto);
+
+    /**
+     * 获取单效取值配置
+     * @Title: getSingleEffectConfig

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

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.data.DataSingleEffectConfigDTO>

+    
*/
+    ServiceResponse<DataSingleEffectConfigDTO> getSingleEffectConfig(Integer enterpriseId);
+
+    /**
+     * 新增商户的时候设置单效取值配置默认数据
+     * @Title: initSingleEffectConfig

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

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

+    
*/
+    ServiceResponse<Void> initSingleEffectConfig(Integer enterpriseId);
+
+    /**
+     * 业绩指标配置
+     * @Title: configPerformance

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

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

+    
*/
+    ServiceResponse<Void> configPerformance(DataPerformanceConfigDTO dto);
+
+    /**
+     * 获取业绩指标配置
+     * @Title: getPerformanceConfig

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

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.data.DataPerformanceConfigDTO>

+    
*/
+    ServiceResponse<DataPerformanceConfigDTO> getPerformanceConfig(Integer enterpriseId);
+
+    /**
+     * 新增商户的时候设置业绩指标配置默认数据
+     * @Title: initPerformanceConfig

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

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

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

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

@@ -122,7 +122,8 @@ public interface PushMessageApiService {
      * @Param 
      * @return 
     */
-    ServiceResponse<Integer> totalUserMessage(Integer userId, Integer status);
+    ServiceResponse<Integer> totalUserMessage(Integer userId, String search, Integer status,
+                                              Date startTime, Date endTime, Integer pushClassifyId);
 
     /** @Description: 推送消息接口
      * @author taogs
@@ -157,4 +158,5 @@ public interface PushMessageApiService {
      * @return 
     */
     ServiceResponse<Integer> readMessage(Integer messageId);
+
 }

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/TabDataPerformanceConfigMapper.java

+package com.gic.enterprise.dao.mapper;
+
+import com.gic.enterprise.entity.TabDataPerformanceConfig;
+
+public interface TabDataPerformanceConfigMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param performanceConfigId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer performanceConfigId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabDataPerformanceConfig record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabDataPerformanceConfig record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param performanceConfigId 主键
+     * @return 实体对象
+     */
+    TabDataPerformanceConfig selectByPrimaryKey(Integer performanceConfigId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabDataPerformanceConfig record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabDataPerformanceConfig record);
+
+    TabDataPerformanceConfig getByEnterpriseId(Integer enterpriseId);
+}
\ No newline at end of file

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

+package com.gic.enterprise.dao.mapper;
+
+import com.gic.enterprise.entity.TabDataSingleEffectConfig;
+
+public interface TabDataSingleEffectConfigMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param singleEffectConfigId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer singleEffectConfigId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabDataSingleEffectConfig record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabDataSingleEffectConfig record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param singleEffectConfigId 主键
+     * @return 实体对象
+     */
+    TabDataSingleEffectConfig selectByPrimaryKey(Integer singleEffectConfigId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabDataSingleEffectConfig record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabDataSingleEffectConfig record);
+
+    TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId);
+}
\ 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/dao/mapper/TabPushMessageMapper.java

@@ -66,7 +66,7 @@ public interface TabPushMessageMapper {
                                          @Param("status") Integer status,
                                          @Param("startTime") Date startTime,
                                          @Param("endTime") Date endTime,
-                                         @Param("pushClassifyId") Integer pushClassifyId,
+                                         @Param("classify") String classify,
                                          @Param("userId") Integer userId);
 
     int readCount(@Param("messageId") Integer messageId);

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

@@ -3,6 +3,7 @@ package com.gic.enterprise.dao.mapper;
 import com.gic.enterprise.entity.TabPushUserMessage;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface TabPushUserMessageMapper {
@@ -56,8 +57,12 @@ public interface TabPushUserMessageMapper {
 
     int recallMessage(@Param("messageId") Integer messageId);
 
-    List<Integer> totalUserMessage(@Param("userId") Integer userId,
-                                   @Param("status") Integer status);
+    List<Integer> totalUserMessage(@Param("search") String search,
+                                   @Param("status") Integer status,
+                                   @Param("startTime") Date startTime,
+                                   @Param("endTime") Date endTime,
+                                   @Param("classify") String classify,
+                                   @Param("userId") Integer userId);
 
     int readAll(@Param("userId") Integer userId);
 

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/TabDataPerformanceConfig.java

+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_data_performance_config
+ */
+public class TabDataPerformanceConfig {
+    /**
+     * 
+     */
+    private Integer performanceConfigId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 订单数 指标 1:『『订单总数』2:『销售单数』 3:有效订单数』 4:『成交单数』
+     */
+    private Integer orderNumber;
+
+    /**
+     * 订单人数 1:『消费人数』 2:『有效成交人数』 3:『『成交人数』
+     */
+    private Integer orderPeopleNumber;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getPerformanceConfigId() {
+        return performanceConfigId;
+    }
+
+    public TabDataPerformanceConfig setPerformanceConfigId(Integer performanceConfigId) {
+        this.performanceConfigId = performanceConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabDataPerformanceConfig setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getOrderNumber() {
+        return orderNumber;
+    }
+
+    public TabDataPerformanceConfig setOrderNumber(Integer orderNumber) {
+        this.orderNumber = orderNumber;
+        return this;
+    }
+
+    public Integer getOrderPeopleNumber() {
+        return orderPeopleNumber;
+    }
+
+    public TabDataPerformanceConfig setOrderPeopleNumber(Integer orderPeopleNumber) {
+        this.orderPeopleNumber = orderPeopleNumber;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public TabDataPerformanceConfig setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabDataPerformanceConfig setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabDataPerformanceConfig 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/TabDataSingleEffectConfig.java

+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_data_single_effect_config
+ */
+public class TabDataSingleEffectConfig {
+    /**
+     * 
+     */
+    private Integer singleEffectConfigId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
+     */
+    private Integer sale;
+
+    /**
+     * 单效吊牌价 1:『吊牌价总额』 2:『销售单吊牌价』 3:『有效吊牌价』
+     */
+    private Integer tag;
+
+    /**
+     * 单效订单数 1:『订单总数』 2:『销售单数』 3:『有效订单数』 4:『成交单数』
+     */
+    private Integer orderNumber;
+
+    /**
+     * 单效销售件数 是否剔除物料,默认是 1:是 0:否
+     */
+    private Integer saleNumber;
+
+    /**
+     * 单效销售件数 1:『净销售件数』 2:『销售件数』3:『有效销售件数』
+     */
+    private Integer saleNumberTarget;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getSingleEffectConfigId() {
+        return singleEffectConfigId;
+    }
+
+    public TabDataSingleEffectConfig setSingleEffectConfigId(Integer singleEffectConfigId) {
+        this.singleEffectConfigId = singleEffectConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabDataSingleEffectConfig setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getSale() {
+        return sale;
+    }
+
+    public TabDataSingleEffectConfig setSale(Integer sale) {
+        this.sale = sale;
+        return this;
+    }
+
+    public Integer getTag() {
+        return tag;
+    }
+
+    public TabDataSingleEffectConfig setTag(Integer tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    public Integer getOrderNumber() {
+        return orderNumber;
+    }
+
+    public TabDataSingleEffectConfig setOrderNumber(Integer orderNumber) {
+        this.orderNumber = orderNumber;
+        return this;
+    }
+
+    public Integer getSaleNumber() {
+        return saleNumber;
+    }
+
+    public TabDataSingleEffectConfig setSaleNumber(Integer saleNumber) {
+        this.saleNumber = saleNumber;
+        return this;
+    }
+
+    public Integer getSaleNumberTarget() {
+        return saleNumberTarget;
+    }
+
+    public TabDataSingleEffectConfig setSaleNumberTarget(Integer saleNumberTarget) {
+        this.saleNumberTarget = saleNumberTarget;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public TabDataSingleEffectConfig setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabDataSingleEffectConfig setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabDataSingleEffectConfig 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/DataPerformanceConfigService.java

+package com.gic.enterprise.service;
+
+import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
+import com.gic.enterprise.entity.TabDataPerformanceConfig;
+
+public interface DataPerformanceConfigService {
+
+    /**
+     * 新增单效取值配置
+     * @Title: savePerformanceConfig

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

+     * @return  void

+    
*/
+    void savePerformanceConfig(DataPerformanceConfigDTO dto);
+
+    void editPerformanceConfig(DataPerformanceConfigDTO dto);
+
+    /**
+     * 根据商户ID查询配置
+     * @Title: getByEnterpriseId

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

+     * @return  com.gic.enterprise.entity.TabDataPerformanceConfig

+    
*/
+    TabDataPerformanceConfig getByEnterpriseId(Integer enterpriseId);
+}

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

+package com.gic.enterprise.service;
+
+import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
+import com.gic.enterprise.entity.TabDataSingleEffectConfig;
+
+public interface DataSingleEffectConfigService {
+
+    /**
+     * 新增单效取值配置
+     * @Title: saveSingleEffectConfig

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

+     * @return  void

+    
*/
+    void saveSingleEffectConfig(DataSingleEffectConfigDTO dto);
+
+    void editSingleEffectConfig(DataSingleEffectConfigDTO dto);
+
+    /**
+     * 根据商户ID查询配置
+     * @Title: getByEnterpriseId

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

+     * @return  com.gic.enterprise.entity.TabDataSingleEffectConfig

+    
*/
+    TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId);
+}

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/PushMessageService.java

@@ -13,9 +13,11 @@ public interface PushMessageService {
 
     int delete(Integer id);
 
-    Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime, Integer pushClassifyId);
+    Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime,
+                                        Integer pushClassifyId);
 
-    Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime, Integer pushClassifyId, Integer userId);
+    Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime,
+                                         Integer pushClassifyId, Integer userId, Integer pageNum, Integer pageSize);
 
     int readCount(Integer messageId);
 }

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

@@ -16,4 +16,6 @@ public interface PushTypeService {
     TabPushClassify getById(Integer id);
 
     List<TabPushClassify> listPushTypeByName(String name);
+
+    boolean saveClassify(String classify);
 }

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

@@ -2,12 +2,15 @@ package com.gic.enterprise.service;
 
 import com.gic.enterprise.entity.TabPushUserMessage;
 
+import java.util.Date;
+
 public interface PushUserMessageService {
     int save(Integer enterpriseId, Integer userId, Integer messageId, String classify, String title, String content);
 
     int reCallMessage(Integer messageId);
 
-    int totalUserMessage(Integer userId, int status);
+    int totalUserMessage(Integer userId, String search, Integer status,
+                         Date startTime, Date endTime, Integer pushClassifyId);
 
     int readAll(Integer userId);
 

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

@@ -50,7 +50,7 @@ public class AuditLogServiceImpl implements AuditLogService {
         auditLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
         auditLog.setCreateTime(new Date());
         tabAuditLogMapper.insertSelective(auditLog);
-        return auditLog.getAuditorId();
+        return auditLog.getAuditLogId();
     }
 
     @Override

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/DataPerformanceConfigServiceImpl.java

+package com.gic.enterprise.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.dao.mapper.TabDataPerformanceConfigMapper;
+import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
+import com.gic.enterprise.entity.TabDataPerformanceConfig;
+import com.gic.enterprise.service.DataPerformanceConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service("dataPerformanceConfigService")
+public class DataPerformanceConfigServiceImpl implements DataPerformanceConfigService{
+    @Autowired
+    private TabDataPerformanceConfigMapper tabDataPerformanceConfigMapper;
+
+    @Override
+    public void savePerformanceConfig(DataPerformanceConfigDTO dto) {
+        Date now = new Date();
+        dto.setCreateTime(now);
+        dto.setUpdateTime(now);
+        dto.setStatus(1);
+        TabDataPerformanceConfig record = EntityUtil.changeEntityNew(TabDataPerformanceConfig.class, dto);
+        tabDataPerformanceConfigMapper.insert(record);
+    }
+
+    @Override
+    public void editPerformanceConfig(DataPerformanceConfigDTO dto) {
+        dto.setUpdateTime(new Date());
+        TabDataPerformanceConfig record = EntityUtil.changeEntityNew(TabDataPerformanceConfig.class, dto);
+        tabDataPerformanceConfigMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public TabDataPerformanceConfig getByEnterpriseId(Integer enterpriseId) {
+        return tabDataPerformanceConfigMapper.getByEnterpriseId(enterpriseId);
+    }
+}

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

+package com.gic.enterprise.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.dao.mapper.TabDataSingleEffectConfigMapper;
+import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
+import com.gic.enterprise.entity.TabDataSingleEffectConfig;
+import com.gic.enterprise.service.DataSingleEffectConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service("dataSingleEffectConfigService")
+public class DataSingleEffectConfigServiceImpl implements DataSingleEffectConfigService{
+    @Autowired
+    private TabDataSingleEffectConfigMapper tabDataSingleEffectConfigMapper;
+
+    @Override
+    public void saveSingleEffectConfig(DataSingleEffectConfigDTO dto) {
+        Date now = new Date();
+        dto.setCreateTime(now);
+        dto.setUpdateTime(now);
+        dto.setStatus(1);
+        TabDataSingleEffectConfig record = EntityUtil.changeEntityNew(TabDataSingleEffectConfig.class, dto);
+        tabDataSingleEffectConfigMapper.insert(record);
+    }
+
+    @Override
+    public void editSingleEffectConfig(DataSingleEffectConfigDTO dto) {
+        dto.setUpdateTime(new Date());
+        TabDataSingleEffectConfig record = EntityUtil.changeEntityNew(TabDataSingleEffectConfig.class, dto);
+        tabDataSingleEffectConfigMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId) {
+        return tabDataSingleEffectConfigMapper.getByEnterpriseId(enterpriseId);
+    }
+}

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/impl/PushMessageServiceImpl.java

@@ -2,9 +2,12 @@ package com.gic.enterprise.service.impl;
 
 import com.gic.enterprise.dao.mapper.TabPushMessageMapper;
 import com.gic.enterprise.dto.UserMessageDTO;
+import com.gic.enterprise.entity.TabPushClassify;
 import com.gic.enterprise.entity.TabPushMessage;
 import com.gic.enterprise.service.PushMessageService;
+import com.gic.enterprise.service.PushTypeService;
 import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +17,8 @@ import java.util.Date;
 public class PushMessageServiceImpl implements PushMessageService {
     @Autowired
     private TabPushMessageMapper tabPushMessageMapper;
+    @Autowired
+    private PushTypeService pushTypeService;
 
     @Override
     public int savePushMesasge(TabPushMessage tabPushMessage) {
@@ -39,14 +44,17 @@ public class PushMessageServiceImpl implements PushMessageService {
     }
 
     @Override
-    public Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime, Integer pushClassifyId) {
+    public Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime,
+                                               Integer pushClassifyId) {
         return this.tabPushMessageMapper.pagePushMesage(search, pushStatus, startTime, endTime, pushClassifyId);
     }
 
     @Override
     public Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime,
-                                                Integer pushClassifyId, Integer userId) {
-        return this.tabPushMessageMapper.pageUserMessage(search, status, startTime, endTime, pushClassifyId, userId);
+                                                Integer pushClassifyId, Integer userId, Integer pageNum, Integer pageSize) {
+        TabPushClassify byId = this.pushTypeService.getById(pushClassifyId);
+        PageHelper.startPage(pageNum, pageSize);
+        return this.tabPushMessageMapper.pageUserMessage(search, status, startTime, endTime, byId == null ? null : byId.getClassifyName(), userId);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.gic.enterprise.dao.mapper.TabPushClassifyMapper;
 import com.gic.enterprise.entity.TabPushClassify;
 import com.gic.enterprise.service.PushTypeService;
 import com.github.pagehelper.Page;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,4 +48,18 @@ public class PushTypeServiceImpl implements PushTypeService {
     public List<TabPushClassify> listPushTypeByName(String name) {
         return this.tabPushClassifyMapper.listPushTypeByName(name);
     }
+
+    @Override
+    public boolean saveClassify(String classify) {
+        List<TabPushClassify> list = this.listPushTypeByName(classify);
+        if(CollectionUtils.isNotEmpty(list)){
+            return true;
+        }else {
+            TabPushClassify tabPushType = new TabPushClassify();
+            tabPushType.setClassifyName(classify);
+            tabPushType.setClassifyDesc(classify);
+            this.savePushType(tabPushType);
+        }
+        return false;
+    }
 }

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

 package com.gic.enterprise.service.impl;
 
 import com.gic.enterprise.dao.mapper.TabPushUserMessageMapper;
+import com.gic.enterprise.entity.TabPushClassify;
 import com.gic.enterprise.entity.TabPushUserMessage;
+import com.gic.enterprise.service.PushTypeService;
 import com.gic.enterprise.service.PushUserMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,6 +15,8 @@ import java.util.List;
 public class PushUserMessageServiceImpl implements PushUserMessageService {
     @Autowired
     private TabPushUserMessageMapper tabPushUserMessageMapper;
+    @Autowired
+    private PushTypeService pushTypeService;
 
     @Override
     public int save(Integer enterpriseId, Integer userId, Integer messageId, String classify, String title, String content) {
@@ -35,8 +39,10 @@ public class PushUserMessageServiceImpl implements PushUserMessageService {
     }
 
     @Override
-    public int totalUserMessage(Integer userId, int status) {
-        List<Integer> list = this.tabPushUserMessageMapper.totalUserMessage(userId, status);
+    public int totalUserMessage(Integer userId, String search, Integer status,
+                                Date startTime, Date endTime, Integer pushClassifyId) {
+        TabPushClassify byId = this.pushTypeService.getById(pushClassifyId);
+        List<Integer> list = this.tabPushUserMessageMapper.totalUserMessage(search, status, startTime, endTime, byId == null ? null : byId.getClassifyName(), userId);
         return list.get(0);
     }
 

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

@@ -215,8 +215,8 @@ public class AppletWechatMenuApiServiceImpl implements AppletWechatMenuApiServic
         List<TabAppletWechatMenu> listByParentId = appletWechatMenuService.listByParentId(record.getEnterpriseId(),
                 record.getParentMenuId(), record.getAppKey());
         if (CollectionUtils.isNotEmpty(listByParentId)) {
-            boolean isRightSort = sort == null || sort.intValue() < 1 || sort.intValue() > listByParentId.size();
-            if (!isRightSort) {
+            boolean isNotRightSort = sort == null || sort.intValue() < 1 || sort.intValue() > listByParentId.size();
+            if (isNotRightSort) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "排序值错误");
             }
             for (TabAppletWechatMenu menu : listByParentId) {
@@ -226,7 +226,7 @@ public class AppletWechatMenuApiServiceImpl implements AppletWechatMenuApiServic
                         appletWechatMenuService.sort(menu.getMenuId(), tempSort + 1);
                     }
                 } else {
-                    if (tempSort > currentSort && tempSort < sort) {
+                    if (tempSort > currentSort && tempSort <= sort) {
                         appletWechatMenuService.sort(menu.getMenuId(), tempSort - 1);
                     }
                 }

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

@@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -104,17 +105,21 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
         auditLogDTO.setApplyUserName(userServiceResponse.getResult().getUserName());
         auditLogDTO.setApplyUserPhone(userServiceResponse.getResult().getPhoneNumber());
         // 判断有没有审核员， 没有审核员就返回错误
+
         ServiceResponse<List<AuditorDTO>> auditorResponse = auditorApiService.listAuditorByProject(auditLogDTO.getProjectItemId(), auditLogDTO.getApplyUserId(), auditLogDTO.getEnterpriseId());
-        if (!auditorResponse.isSuccess()) {
-            return EnterpriseServiceResponse.failure(auditorResponse.getCode(), auditorResponse.getMessage());
-        }
-        List<AuditorDTO> auditorList = auditorResponse.getResult();
-        List<AuditorDTO> openidList = auditorList.stream().filter(e -> StringUtils.isNotBlank(e.getOpenid())).collect(Collectors.toList());
-        List<AuditorDTO> userIdList = auditorList.stream().filter(e -> e.getUserId() != null).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(openidList) && CollectionUtils.isEmpty(userIdList)) {
-            return EnterpriseServiceResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "审核员没有绑定微信或管理员");
+        List<AuditorDTO> auditorList = Collections.emptyList();
+        if (userServiceResponse.getResult().getSuperAdmin() == 0) {
+            // 普通管理员需要判断是否有审核员
+            if (!auditorResponse.isSuccess()) {
+                return EnterpriseServiceResponse.failure(auditorResponse.getCode(), auditorResponse.getMessage());
+            }
+            auditorList = auditorResponse.getResult();
+            List<AuditorDTO> openidList = auditorList.stream().filter(e -> StringUtils.isNotBlank(e.getOpenid())).collect(Collectors.toList());
+            List<AuditorDTO> userIdList = auditorList.stream().filter(e -> e.getUserId() != null).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(openidList) && CollectionUtils.isEmpty(userIdList)) {
+                return EnterpriseServiceResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "审核员没有绑定微信或管理员");
+            }
         }
-
         // 判断审批项是否禁用
         if (Constants.DEL_STATUS.equals(projectItem.getUseStatus())) {
             return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "该审批项已被禁用");
@@ -156,7 +161,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
                         todoItemDTO.setItemContent(projectItem.getProjectItemDesc());
                         // 事项code
                         todoItemDTO.setItemType(com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT);
-                        // todo 事项url
+                        // 事项url
                         todoItemDTO.setItemInfoUrl(com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT_URL + "?auditLogId=" + auditLogId);
                         todoItemApiService.saveTodoItem(todoItemDTO);
                     }
@@ -169,6 +174,22 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
             // sendWxMessage();
         }
 
+        // 如果申请人是超管 自动审批
+        if (userServiceResponse.getResult().getSuperAdmin() == 1) {
+            AuditLogDTO autoAudit = new AuditLogDTO();
+            autoAudit.setEnterpriseId(auditLogDTO.getEnterpriseId());
+            autoAudit.setApplyUserId(auditLogDTO.getApplyUserId());
+            autoAudit.setAuditorId(auditLogDTO.getApplyUserId());
+            autoAudit.setAuditResult(DataSecurityAuditEnum.PASS.getCode());
+            autoAudit.setAuditorPhone(auditLogDTO.getApplyUserPhone());
+            autoAudit.setAuditorName(auditLogDTO.getAuditorName());
+            autoAudit.setAuditLogId(auditLogId);
+            autoAudit.setAuditReason("自动审批");
+            this.audit(autoAudit);
+
+        }
+
+
         return EnterpriseServiceResponse.success();
     }
 
@@ -176,7 +197,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
     @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<AuditLogDTO> audit(AuditLogDTO auditLogDTO) {
         // 完成待办事项
-        todoItemApiService.finishTodoItem(auditLogDTO.getEnterpriseId(), auditLogDTO.getAuditorId(), com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT, "www.baidu.com?auditLogId=" + auditLogDTO.getAuditLogId());
+        todoItemApiService.finishTodoItem(auditLogDTO.getEnterpriseId(), auditLogDTO.getAuditorId(), com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT, com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT_URL + "?auditLogId=" + auditLogDTO.getAuditLogId());
 
         TabAuditLog auditLog = this.auditLogService.getAuditById(auditLogDTO.getAuditLogId());
         if (auditLog == null) {
@@ -221,7 +242,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
         String url = config.getHost() + "/damo-system/examine-logs";
         String result = auditLogDTO.getAuditResult() == 1? "已通过" : "未通过";
         String content = "您的操作"+ result +"审核，可以在<a href='"+url+"'>审核日志</a>查看到本次审核记录";
-        this.pushMessageApiService.pushUserMessage(auditLogDTO.getEnterpriseId(), auditLogDTO.getApplyUserId(),"审核通知", "审核结果", content);
+        this.pushMessageApiService.pushUserMessage(auditLogDTO.getEnterpriseId(), auditLogDTO.getApplyUserId(),"系统消息", "审核结果", content);
         return EnterpriseServiceResponse.success();
     }
 
@@ -311,10 +332,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
         TabEnterprise enterprise = enterpriseService.getEnterpriseById(auditLogDTO.getEnterpriseId());
         UserDTO userDTO = userApiService.getUserById(auditLogDTO.getApplyUserId()).getResult();
         LoginUserTypeEnum userTypeEnum = LoginUserTypeEnum.getByCode(userDTO.getLoginType());
-        String position = "";
-        if (userTypeEnum != null) {
-            position = userTypeEnum.getMessage();
-        }
+        String position = userTypeEnum != null ? userTypeEnum.getMessage() : "";
         String[] keyWord = {enterprise.getEnterpriseName(), auditorDTO.getAuditorName(), position, auditLogDTO.getProjectItemName()};
         // todo 跳转地址
         this.wxTemplateRouterApiService.sendForDownloadData(auditorDTO.getOpenid(), null, keyWord);

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

@@ -15,6 +15,7 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.enterprise.service.*;
 import com.gic.redis.data.util.RedisUtil;
+import org.apache.logging.log4j.core.pattern.AbstractStyleNameConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 @Service("billingAccountApiService")
 public class BillingAccountApiServiceImpl implements BillingAccountApiService {
@@ -206,11 +208,14 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
         if (i > 0) {
             TabBillingAccount account = this.billingAccountService.getByEnterpriseId(enterpriseId);
             if(account.getAccountBalance() <= 0){
-                String content = "您的GIC商户余额已欠费"+(-account.getAccountBalance())+"元，为了不影响业务的开展，请及时<a href='"+config.getHost()+"cost-center/billing-center/recharge'>充值</a>";
-                this.pushMessageApiService.pushMessage(enterpriseId, "产品通知", "商户欠费", content);
-
-                // 待办事项
-                sendTotoItem(enterpriseId);
+                Object cache = RedisUtil.getCache("message:" + enterpriseId);
+                if(cache == null){
+                    String content = "您的GIC商户余额已欠费"+(-account.getAccountBalance())+"元，为了不影响业务的开展，请及时<a href='"+config.getHost()+"cost-center/billing-center/recharge'>充值</a>";
+                    this.pushMessageApiService.pushMessage(enterpriseId, "系统消息", "商户欠费", content);
+                    // 待办事项
+                    sendTotoItem(enterpriseId);
+                    RedisUtil.setCache("message:" + enterpriseId, 1, 1l, TimeUnit.DAYS);
+                }
             }
             return ServiceResponse.success(i);
         } else {

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

@@ -53,6 +53,7 @@ public class CustomGuideApiServiceImpl implements CustomGuideApiService {
     @Override
     public ServiceResponse<List<CustomGuideDTO>> listGuide(Integer enterpriseId, Integer version, String appid) {
         List<TabCustomGuide> list = this.customGuideService.listGuide(enterpriseId, version, appid);
+        log.info("导航数据：{}", JSON.toJSONString(list));
         return ServiceResponse.success(EntityUtil.changeEntityListByJSON(CustomGuideDTO.class, list));
     }
 

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;
 import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
+import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
+import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
+import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
 import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
+import com.gic.enterprise.entity.TabDataPerformanceConfig;
+import com.gic.enterprise.entity.TabDataSingleEffectConfig;
 import com.gic.enterprise.error.ErrorCode;
-import com.gic.enterprise.service.DataConfigApiService;
-import com.gic.enterprise.service.DataMemberConsumeConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.gic.enterprise.service.*;
 
 @Service("dataConfigApiService")
 public class DataConfigApiServiceImpl implements DataConfigApiService {
     @Autowired
     private DataMemberConsumeConfigService dataMemberConsumeConfigService;
+    @Autowired
+    private DataWechatMemberConfigService dataWechatMemberConfigService;
+    @Autowired
+    private DataActuallyPaidConfigService dataActuallyPaidConfigService;
+    @Autowired
+    private DataSingleEffectConfigService dataSingleEffectConfigService;
+    @Autowired
+    private DataPerformanceConfigService dataPerformanceConfigService;
 
     @Override
     public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
@@ -39,4 +58,105 @@ 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(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();
+    }
+
+    @Override
+    public ServiceResponse<Void> configSingleEffect(DataSingleEffectConfigDTO dto) {
+        TabDataSingleEffectConfig record = dataSingleEffectConfigService.getByEnterpriseId(dto.getEnterpriseId());
+        if (record != null) {
+            //编辑
+            dto.setSingleEffectConfigId(record.getSingleEffectConfigId());
+            dataSingleEffectConfigService.editSingleEffectConfig(dto);
+            return ServiceResponse.success();
+        }
+        dataSingleEffectConfigService.saveSingleEffectConfig(dto);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<DataSingleEffectConfigDTO> getSingleEffectConfig(Integer enterpriseId) {
+        TabDataSingleEffectConfig record = dataSingleEffectConfigService.getByEnterpriseId(enterpriseId);
+        if (record == null) {
+            return ServiceResponse.success(EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class,
+                    dataSingleEffectConfigService.getByEnterpriseId(-1)));
+        }
+        return ServiceResponse.success(EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class, record));
+    }
+
+    @Override
+    public ServiceResponse<Void> initSingleEffectConfig(Integer enterpriseId) {
+        DataSingleEffectConfigDTO dto = EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class,
+                dataSingleEffectConfigService.getByEnterpriseId(-1));
+        dto.setSingleEffectConfigId(null);
+        dto.setEnterpriseId(enterpriseId);
+        configSingleEffect(dto);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> configPerformance(DataPerformanceConfigDTO dto) {
+        TabDataPerformanceConfig record = dataPerformanceConfigService.getByEnterpriseId(dto.getEnterpriseId());
+        if (record == null) {
+            dataPerformanceConfigService.savePerformanceConfig(dto);
+            return ServiceResponse.success();
+        }
+        dto.setPerformanceConfigId(record.getPerformanceConfigId());
+        dataPerformanceConfigService.editPerformanceConfig(dto);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<DataPerformanceConfigDTO> getPerformanceConfig(Integer enterpriseId) {
+        TabDataPerformanceConfig record = dataPerformanceConfigService.getByEnterpriseId(enterpriseId);
+        if (record == null) {
+            return ServiceResponse.success(EntityUtil.changeEntityNew(DataPerformanceConfigDTO.class,
+                    dataPerformanceConfigService.getByEnterpriseId(-1)));
+        }
+        return ServiceResponse.success(EntityUtil.changeEntityNew(DataPerformanceConfigDTO.class, record));
+    }
+
+    @Override
+    public ServiceResponse<Void> initPerformanceConfig(Integer enterpriseId) {
+        DataPerformanceConfigDTO dto = EntityUtil.changeEntityNew(DataPerformanceConfigDTO.class,
+                dataPerformanceConfigService.getByEnterpriseId(-1));
+        dto.setPerformanceConfigId(null);
+        dto.setEnterpriseId(enterpriseId);
+        configPerformance(dto);
+        return ServiceResponse.success();
+    }
 }

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

@@ -97,8 +97,8 @@ public class DownloadReportApiServiceImpl implements DownloadReportApiService {
         TabDownloadReport downloadReport = this.downloadReportService.getById(downloadReportId);
         if(downloadReport != null){
             String url = config.getHost() + "damo-system/report-list";
-            String content = "您的"+ downloadReport.getDataContent() +"已生成，请前往<a href='"+ url +"'>下载中心</a>查看";
-            this.pushMessageApiService.pushUserMessage(downloadReport.getEnterpriseId(), downloadReport.getApplyUserId(), "下载通知", "下载通知", content);
+            String content = "您的"+ downloadReport.getDataContent() +"已生成，请前往<a href='"+ url +"' style='color:#2f54ed'>下载中心</a>查看";
+            this.pushMessageApiService.pushUserMessage(downloadReport.getEnterpriseId(), downloadReport.getApplyUserId(), "系统消息", "下载通知", content);
         }
         return EnterpriseServiceResponse.success(line);
     }

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,13 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         //初始化计费中心账户
         billingAccountService.createBillingAccount(enterpriseId);
 
+        //数据配置：实付配置默认数据
+        dataConfigApiService.initActuallyPaidData(enterpriseId);
+        //数据配置：单效取值配置默认数据
+        dataConfigApiService.initSingleEffectConfig(enterpriseId);
+        //业绩指标配置默认数据
+        dataConfigApiService.initPerformanceConfig(enterpriseId);
+
         UserDTO userDTO = EntityUtil.changeEntityNew(UserDTO.class, enterpriseDTO);
         //新增超级管理员
         userDTO.setEnterpriseId(enterpriseId);
@@ -567,7 +576,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
                 Date auditTime = enterpriseDTO.getAuditTime();
                 long days = (sdf.parse(sdf.format(auditTime)).getTime() - sdf.parse(sdf.format(now)).getTime())/(1000 * 60 * 60 * 24);
                 if(days <= 7){
-                    this.pushMessageApiService.pushMessage(enterpriseDTO.getEnterpriseId(), "产品通知",
+                    this.pushMessageApiService.pushMessage(enterpriseDTO.getEnterpriseId(), "系统消息",
                             "GIC版本即将过期", "您的GIC版本即将在"+ days +"天到期，为了不影响业务的开展，请及时续费");
                 }
             }catch (Exception e){

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

@@ -253,8 +253,11 @@ public class PlatformBrandApiServiceImpl implements PlatformBrandApiService {
             Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         TabPlatformBrand brand = this.platformBrandService.getByBrandName(brandName);
+        if (brand == null) {
+            return ServiceResponse.success(new Page<>());
+        }
         com.github.pagehelper.Page<TabPlatformBrandRef> brandRefPage = this.platformBrandRefService
-                .listByPlatformBrandRef(brand == null ? null : brand.getPlatformBrandId());
+                .listByPlatformBrandRef(brand.getPlatformBrandId());
         Page<PlatformBrandRefDTO> page = PageHelperUtils.changePageHelperToCurrentPage(brandRefPage,
                 PlatformBrandRefDTO.class);
         if (CollectionUtils.isNotEmpty(page.getResult())) {

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

@@ -148,9 +148,8 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
     public ServiceResponse<Page<UserMessageDTO>> pageUserMessage(Integer userId, String search, Integer status,
                                                                  Date startTime, Date endTime, Integer pushClassifyId,
                                                                  Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
         com.github.pagehelper.Page<UserMessageDTO> page = this.pushMessageService.pageUserMessage(search, status,
-                startTime, endTime, pushClassifyId, userId);
+                startTime, endTime, pushClassifyId, userId, pageNum, pageSize);
         Page<UserMessageDTO> userMessageDTOPage = PageHelperUtils.changePageHelperToCurrentPage(page);
         return ServiceResponse.success(userMessageDTOPage);
     }
@@ -166,8 +165,9 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
     }
 
     @Override
-    public ServiceResponse<Integer> totalUserMessage(Integer userId, Integer status) {
-        return ServiceResponse.success(this.pushUserMessageService.totalUserMessage(userId, status));
+    public ServiceResponse<Integer> totalUserMessage(Integer userId, String search, Integer status,
+                                                     Date startTime, Date endTime, Integer pushClassifyId) {
+        return ServiceResponse.success(this.pushUserMessageService.totalUserMessage(userId, search, status, startTime, endTime, pushClassifyId));
     }
 
     @Override
@@ -176,6 +176,7 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
         if(enterpriseId == null || userId == null || StringUtils.isBlank(title) || StringUtils.isBlank(content)){
             return ServiceResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getErrorMsg());
         }
+        this.pushTypeService.saveClassify(classify);
         int i = this.pushUserMessageService.save(enterpriseId, userId, null, classify, title, content);
         if(i > 0){
             return ServiceResponse.success(i);

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

@@ -16,16 +16,19 @@ import com.gic.enterprise.dto.DictDTO;
 import com.gic.enterprise.entity.TabRiskMode;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
-import com.gic.enterprise.service.*;
+import com.gic.enterprise.service.AuditLogApiService;
+import com.gic.enterprise.service.DictApiService;
+import com.gic.enterprise.service.RiskModeApiService;
+import com.gic.enterprise.service.RiskModeService;
 import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -43,6 +46,8 @@ import java.util.stream.Collectors;
 @Service("riskModeApiService")
 public class RiskModeApiServiceImpl implements RiskModeApiService {
 
+    private Logger logger = LogManager.getLogger(RiskModeApiServiceImpl.class);
+
     @Autowired
     private DictApiService dictApiService;
     @Autowired
@@ -98,6 +103,7 @@ public class RiskModeApiServiceImpl implements RiskModeApiService {
 
     @Override
     public ServiceResponse<Void> auditCallback(String json) {
+        logger.info("审批回调:{}", json);
         JSONObject jsonObject = JSON.parseObject(json);
         Integer auditResult = jsonObject.getInteger("auditResult");
         Integer riskModeId = jsonObject.getInteger("riskModeId");
@@ -116,7 +122,6 @@ public class RiskModeApiServiceImpl implements RiskModeApiService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> applyRiskMode(Integer enterpriseId, Integer userId, Integer duration, String applyReason) {
         if (duration == null) {
             return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR);
@@ -156,9 +161,6 @@ public class RiskModeApiServiceImpl implements RiskModeApiService {
         auditLogDTO.setExtraInfo(JSON.toJSONString(map));
         auditLogDTO.setAuditType(AuditTypeEnum.RISK_MODE.getCode());
         ServiceResponse<Void> serviceResponse = auditLogApiService.apply(auditLogDTO);
-        if (!serviceResponse.isSuccess()) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
         return serviceResponse;
     }
 }
\ No newline at end of file

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

@@ -113,7 +113,7 @@ public class WxPayStrategy implements PayStrategy {
                 case 1:
                     // 商户余额充值
                     billingRechargeRecordService.updateBySerialNumber(resData.getEnterpriseId(), billingPayInfo.getOrderSerialNumber(), resData.getTotalFeePaid(), resData.getTotalFeePaid(), BillingAuditStatusEnum.PASS.getCode(), resData.getTimeEnd());
-                    this.pushMessageApiService.pushMessage(resData.getEnterpriseId(), "产品通知", "余额充值", "您的商户成功充值"+resData.getTotalFeePaid()+"元！感谢您的支持和使用！");
+                    this.pushMessageApiService.pushMessage(resData.getEnterpriseId(), "系统通知", "余额充值", "您的商户成功充值"+resData.getTotalFeePaid()+"元！感谢您的支持和使用！");
                     break;
                 case 2:
                     // 短信套餐包购买

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

@@ -226,5 +226,7 @@
     where status = 1
     and enterprise_id = #{enterpriseId}
     and app_key = #{appKey}
+
+    order by sort
   </select>
 </mapper>
\ No newline at end of file

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>
+
+  <update id="delete">
+    update tab_data_actually_paid_config set status = 0
+    where enterprise_id = #{enterpriseId}
+    and classify = #{classify}
+    and status = 1
+  </update>
+</mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabDataPerformanceConfigMapper.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.TabDataPerformanceConfigMapper">
+  <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataPerformanceConfig">
+    <id column="performance_config_id" jdbcType="INTEGER" property="performanceConfigId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="order_number" jdbcType="INTEGER" property="orderNumber" />
+    <result column="order_people_number" jdbcType="INTEGER" property="orderPeopleNumber" />
+    <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">
+    performance_config_id, enterprise_id, order_number, order_people_number, status, 
+    create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_data_performance_config
+    where performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_data_performance_config
+    where performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataPerformanceConfig">
+    insert into tab_data_performance_config (performance_config_id, enterprise_id, 
+      order_number, order_people_number, status, 
+      create_time, update_time)
+    values (#{performanceConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{orderNumber,jdbcType=INTEGER}, #{orderPeopleNumber,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataPerformanceConfig">
+    insert into tab_data_performance_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="performanceConfigId != null">
+        performance_config_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="orderNumber != null">
+        order_number,
+      </if>
+      <if test="orderPeopleNumber != null">
+        order_people_number,
+      </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="performanceConfigId != null">
+        #{performanceConfigId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="orderNumber != null">
+        #{orderNumber,jdbcType=INTEGER},
+      </if>
+      <if test="orderPeopleNumber != null">
+        #{orderPeopleNumber,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.TabDataPerformanceConfig">
+    update tab_data_performance_config
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="orderNumber != null">
+        order_number = #{orderNumber,jdbcType=INTEGER},
+      </if>
+      <if test="orderPeopleNumber != null">
+        order_people_number = #{orderPeopleNumber,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 performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataPerformanceConfig">
+    update tab_data_performance_config
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      order_number = #{orderNumber,jdbcType=INTEGER},
+      order_people_number = #{orderPeopleNumber,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
+  </update>
+
+  <select id="getByEnterpriseId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_data_performance_config
+    where enterprise_id = #{enterpriseId}
+    and status = 1
+  </select>
+</mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabDataSingleEffectConfigMapper.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.TabDataSingleEffectConfigMapper">
+  <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataSingleEffectConfig">
+    <id column="single_effect_config_id" jdbcType="INTEGER" property="singleEffectConfigId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="sale" jdbcType="INTEGER" property="sale" />
+    <result column="tag" jdbcType="INTEGER" property="tag" />
+    <result column="order_number" jdbcType="INTEGER" property="orderNumber" />
+    <result column="sale_number" jdbcType="INTEGER" property="saleNumber" />
+    <result column="sale_number_target" jdbcType="INTEGER" property="saleNumberTarget" />
+    <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">
+    single_effect_config_id, enterprise_id, sale, tag, order_number, sale_number, sale_number_target,
+    status, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_data_single_effect_config
+    where single_effect_config_id = #{singleEffectConfigId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_data_single_effect_config
+    where single_effect_config_id = #{singleEffectConfigId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataSingleEffectConfig">
+    insert into tab_data_single_effect_config (single_effect_config_id, enterprise_id, 
+      sale, tag, order_number, sale_number,
+      sale_number_target, status, create_time, 
+      update_time)
+    values (#{singleEffectConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{sale,jdbcType=INTEGER}, #{tag,jdbcType=INTEGER}, #{orderNumber,jdbcType=INTEGER}, #{saleNumber,jdbcType=INTEGER},
+      #{saleNumberTarget,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataSingleEffectConfig">
+    insert into tab_data_single_effect_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="singleEffectConfigId != null">
+        single_effect_config_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="sale != null">
+        sale,
+      </if>
+      <if test="tag != null">
+        tag,
+      </if>
+      <if test="orderNumber != null">
+        order_number,
+      </if>
+      <if test="saleNumber != null">
+        sale_number,
+      </if>
+      <if test="saleNumberTarget != null">
+        sale_number_target,
+      </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="singleEffectConfigId != null">
+        #{singleEffectConfigId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="sale != null">
+        #{sale,jdbcType=INTEGER},
+      </if>
+      <if test="tag != null">
+        #{tag,jdbcType=INTEGER},
+      </if>
+      <if test="orderNumber != null">
+        #{orderNumber,jdbcType=INTEGER},
+      </if>
+      <if test="saleNumber != null">
+        #{saleNumber,jdbcType=INTEGER},
+      </if>
+      <if test="saleNumberTarget != null">
+        #{saleNumberTarget,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.TabDataSingleEffectConfig">
+    update tab_data_single_effect_config
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="sale != null">
+        sale = #{sale,jdbcType=INTEGER},
+      </if>
+      <if test="tag != null">
+        tag = #{tag,jdbcType=INTEGER},
+      </if>
+      <if test="orderNumber != null">
+        order_number = #{orderNumber,jdbcType=INTEGER},
+      </if>
+      <if test="saleNumber != null">
+        sale_number = #{saleNumber,jdbcType=INTEGER},
+      </if>
+      <if test="saleNumberTarget != null">
+        sale_number_target = #{saleNumberTarget,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 single_effect_config_id = #{singleEffectConfigId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataSingleEffectConfig">
+    update tab_data_single_effect_config
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      sale = #{sale,jdbcType=INTEGER},
+      tag = #{tag,jdbcType=INTEGER},
+      order_number = #{orderNumber,jdbcType=INTEGER},
+      sale_number = #{saleNumber,jdbcType=INTEGER},
+      sale_number_target = #{saleNumberTarget,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where single_effect_config_id = #{singleEffectConfigId,jdbcType=INTEGER}
+  </update>
+
+  <select id="getByEnterpriseId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_data_single_effect_config
+    where enterprise_id = #{enterpriseId}
+    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-service/src/main/resources/mapper/TabPushMessageMapper.xml

@@ -276,8 +276,8 @@
     <if test="endTime != null">
       and (t1.create_time &lt;= #{endTime})
     </if>
-    <if test="pushClassifyId != null">
-      and t3.push_classify_id = #{pushClassifyId}
+    <if test="classify != null and classify !=''">
+      and t1.classify = #{classify}
     </if>
     order by t1.status asc,t1.create_time desc
   </select>

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

@@ -156,10 +156,25 @@
     where message_id = #{messageId,jdbcType=INTEGER} and status!=0
   </update>
   <select id="totalUserMessage" resultType="integer">
-    select
-    count(1)
-    from tab_push_user_message
-    where user_id=#{userId} and status = #{status}
+    select count(1)
+    from tab_push_user_message t1 left join tab_push_message t3 on t1.message_id = t3.message_id
+    where t1.user_id=#{userId}
+    and (t1.status = 1 or t1.status = 2)
+    <if test="search != null and search != ''">
+      and (t1.title like concat('%', #{search}, '%') or t1.content like concat('%', #{search}, '%'))
+    </if>
+    <if test="status != null">
+      and t1.status = #{status}
+    </if>
+    <if test="startTime != null">
+      and (t1.create_time &gt;= #{startTime})
+    </if>
+    <if test="endTime != null">
+      and (t1.create_time &lt;= #{endTime})
+    </if>
+    <if test="classify != null and classify !=''">
+      and t1.classify = #{classify}
+    </if>
   </select>
   <update id="readAll">
     update tab_push_user_message

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

 package com.gic.enterprise.web.controller;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
+import com.gic.commons.util.StringUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.OperationResultUtils;
+import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
 import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
+import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
+import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
+import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.DataConfigApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.enterprise.web.vo.data.ActuallyPaidConfigVO;
+import com.gic.enterprise.web.vo.data.DataSingleEffectConfigVO;
+import com.gic.enterprise.web.vo.data.PerformanceVO;
 
 @RestController
 @RequestMapping("/data-config")
@@ -34,4 +46,54 @@ 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()),
+                ActuallyPaidConfigVO.class);
+    }
+
+    @RequestMapping("/config-single-effect")
+    public RestResponse configSingleEffect(DataSingleEffectConfigDTO dto) {
+        dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        return OperationResultUtils.operationResult(dataConfigApiService.configSingleEffect(dto),
+                OperationResultUtils.LOG_EDIT + "数据统计配置-单效取值配置",
+                UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
+    }
+
+    @RequestMapping("/get-single-effect-config")
+    public RestResponse getSingleEffectConfig() {
+        return ResultControllerUtils.commonResultOne(
+                dataConfigApiService.getSingleEffectConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
+                DataSingleEffectConfigVO.class);
+    }
+
+    @RequestMapping("/config-performance")
+    public RestResponse configPerformance(DataPerformanceConfigDTO dto) {
+        dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        return OperationResultUtils.operationResult(dataConfigApiService.configPerformance(dto),
+                OperationResultUtils.LOG_EDIT + "数据统计配置-业绩指标配置",
+                UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
+    }
+
+    @RequestMapping("/get-performance-config")
+    public RestResponse getPerformanceConfig() {
+        return ResultControllerUtils.commonResultOne(
+                dataConfigApiService.getPerformanceConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
+                PerformanceVO.class);
+    }
 }

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

@@ -59,7 +59,8 @@ public class IndexModuleController {
         try {
             ServiceResponse<Page<UserMessageDTO>> response = this.pushMessageApiService.pageUserMessage(userId, search, status, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
                     StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId, pageQO.getCurrentPage(), pageQO.getPageSize());
-            ServiceResponse<Integer> unReadResponse = this.pushMessageApiService.totalUserMessage(UserDetailUtils.getUserDetail().getUserId(), 1);
+            ServiceResponse<Integer> unReadResponse = this.pushMessageApiService.totalUserMessage(userId, search, 1, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
+                    StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId);
             Map<String, Object> result = new HashMap<>();
             result.put("page", response.getResult());
             result.put("unReadCount", unReadResponse.getResult());
@@ -72,7 +73,8 @@ public class IndexModuleController {
 
     @RequestMapping("total-message")
     public RestResponse totalMessage(){
-        ServiceResponse<Integer> response = this.pushMessageApiService.totalUserMessage(UserDetailUtils.getUserDetail().getUserId(), 1);
+        ServiceResponse<Integer> response = this.pushMessageApiService.totalUserMessage(UserDetailUtils.getUserDetail().getUserId(), null, null, null,
+                null, null);
         return RestResponse.success(response.getResult());
     }
 

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;
+    }
+}

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

+package com.gic.enterprise.web.vo.data;
+
+import java.io.Serializable;
+
+public class DataSingleEffectConfigVO implements Serializable{
+    private static final long serialVersionUID = 2186479171518586895L;
+
+    /**
+     * 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
+     */
+    private Integer sale;
+
+    /**
+     * 单效吊牌价 1:『吊牌价总额』 2:『销售单吊牌价』 3:『有效吊牌价』
+     */
+    private Integer tag;
+
+    /**
+     * 单效订单数 1:『订单总数』 2:『销售单数』 3:『有效订单数』 4:『成交单数』
+     */
+    private Integer orderNumber;
+
+    /**
+     * 单效销售件数 是否剔除物料,默认是 1:是 0:否
+     */
+    private Integer saleNumber;
+
+    /**
+     * 单效销售件数 1:『净销售件数』 2:『销售件数』3:『有效销售件数』
+     */
+    private Integer saleNumberTarget;
+
+    public Integer getSale() {
+        return sale;
+    }
+
+    public DataSingleEffectConfigVO setSale(Integer sale) {
+        this.sale = sale;
+        return this;
+    }
+
+    public Integer getTag() {
+        return tag;
+    }
+
+    public DataSingleEffectConfigVO setTag(Integer tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    public Integer getOrderNumber() {
+        return orderNumber;
+    }
+
+    public DataSingleEffectConfigVO setOrderNumber(Integer orderNumber) {
+        this.orderNumber = orderNumber;
+        return this;
+    }
+
+    public Integer getSaleNumber() {
+        return saleNumber;
+    }
+
+    public DataSingleEffectConfigVO setSaleNumber(Integer saleNumber) {
+        this.saleNumber = saleNumber;
+        return this;
+    }
+
+    public Integer getSaleNumberTarget() {
+        return saleNumberTarget;
+    }
+
+    public DataSingleEffectConfigVO setSaleNumberTarget(Integer saleNumberTarget) {
+        this.saleNumberTarget = saleNumberTarget;
+        return this;
+    }
+}

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

+package com.gic.enterprise.web.vo.data;
+
+import java.io.Serializable;
+
+public class PerformanceVO implements Serializable{
+
+    private static final long serialVersionUID = 2575992580211890282L;
+    /**
+     * 订单数 指标 1:『『订单总数』2:『销售单数』 3:有效订单数』 4:『成交单数』
+     */
+    private Integer orderNumber;
+
+    /**
+     * 订单人数 1:『消费人数』 2:『有效成交人数』 3:『『成交人数』
+     */
+    private Integer orderPeopleNumber;
+
+    public Integer getOrderNumber() {
+        return orderNumber;
+    }
+
+    public PerformanceVO setOrderNumber(Integer orderNumber) {
+        this.orderNumber = orderNumber;
+        return this;
+    }
+
+    public Integer getOrderPeopleNumber() {
+        return orderPeopleNumber;
+    }
+
+    public PerformanceVO setOrderPeopleNumber(Integer orderPeopleNumber) {
+        this.orderPeopleNumber = orderPeopleNumber;
+        return this;
+    }
+}

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseSmsController.java

@@ -86,14 +86,14 @@ public class EnterpriseSmsController {
     }
 
     @RequestMapping("/get-sms")
-    public RestResponse getSms(Long signId) {
-        return ResultControllerUtils.commonResultOne(smsOuterApiService.getSmsSignByid(UserDetailUtils.getUserDetail().getEnterpriseId(), signId), EnterpriseSmsSignVO.class);
+    public RestResponse getSms(Long signId, Integer enterpriseId) {
+        return ResultControllerUtils.commonResultOne(smsOuterApiService.getSmsSignByid(enterpriseId, signId), EnterpriseSmsSignVO.class);
     }
 
     @RequestMapping("/edit-sms")
-    public RestResponse editSms(Long signId, String smsSignId, String smsSignText, int useType) {
+    public RestResponse editSms(Long signId, String smsSignId, String smsSignText, int useType, Integer enterpriseId) {
         return ResultControllerUtils
-                .commonResult(smsOuterApiService.editEnterpriseSmsSign(UserDetailUtils.getUserDetail().getEnterpriseId(), signId, smsSignId, smsSignText, useType));
+                .commonResult(smsOuterApiService.editEnterpriseSmsSign(enterpriseId, signId, smsSignId, smsSignText, useType));
     }
 
     @RequestMapping("/delete-sms")