数据漏斗模型新增字段

src/main/java/com/caimei365/user/model/vo/ImpressionsVo.java

@@ -31,6 +31,10 @@ public class ImpressionsVo {
      * 小红书
      */
     private Integer redBookNumber;
+    /**
+     * 一点号
+     */
+    private Integer pointSingNumber;
     /**
      * 其它自媒体渠道
      */

src/main/java/com/caimei365/user/model/vo/ReadVolumeVo.java

@@ -31,6 +31,10 @@ public class ReadVolumeVo {
      * 小红书
      */
     private Integer redBookNumber;
+    /**
+     * 一点号
+     */
+    private Integer pointSingNumber;
     /**
      * 其它自媒体渠道
      */

src/main/java/com/caimei365/user/service/impl/ShopServiceImpl.java

@@ -1190,7 +1190,7 @@ public class ShopServiceImpl implements ShopService {
         // 获取展现量数据
         name = new ArrayList<>();
         value = new ArrayList<>();
-        int generalNumber = 0, microBlog = 0, redBookNumber = 0, otherNumber = 0;
+        int generalNumber = 0, microBlog = 0, redBookNumber = 0, otherNumber = 0, pointSingNumber = 0;
         if (null != marketReportIds && marketReportIds.size() > 0) {
             List<ImpressionsVo> marketImpressions = shopMapper.getMarketImpressions(marketReportIds);
             if (null != marketImpressions && marketImpressions.size() > 0) {
@@ -1198,6 +1198,7 @@ public class ShopServiceImpl implements ShopService {
                     generalNumber += imp.getGeneralNumber();
                     microBlog += imp.getMicroBlog();
                     redBookNumber += imp.getRedBookNumber();
+                    pointSingNumber += imp.getPointSingNumber();
                     otherNumber += imp.getOtherNumber();
                 }
             }
@@ -1206,18 +1207,20 @@ public class ShopServiceImpl implements ShopService {
         name.add("公众号");
         name.add("微博");
         name.add("小红书");
+        name.add("一点号");
         name.add("其它自媒体渠道");
         returnData.setNames(name);
         value.add(generalNumber);
         value.add(microBlog);
         value.add(redBookNumber);
+        value.add(pointSingNumber);
         value.add(otherNumber);
         returnData.setValues(value);
         map.put("intention", returnData);
         // 获取点击量数据
         name = new ArrayList<>();
         value = new ArrayList<>();
-        generalNumber = 0; microBlog = 0; redBookNumber = 0; otherNumber = 0;
+        generalNumber = 0; microBlog = 0; redBookNumber = 0; otherNumber = 0;pointSingNumber = 0;
         if (null != marketReportIds && marketReportIds.size() > 0) {
             List<ReadVolumeVo> marketReadVolume = shopMapper.getMarketReadVolume(marketReportIds);
             if (null != marketReadVolume && marketReadVolume.size() > 0) {
@@ -1225,6 +1228,7 @@ public class ShopServiceImpl implements ShopService {
                     generalNumber += readVolume.getGeneralNumber();
                     microBlog += readVolume.getMicroBlog();
                     redBookNumber += readVolume.getRedBookNumber();
+                    pointSingNumber += readVolume.getPointSingNumber();
                     otherNumber += readVolume.getOtherNumber();
                 }
             }
@@ -1233,11 +1237,13 @@ public class ShopServiceImpl implements ShopService {
         name.add("公众号");
         name.add("微博");
         name.add("小红书");
+        name.add("一点号");
         name.add("其它自媒体渠道");
         readVolumeReturnData.setNames(name);
         value.add(generalNumber);
         value.add(microBlog);
         value.add(redBookNumber);
+        value.add(pointSingNumber);
         value.add(otherNumber);
         readVolumeReturnData.setValues(value);
         map.put("allVisits", readVolumeReturnData);

src/main/resources/mapper/ShopMapper.xml

@@ -508,6 +508,7 @@
                generalNumber,
                microBlog,
                redBookNumber,
+               pointSingNumber,
                otherNumber
         FROM cm_market_impressions
         WHERE marketReportId in
@@ -521,6 +522,7 @@
                generalNumber,
                microBlog,
                redBookNumber,
+               pointSingNumber,
                otherNumber
         FROM cm_market_readVolume
         WHERE marketReportId in