数据配置-单效配置调整

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

@@ -24,6 +24,11 @@ public class DataSingleEffectConfigDTO implements Serializable{
     private Integer enterpriseId;
 
     /**
+     * 订单粒度 1:订单粒度（默认） 2:订单粒度（统计到商品品牌）
+     */
+    private Integer orderGrain;
+
+    /**
      * 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
      */
     private Integer sale;
@@ -152,4 +157,13 @@ public class DataSingleEffectConfigDTO implements Serializable{
         this.updateTime = updateTime;
         return this;
     }
+
+    public Integer getOrderGrain() {
+        return orderGrain;
+    }
+
+    public DataSingleEffectConfigDTO setOrderGrain(Integer orderGrain) {
+        this.orderGrain = orderGrain;
+        return this;
+    }
 }

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/BillListQueryQO.java

@@ -23,6 +23,11 @@ public class BillListQueryQO extends PageQO{
 
     private Integer enterpriseId;
 
+    /**
+     * 流水号 支付流水号/订单流水号
+     */
+    private String serialNumber;
+
     public String getStartTime() {
         return startTime;
     }
@@ -62,4 +67,13 @@ public class BillListQueryQO extends PageQO{
     public void setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public BillListQueryQO setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+        return this;
+    }
 }

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

@@ -58,10 +58,10 @@ public interface DataConfigApiService {
      * @Title: configSingleEffect

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

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

     
*/
-    ServiceResponse<Void> configSingleEffect(DataSingleEffectConfigDTO dto);
+    ServiceResponse<Void> configSingleEffect(List<DataSingleEffectConfigDTO> dtoList);
 
     /**
      * 获取单效取值配置
@@ -71,7 +71,7 @@ public interface DataConfigApiService {
      * @param enterpriseId

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

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

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;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface TabDataSingleEffectConfigMapper {
     /**
@@ -51,5 +54,7 @@ public interface TabDataSingleEffectConfigMapper {
      */
     int updateByPrimaryKey(TabDataSingleEffectConfig record);
 
-    TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId);
+    List<TabDataSingleEffectConfig> getByEnterpriseId(Integer enterpriseId);
+
+    void deleteSingleEffectConfig(@Param("enterpriseId") Integer enterpriseId, @Param("orderGrain") Integer orderGrain);
 }
\ No newline at end of file

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

@@ -17,6 +17,11 @@ public class TabDataSingleEffectConfig {
     private Integer enterpriseId;
 
     /**
+     * 订单粒度 1:订单粒度（默认） 2:订单粒度（统计到商品品牌）
+     */
+    private Integer orderGrain;
+
+    /**
      * 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
      */
     private Integer sale;
@@ -145,4 +150,13 @@ public class TabDataSingleEffectConfig {
         this.updateTime = updateTime;
         return this;
     }
+
+    public Integer getOrderGrain() {
+        return orderGrain;
+    }
+
+    public TabDataSingleEffectConfig setOrderGrain(Integer orderGrain) {
+        this.orderGrain = orderGrain;
+        return this;
+    }
 }
\ No newline at end of file

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

@@ -3,6 +3,8 @@ package com.gic.enterprise.service;
 import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
 import com.gic.enterprise.entity.TabDataSingleEffectConfig;
 
+import java.util.List;
+
 public interface DataSingleEffectConfigService {
 
     /**
@@ -25,5 +27,16 @@ public interface DataSingleEffectConfigService {
      * @param enterpriseId

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

     
*/
-    TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId);
+    List<TabDataSingleEffectConfig> getByEnterpriseId(Integer enterpriseId);
+
+    /**
+     * 删除
+     * @Title: deleteSingleEffectConfig

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param orderGrain
订单粒度 1:订单粒度（默认） 2:订单粒度（统计到商品品牌）
+     * @return  void

+    
*/
+    void deleteSingleEffectConfig(Integer enterpriseId, Integer orderGrain);
 }

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 @Service("dataSingleEffectConfigService")
 public class DataSingleEffectConfigServiceImpl implements DataSingleEffectConfigService{
@@ -33,7 +34,12 @@ public class DataSingleEffectConfigServiceImpl implements DataSingleEffectConfig
     }
 
     @Override
-    public TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId) {
+    public List<TabDataSingleEffectConfig> getByEnterpriseId(Integer enterpriseId) {
         return tabDataSingleEffectConfigMapper.getByEnterpriseId(enterpriseId);
     }
+
+    @Override
+    public void deleteSingleEffectConfig(Integer enterpriseId, Integer orderGrain) {
+        tabDataSingleEffectConfigMapper.deleteSingleEffectConfig(enterpriseId, orderGrain);
+    }
 }

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

@@ -106,35 +106,34 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
     }
 
     @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();
+    public ServiceResponse<Void> configSingleEffect(List<DataSingleEffectConfigDTO> dtoList) {
+        if (CollectionUtils.isEmpty(dtoList)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "单效配置内容为空");
+        }
+        for (DataSingleEffectConfigDTO dto : dtoList) {
+            dataSingleEffectConfigService.deleteSingleEffectConfig(dto.getEnterpriseId(), dto.getOrderGrain());
+            dataSingleEffectConfigService.saveSingleEffectConfig(dto);
         }
-        dataSingleEffectConfigService.saveSingleEffectConfig(dto);
         return ServiceResponse.success();
     }
 
     @Override
