训练营 去掉广电卡和好哒产品的激活统计

导出新增小组名称字段

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/mq/RabbitKxsActQueueListener.java

@@ -15,6 +15,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 客小爽pos 广电 来客吧激活推送队列
@@ -44,7 +47,11 @@ public class RabbitKxsActQueueListener {
 
             CampOpenNumStatDTO campOpenNumStatDTO = new CampOpenNumStatDTO();
             BeanUtils.copyProperties(parse, campOpenNumStatDTO);
-            remoteSysService.campOpenNumStat(campOpenNumStatDTO, SecurityConstants.FROM_IN);
+            //系统不自动统计广电卡业绩，包括线上、线下的，系统不自动统计好哒的业绩，包括码牌和设备
+            List<Integer> brandList = Arrays.asList(14, 18, 19, 20, 21);
+            if(!brandList.contains(parse.getBrandId())){
+                remoteSysService.campOpenNumStat(campOpenNumStatDTO, SecurityConstants.FROM_IN);
+            }
 
             channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
         } catch (Exception e) {

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/camp/CampBonusLogVO.java

@@ -45,7 +45,7 @@ public class CampBonusLogVO implements Serializable {
      * 统计的数量
      */
     @Schema(description = "统计的数量")
-    @ExcelProperty(value = "数量", index = 7)
+    @ExcelProperty(value = "数量", index = 6)
     private Integer sourceNum;
 
 
@@ -75,14 +75,14 @@ public class CampBonusLogVO implements Serializable {
      * 来源创客姓名
      */
     @Schema(description = "来源创客姓名")
-    @ExcelProperty(value = "来源创客姓名", index = 5)
+    @ExcelProperty(value = "来源创客姓名", index = 6)
     private String sourceName;
 
     /**
      * 来源创客编号
      */
     @Schema(description = "来源创客编号")
-    @ExcelProperty(value = "来源创客编号", index = 6)
+    @ExcelProperty(value = "来源创客编号", index = 7)
     private String sourceCode;
 
     /**
@@ -92,6 +92,12 @@ public class CampBonusLogVO implements Serializable {
     @ExcelProperty(value = "分组编号", index = 4)
     private String groupId;
 
+    /**
+     * 组名称
+     */
+    @ExcelProperty(value = "小组名称", index = 5)
+    private String groupName;
+
 
     /**
      * 来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6 来客吧激活=7 大小盟主兑换券=8

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampBonusLogMapper.xml

@@ -50,11 +50,12 @@
     </select>
     <select id="exportLog" resultType="com.kxs.system.api.vo.admin.camp.CampBonusLogVO">
         SELECT cbl.id, cbl.source_num, cbl.username as sourceName, cbl.source_id, cbl.user_code as sourceCode, cbl.source_type, cbl.remark, cbl.create_time, cbl.group_id, cbl.kind,
-        cu.username, cu.user_code,
+        cu.username, cu.user_code, cg.group_name
         c.title
         FROM  kxs_camp_bonus_log cbl
         LEFT JOIN kxs_camp_user cu ON cbl.camp_user_id = cu.user_id AND cu.camp_id = #{param.campId}
         LEFT JOIN kxs_camp c ON cbl.camp_id = c.id
+        left join kxs_camp_group cg on cg.group_id = cbl.group_id
         <where>
             AND cbl.del_flag = 0
             <if test="param.campId != null">