-    public ServiceResponse<DataSingleEffectConfigDTO> getSingleEffectConfig(Integer enterpriseId) {
-        TabDataSingleEffectConfig record = dataSingleEffectConfigService.getByEnterpriseId(enterpriseId);
+    public ServiceResponse<List<DataSingleEffectConfigDTO>> getSingleEffectConfig(Integer enterpriseId) {
+        List<TabDataSingleEffectConfig> record = dataSingleEffectConfigService.getByEnterpriseId(enterpriseId);
         if (record == null) {
-            return ServiceResponse.success(EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class,
+            return ServiceResponse.success(EntityUtil.changeEntityListNew(DataSingleEffectConfigDTO.class,
                     dataSingleEffectConfigService.getByEnterpriseId(-1)));
         }
-        return ServiceResponse.success(EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class, record));
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(DataSingleEffectConfigDTO.class, record));
     }
 
     @Override
     public ServiceResponse<Void> initSingleEffectConfig(Integer enterpriseId) {
-        DataSingleEffectConfigDTO dto = EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class,
+        List<DataSingleEffectConfigDTO> dtoList = EntityUtil.changeEntityListNew(DataSingleEffectConfigDTO.class,
                 dataSingleEffectConfigService.getByEnterpriseId(-1));
-        dto.setSingleEffectConfigId(null);
-        dto.setEnterpriseId(enterpriseId);
-        configSingleEffect(dto);
+        dtoList = dtoList.stream().map(e -> e.setEnterpriseId(enterpriseId))
+                .map(e -> e.setSingleEffectConfigId(null)).collect(Collectors.toList());
+        configSingleEffect(dtoList);
         return ServiceResponse.success();
     }
 

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

@@ -295,6 +295,9 @@
     and time_end is not null
     and invoice_status = 0
     and status = 1
+    <if test="serialNumber != null and serialNumber != '' ">
+      and (serial_number like concat('%', #{serialNumber}, '%') or order_serial_number like concat('%', #{serialNumber}, '%'))
+    </if>
     <if test="buyType != null">
       and buy_type = #{buyType}
     </if>

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

@@ -4,6 +4,7 @@
   <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="order_grain" jdbcType="INTEGER" property="orderGrain" />
     <result column="sale" jdbcType="INTEGER" property="sale" />
     <result column="tag" jdbcType="INTEGER" property="tag" />
     <result column="order_number" jdbcType="INTEGER" property="orderNumber" />
@@ -14,7 +15,7 @@
     <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,
+    single_effect_config_id, enterprise_id, order_grain, sale, tag, order_number, sale_number, sale_number_target,
     status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -28,11 +29,11 @@
     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, 
+    insert into tab_data_single_effect_config (single_effect_config_id, enterprise_id, order_grain,
       sale, tag, order_number, sale_number,
       sale_number_target, status, create_time, 
       update_time)
-    values (#{singleEffectConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
+    values (#{singleEffectConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{orderGrain,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})
@@ -46,6 +47,9 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
+      <if test="orderGrain != null">
+        order_grain,
+      </if>
       <if test="sale != null">
         sale,
       </if>
@@ -78,6 +82,9 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
+      <if test="orderGrain != null">
+        #{orderGrain,jdbcType=INTEGER},
+      </if>
       <if test="sale != null">
         #{sale,jdbcType=INTEGER},
       </if>
@@ -110,6 +117,9 @@
       <if test="enterpriseId != null">
         enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       </if>
+      <if test="orderGrain != null">
+        order_grain = #{orderGrain,jdbcType=INTEGER},
+      </if>
       <if test="sale != null">
         sale = #{sale,jdbcType=INTEGER},
       </if>
@@ -140,6 +150,7 @@
   <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataSingleEffectConfig">
     update tab_data_single_effect_config
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      order_grain = #{orderGrain,jdbcType=INTEGER},
       sale = #{sale,jdbcType=INTEGER},
       tag = #{tag,jdbcType=INTEGER},
       order_number = #{orderNumber,jdbcType=INTEGER},
@@ -156,5 +167,14 @@
     from tab_data_single_effect_config
     where enterprise_id = #{enterpriseId}
     and status = 1
+
+    order by order_grain
   </select>
+
+  <update id="deleteSingleEffectConfig">
+    update tab_data_single_effect_config set status = 0
+    where enterprise_id = #{enterpriseId}
+    and order_grain = #{orderGrain}
+    and status = 1
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -69,16 +69,20 @@ public class DataConfigController {
     }
 
     @RequestMapping("/config-single-effect")
-    public RestResponse configSingleEffect(DataSingleEffectConfigDTO dto) {
-        dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        return OperationResultUtils.operationResult(dataConfigApiService.configSingleEffect(dto),
+    public RestResponse configSingleEffect(String jsonArr) {
+        if (StringUtil.isBlank(jsonArr)) {
+            return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "单效配置内容为空");
+        }
+        List<DataSingleEffectConfigDTO> dtoList = JSON.parseArray(jsonArr, DataSingleEffectConfigDTO.class);
+        dtoList = dtoList.stream().map(e -> e.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId())).collect(Collectors.toList());
+        return OperationResultUtils.operationResult(dataConfigApiService.configSingleEffect(dtoList),
                 OperationResultUtils.LOG_EDIT + "数据统计配置-单效取值配置",
                 UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
     }
 
     @RequestMapping("/get-single-effect-config")
     public RestResponse getSingleEffectConfig() {
-        return ResultControllerUtils.commonResultOne(
+        return ResultControllerUtils.commonResult(
                 dataConfigApiService.getSingleEffectConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
                 DataSingleEffectConfigVO.class);
     }