Selaa lähdekoodia

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

syh 4 vuotta sitten
vanhempi
commit
bb2f9e3a7b
17 muutettua tiedostoa jossa 521 lisäystä ja 573 poistoa
  1. 0 19
      jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/es5-shim-15.3.4.5/LICENSE
  2. 0 20
      jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/json3_3.2.6/LICENSE
  3. 1 1
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  4. 3 3
      jeecg-boot-module-system/src/main/resources/application-prod.yml
  5. 3 3
      jeecg-boot-module-system/src/main/resources/application-prod2.yml
  6. 4 4
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  7. 6 5
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  8. 1 1
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceAdvertiserDailyReportLoadJob.java
  9. 3 2
      module-job-kuaishou/src/main/resources/application-prod.yml
  10. 13 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyCampaign.java
  11. 107 107
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/AccountReportMapper.xml
  12. 31 31
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/DailyReportMapper.xml
  13. 69 69
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaiShouYiCheReportMapper.xml
  14. 165 191
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml
  15. 36 36
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAgentSumMapper.xml
  16. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCampaignMapper.xml
  17. 78 78
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/MaterialReportMapper.xml

+ 0 - 19
jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/es5-shim-15.3.4.5/LICENSE

@@ -1,19 +0,0 @@
-
-Copyright 2009, 2010 Kristopher Michael Kowal. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.

+ 0 - 20
jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/json3_3.2.6/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2012-2013 Kit Cambridge.
-http://kitcambridge.be/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -135,7 +135,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver

+ 3 - 3
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -67,14 +67,14 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://172.30.0.4:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
     username: hcst
-    password: test@20190531
+    password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
         loginUsername: admin
-        loginPassword: hcst2016
+        loginPassword: hcst20161
         enabled: true
       web-stat-filter:
         enabled: true

+ 3 - 3
jeecg-boot-module-system/src/main/resources/application-prod2.yml

@@ -93,14 +93,14 @@ spring:
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,slf4j
+        filters: stat,wall,slf4j
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
           username: hcst
-          password: test@20190531
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

+ 4 - 4
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,9 +56,9 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
-    password: test@20190531
+    password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
@@ -96,9 +96,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
-          password: test@20190531
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:

+ 6 - 5
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -22,6 +22,7 @@ import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataServ
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceFundDailyService;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xxl.job.core.context.XxlJobHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.junit.Test;
@@ -136,11 +137,11 @@ public class SampleTest {
     }
 
     @Test
-    public void loadBytedancePlanData() {
-        CtopOauthToken token = tokenService.getTokenByAccountId(100198696723L);
-//        advertiserDataService.getAdvertiserPlan(token, "", null, null);
-        Date getDate = DateUtils.addDay(new Date(), 0);
-        reportService.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
+    public void loadKuaishouPlanData() {
+        Date getDate = DateUtils.addDay(new Date(), -1);
+        //1:查询当日数据
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        tokens.forEach(token -> kuaishouInterfaceService.getAdvertiserCampaignReportDaily(token, getDate, getDate));
     }
 
     @Autowired

+ 1 - 1
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceAdvertiserDailyReportLoadJob.java

@@ -30,7 +30,7 @@ public class BytedanceAdvertiserDailyReportLoadJob {
     static ExecutorService executorService = Executors.newFixedThreadPool(5);;
 
     @XxlJob("bytedanceAdvertiserDailyReport")
-    public void execute(String params) throws Exception {
+    public void execute() throws Exception {
         XxlJobHelper.log("头条广告主日报获取任务执行开始");
         Date getDate = DateUtils.addDay(new Date(), -1);
         //1:查询当日数据

+ 3 - 2
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -176,10 +176,11 @@ xxl:
   job:
     accessToken:
     executor:
-      appname: module-job-kuaishou-v2
+      appname: module-job-kuaishou
       port: 9998
       ip:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-      addresses: http://129.28.150.229:8090/xxl-job-admin
+#      addresses: http://129.28.150.229:8090/xxl-job-admin
+      addresses: http://139.186.29.76:8090/xxl-job-admin

+ 13 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyCampaign.java

@@ -34,9 +34,9 @@ public class KuaishouReportDailyCampaign implements Serializable {
     @JsonProperty
     private Long bclick;
     @JsonProperty("photo_share")
-    private Long share;
+    private Long photoShare;
     @JsonProperty("photo_comment")
-    private Long comment;
+    private Long photoComment;
     @JsonProperty
     private Long photoLike;
     @JsonProperty
@@ -64,6 +64,10 @@ public class KuaishouReportDailyCampaign implements Serializable {
     @JsonProperty("impression_1k_cost")
     @TableField("impression_1k_cost")
     private BigDecimal impression1kCost;
+
+    @JsonProperty("play_3s_ratio")
+    @TableField("play_3s_ratio")
+    private BigDecimal play3sRatio;
     @JsonProperty
     private BigDecimal photoClickCost;
     @JsonProperty
@@ -82,6 +86,11 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventRegister;
     @JsonProperty
     private BigDecimal eventRegisterCost;
+    private BigDecimal eventRegisterRatio;
+    private BigDecimal eventCreditGrantLandingRatio;
+    private BigDecimal eventNextDayStayCost;
+    private Long eventNextDayStay;
+    private BigDecimal eventNextDayStayRatio;
     @JsonProperty
     private Long eventJinJianApp;
     @JsonProperty
@@ -114,6 +123,8 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventCreditGrantLandingPage;
     @JsonProperty
     private BigDecimal eventCreditGrantLandingPageCost;
+    private Integer status;
+    private String campaignName;
     @JsonProperty
     private Date createTime;
     @JsonProperty

+ 107 - 107
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/AccountReportMapper.xml

@@ -5,44 +5,44 @@
 
     <select id="selectSummaryByAccountId" resultType="com.alibaba.fastjson.JSONObject">
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
-        sum(form_count) formCount, -- 表单提交数
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
+        sum(bclick) bClick,
+        sum(form_count) formCount,
+        (sum(charge) / sum(form_count)) formPrice,
+        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice,
+        sum(event_register) eventRegister,
 
-        sum(form_count + activation) conversionNum, -- 转化数
+        sum(form_count + activation) conversionNum,
 
         (case
         when sum(activation +form_count) != 0
         then (sum(charge) / sum(activation +form_count))
         else 0
         end
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
 
         (case
         when sum(activation +form_count) != 0
         then (sum(charge) / sum(activation +form_count)) / #{discount}
         else 0
         end
-        ) afterConversionPrice, -- 折后转化单价
+        ) afterConversionPrice,
 
         (case
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         else 0
         end
-        ) eventRegisterCost -- 注册成本
+        ) eventRegisterCost
         from
         ctop_kuaishou_report_hourly_account
         where stat_date = #{date}
@@ -57,31 +57,31 @@
 
     <select id="selectAccountReport" resultType="com.alibaba.fastjson.JSONObject">
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice, -- 激活单价
+        (sum(charge) / sum(form_count)) formPrice,
+        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        (select auth_name from ctop_user_allocation where account_id = t1.account_id limit 1) accountName,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
         then (sum(event_next_day_stay)/sum(activation))
         else 0
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where account_id in
         <foreach item="item" index="index" collection="accountIds"
                  open="(" separator="," close=")">
@@ -93,40 +93,40 @@
 
     <select id="selectAccountReportByDate" resultType="com.alibaba.fastjson.JSONObject">
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
-        sum(form_count + activation) conversionNum, -- 转化数
-        (sum(charge) / sum(activation +form_count )) conversionPrice, -- 转化单价
+        (sum(charge) / sum(form_count)) formPrice,
+        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice,
+        sum(event_register) eventRegister,
+        sum(form_count + activation) conversionNum,
+        (sum(charge) / sum(activation +form_count )) conversionPrice,
         (case
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         else 0
         end
-        ) eventRegisterCost, -- 注册成本
+        ) eventRegisterCost,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
         then (sum(event_next_day_stay)/sum(activation))
         else 0
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where stat_date &lt;= #{startDate}
         and stat_date &gt;= #{endDate}
         and account_id in
@@ -140,27 +140,27 @@
 
     <select id="selectReportDetailGroupAccountId" resultType="com.alibaba.fastjson.JSONObject">
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
-        sum(form_count + activation) conversionNum, -- 转化数
+        (sum(charge) / sum(form_count)) formPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        sum(event_register) eventRegister,
+        sum(form_count + activation) conversionNum,
 
         (
         case when sum(activation +form_count ) != 0
         then (sum(charge) / sum(activation +form_count))
         else 0
         end
-        )conversionPrice, -- 转化单价
+        )conversionPrice,
 
 
         (case
@@ -168,12 +168,12 @@
         then (sum(charge) / sum(event_register))
         else 0
         end
-        ) eventRegisterCost, -- 注册成本
+        ) eventRegisterCost,
 
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName
         from
-        ctop_kuaishou_report_hourly_account
+        ctop_kuaishou_report_hourly_account t1
         where stat_date = #{date}
         and stat_hour &lt;= #{statHour}
         and account_id in
@@ -187,44 +187,44 @@
 
     <select id="selectReportDetailGroupAccountIdByDate" resultType="com.alibaba.fastjson.JSONObject">
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
-        sum(form_count + activation) conversionNum, -- 转化数
+        (sum(charge) / sum(form_count)) formPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        sum(event_register) eventRegister,
+        sum(form_count + activation) conversionNum,
         (
         case when sum(activation +form_count ) != 0
         then (sum(charge) / sum(activation +form_count))
         else 0
         end
-        )conversionPrice, -- 转化单价
+        )conversionPrice,
 
         (case
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         else 0
         end
-        ) eventRegisterCost, -- 注册成本
+        ) eventRegisterCost,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
         then ( sum(event_next_day_stay) / sum(activation) )
         else 0
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where stat_date = #{statDate}
         and account_id in
         <foreach item="item" index="index" collection="accountIds"
@@ -426,24 +426,24 @@
 
     <select id="selectSummaryByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         select
-        sum(charge) cost, -- 消耗
+        sum(charge) cost,
         (case
         when sum(charge) != 0
         then (sum(charge) / #{discount})
         else 0
         end
-        ) discountCost, -- 封面点击率
+        ) discountCost,
 
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
 
         (case
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(bclick) != 0
@@ -459,7 +459,7 @@
         end
         ) cpm,
 
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         (
         CASE
         WHEN sum(form_count + activation) != 0 THEN
@@ -467,8 +467,8 @@
         ELSE
         0
         END
-        ) conversionPrice, -- 转化单价
-        sum(form_count + activation) conversions, -- 转化数
+        ) conversionPrice,
+        sum(form_count + activation) conversions,
         (
         CASE
         WHEN sum(form_count + activation) != 0 THEN
@@ -477,20 +477,20 @@
         0
         END
         ) discountConversionPrice,
-        sum(event_register) eventRegister, -- 注册数
+        sum(event_register) eventRegister,
         (case
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         else 0
         end
-        ) eventRegisterCost, -- 注册成本
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        ) eventRegisterCost,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
         then (sum(event_next_day_stay)/sum(activation))
         else 0
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
 
         from
         ctop_kuaishou_report_daily_account
@@ -521,24 +521,24 @@
     <select id="selectHourSummaryByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
 
         select
-        sum(charge) cost, -- 消耗
+        sum(charge) cost,
         (case
         when sum(charge) != 0
         then (sum(charge) / #{discount})
         else 0
         end
-        ) discountCost, -- 封面点击率
+        ) discountCost,
 
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
 
         (case
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(bclick) != 0
@@ -553,8 +553,8 @@
         else 0
         end
         ) cpm,
-        sum(form_count + activation) conversions, -- 转化数
-        sum(bclick) bClick,-- 行为数
+        sum(form_count + activation) conversions,
+        sum(bclick) bClick,
 
         (
         CASE
@@ -563,7 +563,7 @@
         ELSE
         0
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
         (
         CASE
         WHEN sum(activation + form_count) != 0 THEN
@@ -572,13 +572,13 @@
         0
         END
         ) discountConversionPrice,
-        sum(event_register) eventRegister, -- 注册数
+        sum(event_register) eventRegister,
         (case
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         else 0
         end
-        ) eventRegisterCost -- 注册成本
+        ) eventRegisterCost
 
         from
         ctop_kuaishou_report_hourly_account

+ 31 - 31
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/DailyReportMapper.xml

@@ -5,9 +5,9 @@
     <select id="getDailyReport" parameterType="Map" resultType="cn.com.ctop.common.module.vo.DailyAccountReportVO">
         SELECT
         t1.*,
-        truncate((t1.conversions / t1.bclick),4) conversionRate, -- 转化率
+        truncate((t1.conversions / t1.bclick),4) conversionRate,
 
-        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice, -- 折后转化成本
+        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice,
 
         (SELECT sum(contract_rebate_real_charged)
         from ctop_kuaishou_daily_flows
@@ -25,13 +25,13 @@
 
             </if>
         </where>
-        ) contractRebateRealCharged -- 激励花费
+        ) contractRebateRealCharged
         FROM (
         SELECT
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 展现数
-        sum(aclick) aclick, -- 素材曝光数
-        sum(photo_click) photoClick, -- 点击数
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(aclick) aclick,
+        sum(photo_click) photoClick,
         (
         CASE
         WHEN sum(photo_show) != 0 THEN
@@ -41,7 +41,7 @@
         ELSE
         0
         END
-        ) photoClickRatio, -- 点击率
+        ) photoClickRatio,
         (
         CASE
         WHEN sum(charge) != 0 THEN
@@ -51,9 +51,9 @@
         ELSE
         0
         END
-        ) photoClickCost, -- 平均点击花费
+        ) photoClickCost,
 
-        sum(bclick) bclick, -- 行为数
+        sum(bclick) bclick,
 
         (
         CASE
@@ -62,7 +62,7 @@
         ELSE
         0
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         CASE
         WHEN sum(photo_show) != 0 THEN
@@ -71,8 +71,8 @@
         ELSE
         0
         END
-        ) impression1kCost, -- 平均千次展现花费
-        sum(form_count + activation) conversions, -- 转化数
+        ) impression1kCost,
+        sum(form_count + activation) conversions,
         (
         CASE
         WHEN sum(form_count + activation) != 0 THEN
@@ -82,7 +82,7 @@
         ELSE
         0
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
         FROM
         ctop_kuaishou_report_daily_account
         <where>
@@ -108,8 +108,8 @@
     <select id="getDailyGroupReport" parameterType="Map" resultType="cn.com.ctop.common.module.vo.DailyGroupReportVO">
         SELECT
         t1.*,
-        truncate(t1.conversions / t1.photoClick,4) clickConversionRate, -- 点击转化率
-        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice-- 折后转化单价
+        truncate(t1.conversions / t1.photoClick,4) clickConversionRate,
+        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice
         FROM
         (
         SELECT
@@ -121,15 +121,15 @@
         ctop_user_allocation
         WHERE
         account_id = accountId
-        ) authName, -- 账户名称
-        stat_date statDate, -- 报表日期
-        campaign_name campaignName, -- 计划名称
-        unit_name unitName, -- 广告组名称
-        sum(charge) cost, -- 花费
-        truncate((sum(charge) / #{discount}),2) disCountCost, -- 折后消费
-        sum(photo_show) photoShow, -- 展现数
-        sum(photo_click) photoClick, -- 点击数
-        sum(bclick) bclick, -- 行为数
+        ) authName,
+        stat_date statDate,
+        campaign_name campaignName,
+        unit_name unitName,
+        sum(charge) cost,
+        truncate((sum(charge) / #{discount}),2) disCountCost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(bclick) bclick,
         (
         CASE
         WHEN sum(aclick) != 0 THEN
@@ -137,7 +137,7 @@
         ELSE
         0
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
         (
@@ -147,7 +147,7 @@
         ELSE
         0
         END
-        ) photoClickRatio, -- 点击率
+        ) photoClickRatio,
 
 
         (
@@ -159,7 +159,7 @@
         ELSE
         0
         END
-        ) impression1kCost, -- 平均千次展现花费
+        ) impression1kCost,
         (
         CASE
         WHEN sum(charge) != 0 THEN
@@ -169,9 +169,9 @@
         ELSE
         0
         END
-        ) photoClickCost, -- 平均点击花费
+        ) photoClickCost,
 
-        sum(form_count + activation) conversions, -- 转化数
+        sum(form_count + activation) conversions,
         (
         CASE
         WHEN sum(form_count + activation) != 0 THEN
@@ -181,7 +181,7 @@
         ELSE
         0
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
 
         FROM
         ctop_kuaishou_report_daily_group

+ 69 - 69
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaiShouYiCheReportMapper.xml

@@ -110,7 +110,7 @@
 
     <select id="getDailyReportByMap" parameterType="java.util.Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        '汇创' agent, -- 代理商
+        '汇创' agent,
         (
         CASE
         WHEN t1.media_id = 1 THEN
@@ -120,13 +120,13 @@
         ELSE
         '未知'
         END
-        ) media, -- 媒体
-        t1.system_type systemType, -- 设备
-        t2.stat_date statDate, -- 日期
-        sum(t2.charge) charge, -- 账面花费
-        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost, -- 现金花费
-        sum(t2.photo_show) photoShow, -- 嚗光
-        sum(t2.photo_click) photoClick, -- 点击
+        ) media,
+        t1.system_type systemType,
+        t2.stat_date statDate,
+        sum(t2.charge) charge,
+        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
         (
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
@@ -142,7 +142,7 @@
         ELSE
         0
         END
-        ) clickRate, -- 点击率
+        ) clickRate,
         (
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
@@ -155,12 +155,12 @@
         ELSE
         0
         END
-        ) impression1kCost, -- 千次嚗光花费
-        sum(t2.bclick) bclick, -- 行为量
-        sum(t2.download_completed) eventJinJianApp, -- 下载完成数
-        sum(t2.activation) activation, -- 账户激活量
-        0 youMengactivation, -- 友盟激活量
-        sum(t2.activation) tdActivation, -- TD激活量
+        ) impression1kCost,
+        sum(t2.bclick) bclick,
+        sum(t2.download_completed) eventJinJianApp,
+        sum(t2.activation) activation,
+        0 youMengactivation,
+        sum(t2.activation) tdActivation,
         (
         CASE
         WHEN sum(t2.activation) != 0 THEN
@@ -171,8 +171,8 @@
         ELSE
         0
         END
-        ) activationCost, -- 账户激活成本
-        0 youMengactivationCost, -- 友盟激活成本
+        ) activationCost,
+        0 youMengactivationCost,
         (
         CASE
         WHEN sum(t2.activation) != 0 THEN
@@ -183,7 +183,7 @@
         ELSE
         0
         END
-        ) tdActivationCost, -- TD激活成本
+        ) tdActivationCost,
         (
         CASE
         WHEN sum(t2.bclick) != 0 THEN
@@ -194,7 +194,7 @@
         ELSE
         0
         END
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
         (
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
@@ -205,7 +205,7 @@
         ELSE
         0
         END
-        ) clickCost, -- 平均点击单价
+        ) clickCost,
         (
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
@@ -219,7 +219,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         CASE
         WHEN sum(t2.bclick) != 0 THEN
@@ -233,7 +233,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) eventJinJianAppRatio, -- 下载完成行为率
+        ) eventJinJianAppRatio,
         (
         CASE
         WHEN sum(t2.download_completed) != 0 THEN
@@ -247,7 +247,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) activationRatio -- 下载完成激活率
+        ) activationRatio
         FROM
         ctop_user_allocation t1
         LEFT JOIN ctop_kuaishou_report_daily_account t2 ON t1.account_id = t2.account_id
@@ -268,7 +268,7 @@
     <select id="getDirectApplicationReportByMap" parameterType="java.util.Map"
             resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        '汇创' agent, -- 代理商
+        '汇创' agent,
         (
         CASE
         WHEN t2.media_id = 1 THEN
@@ -278,13 +278,13 @@
         ELSE
         '未知'
         END
-        ) media, -- 媒体
-        t2.system_type systemType, -- 设备
-        t2.stat_date statDate, -- 日期
-        sum(t2.charge) charge, -- 账面花费
-        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost, -- 现金花费
-        sum(t2.photo_show) photoShow, -- 嚗光
-        sum(t2.photo_click) photoClick, -- 点击
+        ) media,
+        t2.system_type systemType,
+        t2.stat_date statDate,
+        sum(t2.charge) charge,
+        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
         (
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
@@ -300,7 +300,7 @@
         ELSE
         0
         END
-        ) clickRate,-- 点击率
+        ) clickRate,
         (
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
@@ -313,12 +313,12 @@
         ELSE
         0
         END
-        ) impression1kCost, -- 千次嚗光花费
-        sum(t2.bclick) bclick, -- 行为量
-        sum(t2.download_completed) eventJinJianApp, -- 下载完成数
-        sum(t2.activation) activation, -- 账户激活量
-        0 youMengactivation, -- 友盟激活量
-        sum(t2.activation) tdActivation, -- TD激活量
+        ) impression1kCost,
+        sum(t2.bclick) bclick,
+        sum(t2.download_completed) eventJinJianApp,
+        sum(t2.activation) activation,
+        0 youMengactivation,
+        sum(t2.activation) tdActivation,
         (
         CASE
         WHEN sum(t2.activation) != 0 THEN
@@ -329,8 +329,8 @@
         ELSE
         0
         END
-        ) activationCost, -- 账户激活成本
-        0 youMengactivationCost,-- 友盟激活成本
+        ) activationCost,
+        0 youMengactivationCost,
         (
         CASE
         WHEN sum(t2.activation) != 0 THEN
@@ -341,7 +341,7 @@
         ELSE
         0
         END
-        ) tdActivationCost,-- TD激活成本
+        ) tdActivationCost,
         (
         CASE
         WHEN sum(t2.bclick) != 0 THEN
@@ -352,7 +352,7 @@
         ELSE
         0
         END
-        ) actionCost,-- 平均行为单价
+        ) actionCost,
         (
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
@@ -363,7 +363,7 @@
         ELSE
         0
         END
-        ) clickCost, -- 平均点击单价
+        ) clickCost,
         (
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
@@ -377,7 +377,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         CASE
         WHEN sum(t2.bclick) != 0 THEN
@@ -391,7 +391,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) eventJinJianAppRatio, -- 下载完成行为率
+        ) eventJinJianAppRatio,
         (
         CASE
         WHEN sum(t2.download_completed) != 0 THEN
@@ -405,7 +405,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) activationRatio -- 下载完成激活率
+        ) activationRatio
         FROM
         (
         SELECT
@@ -453,7 +453,7 @@
             resultType="com.alibaba.fastjson.JSONObject">
 
         SELECT
-        '汇创' agent, -- 代理商
+        '汇创' agent,
         (
         CASE
         WHEN t2.media_id = 1 THEN
@@ -463,14 +463,14 @@
         ELSE
         '未知'
         END
-        ) media, -- 媒体
-        t2.system_type systemType, -- 设备
-        t2.stat_date statDate, -- 日期
+        ) media,
+        t2.system_type systemType,
+        t2.stat_date statDate,
         t2.campaignName campaignName ,
-        sum(t2.charge) charge, -- 账面花费
-        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost, -- 现金花费
-        sum(t2.photo_show) photoShow, -- 嚗光
-        sum(t2.photo_click) photoClick, -- 点击
+        sum(t2.charge) charge,
+        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
         (
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
@@ -486,7 +486,7 @@
         ELSE
         0
         END
-        ) clickRate,-- 点击率
+        ) clickRate,
         (
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
@@ -499,12 +499,12 @@
         ELSE
         0
         END
-        ) impression1kCost, -- 千次嚗光花费
-        sum(t2.bclick) bclick, -- 行为量
-        sum(t2.download_completed) eventJinJianApp, -- 下载完成数
-        sum(t2.activation) activation, -- 账户激活量
-        0 youMengactivation, -- 友盟激活量
-        sum(t2.activation) tdActivation, -- TD激活量
+        ) impression1kCost,
+        sum(t2.bclick) bclick,
+        sum(t2.download_completed) eventJinJianApp,
+        sum(t2.activation) activation,
+        0 youMengactivation,
+        sum(t2.activation) tdActivation,
         (
         CASE
         WHEN sum(t2.activation) != 0 THEN
@@ -515,8 +515,8 @@
         ELSE
         0
         END
-        ) activationCost, -- 账户激活成本
-        0 youMengactivationCost,-- 友盟激活成本
+        ) activationCost,
+        0 youMengactivationCost,
         (
         CASE
         WHEN sum(t2.activation) != 0 THEN
@@ -527,7 +527,7 @@
         ELSE
         0
         END
-        ) tdActivationCost,-- TD激活成本
+        ) tdActivationCost,
         (
         CASE
         WHEN sum(t2.bclick) != 0 THEN
@@ -538,7 +538,7 @@
         ELSE
         0
         END
-        ) actionCost,-- 平均行为单价
+        ) actionCost,
         (
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
@@ -549,7 +549,7 @@
         ELSE
         0
         END
-        ) clickCost, -- 平均点击单价
+        ) clickCost,
         (
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
@@ -563,7 +563,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         CASE
         WHEN sum(t2.bclick) != 0 THEN
@@ -577,7 +577,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) eventJinJianAppRatio, -- 下载完成行为率
+        ) eventJinJianAppRatio,
         (
         CASE
         WHEN sum(t2.download_completed) != 0 THEN
@@ -591,7 +591,7 @@
         ELSE
         CONCAT(0, '%')
         END
-        ) activationRatio -- 下载完成激活率
+        ) activationRatio
         FROM
         (
         SELECT

+ 165 - 191
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml

@@ -547,52 +547,52 @@
         b.project_id as 'projectId',
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(a.event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(a.event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
+        'photoClickRatio',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         when sum(a.photo_show) != 0
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         ctop_kuaishou_report_daily_account a
         left join ctop_user_allocation b on a.account_id = b.account_id
@@ -646,53 +646,53 @@
         )
         ) as 'designResponsibleName',
         ifnull(round(sum(a.charge),3),0) as 'charge',
-        ifnull(sum(a.photo_show),0) as 'photoShow', -- 封面曝光数
-        ifnull(sum(a.photo_click),0) as 'photoClick', -- 封面点击数
-        ifnull(sum(a.aclick),0) as 'aclick', -- 素材曝光数
-        ifnull(sum(a.bclick),0) as 'bclick', -- 行为数
-        ifnull(sum(a.activation),0) as 'activation', -- 激活数
-        ifnull(sum(a.submit),0) as 'submit', -- 提交按钮点击数
-        ifnull(sum(a.event_register),0) as 'eventRegister', -- 注册数
-        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        ifnull(sum(a.photo_show),0) as 'photoShow',
+        ifnull(sum(a.photo_click),0) as 'photoClick',
+        ifnull(sum(a.aclick),0) as 'aclick',
+        ifnull(sum(a.bclick),0) as 'bclick',
+        ifnull(sum(a.activation),0) as 'activation',
+        ifnull(sum(a.submit),0) as 'submit',
+        ifnull(sum(a.event_register),0) as 'eventRegister',
+        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when (sum(a.photo_show) is not null and sum(a.photo_show)!=0) then
         concat(round(ifnull(sum(a.photo_click),0)/sum(a.photo_show) * 100 ,2),'%') else 0 end as 'photoClickRate',
         case when (sum(a.aclick) is not null and sum(a.aclick)!=0) then
-        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate', -- 行为率
+        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate',
         (case
         when (sum(a.photo_show) is not null and sum(a.photo_show) != 0)
         then round((ifnull(sum(a.charge),0) / sum(a.photo_show)) * 1000,2)
         else 0
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         when (sum(a.photo_click) is not null and sum(a.photo_click) != 0)
         then round( ifnull(sum(a.charge),0) / sum(a.photo_click),2)
         else 0
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         WHEN ( sum(a.bclick) is not null and sum(a.bclick) != 0)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         end
-        ) as 'actionCost', -- 平均行为单价
-        ifnull(sum(a.photo_share),0) as 'photoShare', -- 分享数
-        ifnull(sum(a.photo_comment),0) as 'photoComment', -- 评论数
-        ifnull(sum(a.photo_like),0) as 'photoLike', -- 点赞数
-        ifnull(sum(a.follow),0) as 'follow', -- 新增关注数
-        ifnull(sum(a.report),0) as 'report', -- 举报数
-        ifnull(sum(a.cancel_follow),0) as 'cancelFollow', -- 取消关注数
-        ifnull(sum(a.block),0) as 'block', -- 拉黑数
-        ifnull(sum(a.negative),0) as 'nagative', -- 减少此类作品数
-        ifnull(sum(a.download_started),0) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        ifnull(sum(a.download_completed),0) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        ifnull(sum(a.photo_share),0) as 'photoShare',
+        ifnull(sum(a.photo_comment),0) as 'photoComment',
+        ifnull(sum(a.photo_like),0) as 'photoLike',
+        ifnull(sum(a.follow),0) as 'follow',
+        ifnull(sum(a.report),0) as 'report',
+        ifnull(sum(a.cancel_follow),0) as 'cancelFollow',
+        ifnull(sum(a.block),0) as 'block',
+        ifnull(sum(a.negative),0) as 'nagative',
+        ifnull(sum(a.download_started),0) as 'downloadStarted',
+        ifnull(sum(a.download_completed),0) as 'downloadCompleted',
         (CASE
         WHEN ( sum(a.event_next_day_stay) is not null and sum(a.event_next_day_stay) != 0)
         THEN round( ifnull(sum(a.charge),0) / sum(a.event_next_day_stay) ,2)
         ELSE 0
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         ctop_kuaishou_report_daily_account a
         left join ctop_user_allocation b
@@ -710,10 +710,10 @@
         group by b.project_id order by sum(a.charge) desc
     </select>
 
-    <!-- 计划汇总 -->
+
     <select id="getKuaishouCampaignInfoByAccountId"
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        -- select * from(
+
         select
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -721,55 +721,55 @@
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         b.auth_name as 'authName',
         a.account_id as 'accountId',
-        a.campaign_id as 'campaignId', -- 计划id
-        a.campaign_name as 'campaignName', -- 计划名称
+        a.campaign_id as 'campaignId',
+        a.campaign_name as 'campaignName',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
-        case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate', --
+        'photoClickRatio',
+        case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         when sum(a.photo_show) != 0
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         ctop_kuaishou_report_daily_campaign a
         left join ctop_user_allocation b on a.account_id = b.account_id
@@ -798,18 +798,13 @@
         </if>
         group by a.campaign_id
         order by sum(a.charge) desc
-        <!--        ) m-->
 
-        <!--        <if test="yn = 1">-->
-        <!--            where-->
-        <!--            m.charge != 0-->
-        <!--        </if>-->
     </select>
 
-    <!-- 根据计划id获取组信息 -->
+
     <select id="getKuaishouUnitInfoByCampaignId"
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        -- select * from (
+
         select
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -817,61 +812,61 @@
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         a.account_id as 'accountId',
         b.auth_name as 'authName',
-        a.campaign_id as 'campaignId', -- 计划id
-        a.campaign_name as 'campaignName', -- 计划名称
-        a.unit_id as 'unitId', -- 组id,
-        a.unit_name as 'unitName', -- 组名称
+        a.campaign_id as 'campaignId',
+        a.campaign_name as 'campaignName',
+        a.unit_id as 'unitId',
+        a.unit_name as 'unitName',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
+        'photoClickRatio',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         when sum(a.photo_show) != 0
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         ctop_kuaishou_report_daily_group a
         left join ctop_user_allocation b on a.account_id = b.account_id
-        -- left join ctop_kuaishou_campaign c on a.campaign_id = c.campaign_id
+
         where
         a.stat_date &gt;= #{startDate}
         and
@@ -897,11 +892,7 @@
         </if>
         group by unit_id
         order by sum(a.charge) desc
-        <!--            ) m-->
-        <!--        <if test="yn = 1">-->
-        <!--            where-->
-        <!--            m.charge != 0-->
-        <!--        </if>-->
+
     </select>
 
     <select id="queryProjectMemberByUserId" resultType="long">
@@ -922,14 +913,6 @@
     <select id="queryProjectInfoBySaleId" resultType="long">
         select
         distinct c.id as projectId
-        -- c.project_name as projectName,
-        -- a.advertiser_id as advertiserId,
-        -- c.advertiser_name as advertiserName,
-        -- (SELECT media_id from ctop_project c where c.id=a.project_id limit 1) as mediaId,
-        -- c.responsible_name as responsibleName,
-        -- c.design_responsible_name as designResponsibleName,
-        -- c.sale_id as saleId,
-        -- u.realname as saleName
         from
         ctop_project c
         left join sys_user u on c.sale_id = u.id
@@ -946,9 +929,7 @@
         select
         distinct id as projectId,
         project_name as projectName,
-        -- a.advertiser_id as advertiserId,
         advertiser_name as advertiserName,
-        -- (SELECT media_id from ctop_project c where c.id=a.project_id limit 1) as mediaId,
         responsible_name as responsibleName,
         design_responsible_name as designResponsibleName
         from ctop_project
@@ -970,14 +951,10 @@
         where a.user_id = #{userId}
     </select>
 
-    <!-- 管理员所在项目 -->
+
     <select id="queryProjectMemberByAdmins" resultType="long">
         select
         id as projectId
-        -- project_name as projectName,
-        -- advertiser_name as advertiserName ,
-        -- responsible_name as responsibleName,
-        -- design_responsible_name as designResponsibleName
         from
         ctop_project
         where
@@ -991,7 +968,7 @@
 
     <select id="getKuaishouCreativeInfoByUnitId"
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        -- select * from (
+
         select
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -1001,57 +978,57 @@
         b.auth_name as 'authName',
         a.creative_id as 'creativeId',
         a.creative_name as 'creativeName',
-        a.campaign_id as 'campaignId', -- 计划id
-        a.campaign_name as 'campaignName', -- 计划名称
-        a.unit_id as 'unitId', -- 组id,
-        a.unit_name as 'unitName', -- 组名称
+        a.campaign_id as 'campaignId',
+        a.campaign_name as 'campaignName',
+        a.unit_id as 'unitId',
+        a.unit_name as 'unitName',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
+        'photoClickRatio',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         when sum(a.photo_show) != 0 and sum(a.photo_show) is not null
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         end
-        ) as 'eventNextDayStayCost', -- 次日留存成本
+        ) as 'eventNextDayStayCost',
         (select url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as url,
         (select cover_url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as coverUrl,
         (select material_type from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as materialType
@@ -1085,13 +1062,10 @@
         </if>
         group by a.creative_id
         order by sum(a.charge) desc
-        <!--        )m-->
-        <!--        <if test="yn=1">-->
-        <!--            where m.charge != 0-->
-        <!--        </if>-->
+
     </select>
 
-    <!-- 获取项目成员所在所有项目下的所有账户id -->
+
     <select id="getVideoUrl" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouVideoInfoDTO">
         select
         url as url,
@@ -1167,53 +1141,53 @@
         )
         ) as 'designResponsibleName',
         ifnull(round(sum(a.charge),3),0) as 'charge',
-        ifnull(sum(a.photo_show),0) as 'photoShow', -- 封面曝光数
-        ifnull(sum(a.photo_click),0) as 'photoClick', -- 封面点击数
-        ifnull(sum(a.aclick),0) as 'aclick', -- 素材曝光数
-        ifnull(sum(a.bclick),0) as 'bclick', -- 行为数
-        ifnull(sum(a.activation),0) as 'activation', -- 激活数
-        ifnull(sum(a.submit),0) as 'submit', -- 提交按钮点击数
-        ifnull(sum(a.event_register),0) as 'eventRegister', -- 注册数
-        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        ifnull(sum(a.photo_show),0) as 'photoShow',
+        ifnull(sum(a.photo_click),0) as 'photoClick',
+        ifnull(sum(a.aclick),0) as 'aclick',
+        ifnull(sum(a.bclick),0) as 'bclick',
+        ifnull(sum(a.activation),0) as 'activation',
+        ifnull(sum(a.submit),0) as 'submit',
+        ifnull(sum(a.event_register),0) as 'eventRegister',
+        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when (sum(a.photo_show) is not null and sum(a.photo_show)!=0) then
         concat(round(ifnull(sum(a.photo_click),0)/sum(a.photo_show) * 100 ,2),'%') else 0 end as 'photoClickRate',
         case when (sum(a.aclick) is not null and sum(a.aclick)!=0) then
-        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate', -- 行为率
+        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate',
         (case
         when (sum(a.photo_show) is not null and sum(a.photo_show) != 0)
         then round((ifnull(sum(a.charge),0) / sum(a.photo_show)) * 1000,2)
         else 0
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         when (sum(a.photo_click) is not null and sum(a.photo_click) != 0)
         then round( ifnull(sum(a.charge),0) / sum(a.photo_click),2)
         else 0
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         WHEN ( sum(a.bclick) is not null and sum(a.bclick) != 0)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         end
-        ) as 'actionCost', -- 平均行为单价
-        ifnull(sum(a.photo_share),0) as 'photoShare', -- 分享数
-        ifnull(sum(a.photo_comment),0) as 'photoComment', -- 评论数
-        ifnull(sum(a.photo_like),0) as 'photoLike', -- 点赞数
-        ifnull(sum(a.follow),0) as 'follow', -- 新增关注数
-        ifnull(sum(a.report),0) as 'report', -- 举报数
-        ifnull(sum(a.cancel_follow),0) as 'cancelFollow', -- 取消关注数
-        ifnull(sum(a.block),0) as 'block', -- 拉黑数
-        ifnull(sum(a.negative),0) as 'nagative', -- 减少此类作品数
-        ifnull(sum(a.download_started),0) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        ifnull(sum(a.download_completed),0) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        ifnull(sum(a.photo_share),0) as 'photoShare',
+        ifnull(sum(a.photo_comment),0) as 'photoComment',
+        ifnull(sum(a.photo_like),0) as 'photoLike',
+        ifnull(sum(a.follow),0) as 'follow',
+        ifnull(sum(a.report),0) as 'report',
+        ifnull(sum(a.cancel_follow),0) as 'cancelFollow',
+        ifnull(sum(a.block),0) as 'block',
+        ifnull(sum(a.negative),0) as 'nagative',
+        ifnull(sum(a.download_started),0) as 'downloadStarted',
+        ifnull(sum(a.download_completed),0) as 'downloadCompleted',
         (CASE
         WHEN ( sum(a.event_next_day_stay) is not null and sum(a.event_next_day_stay) != 0)
         THEN round( ifnull(sum(a.charge),0) / sum(a.event_next_day_stay) ,2)
         ELSE 0
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         ctop_kuaishou_report_daily_account a
         left join ctop_user_allocation b

+ 36 - 36
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAgentSumMapper.xml

@@ -2,24 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAgentSumMapper">
 
-    <!-- 公司报表sql -->
+
     <select id="companyReport" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgentSum">
             select
-            date_format(date, '%Y-%m-%d') as date,  <!-- 日期 -->
-            cost_campaign_count as costCampaignCount,  <!-- 有消费计划数 -->
-            balance as balance,  <!-- 总余额 -->
-            cost as cost,  <!-- 总消耗 -->
-            xianjin_cost as xianjinCost,  <!-- 现金消耗 -->
-            fandian_cost as fandianCost,  <!-- 后返消耗 -->
-            kuangfan_cost as kuangfanCost,  <!-- 框返消耗 -->
-            jili_cost as jiliCost,  <!-- 激励账户消耗 -->
-            xinyong_cost as xinyongCost,  <!-- 信用账户消耗 -->
-            fengmian_show_count as fengmianShowCount,  <!-- 封面曝光数 -->
-            fengmian_click_count as fengmianClickCount,  <!-- 封面点击数 -->
-            sucai_show_count as sucaiShowCount,  <!-- 素材曝光数 -->
-            convert_count as convertCount,  <!-- 行为数 -->
-            fengmian_click_rate as fengmianClickRate,  <!-- 封面点击率 -->
-            convert_click_rate as convertClickRate  <!-- 转化点击率 -->
+            date_format(date, '%Y-%m-%d') as date,
+            cost_campaign_count as costCampaignCount,
+            balance as balance,
+            cost as cost,
+            xianjin_cost as xianjinCost,
+            fandian_cost as fandianCost,
+            kuangfan_cost as kuangfanCost,
+            jili_cost as jiliCost,
+            xinyong_cost as xinyongCost,
+            fengmian_show_count as fengmianShowCount,
+            fengmian_click_count as fengmianClickCount,
+            sucai_show_count as sucaiShowCount,
+            convert_count as convertCount,
+            fengmian_click_rate as fengmianClickRate,
+            convert_click_rate as convertClickRate
         from
         ctop_kuaishou_report_daily_agent_sum
         where
@@ -30,20 +30,20 @@
 
     <select id="companyReportSum" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgentSum">
         select
-        sum(cost_campaign_count) as costCampaignCount,  <!-- 有消费计划数 -->
-        sum(balance) as balance,  <!-- 总余额 -->
-        sum(cost) as cost,  <!-- 总消耗 -->
-        sum(xianjin_cost) as xianjinCost,  <!-- 现金消耗 -->
-        sum(fandian_cost) as fandianCost,  <!-- 后返消耗 -->
-        sum(kuangfan_cost) as kuangfanCost,  <!-- 框返消耗 -->
-        sum(jili_cost) as jiliCost,  <!-- 激励账户消耗 -->
-        sum(xinyong_cost) as xinyongCost,  <!-- 信用账户消耗 -->
-        sum(fengmian_show_count) as fengmianShowCount,  <!-- 封面曝光数 -->
-        sum(fengmian_click_count) as fengmianClickCount,  <!-- 封面点击数 -->
-        sum(sucai_show_count) as sucaiShowCount,  <!-- 素材曝光数 -->
-        sum(convert_count) as convertCount,  <!-- 行为数 -->
-        sum(fengmian_click_rate) as fengmianClickRate,  <!-- 封面点击率 -->
-        sum(convert_click_rate) as convertClickRate  <!-- 转化点击率 -->
+        sum(cost_campaign_count) as costCampaignCount,
+        sum(balance) as balance,
+        sum(cost) as cost,
+        sum(xianjin_cost) as xianjinCost,
+        sum(fandian_cost) as fandianCost,
+        sum(kuangfan_cost) as kuangfanCost,
+        sum(jili_cost) as jiliCost,
+        sum(xinyong_cost) as xinyongCost,
+        sum(fengmian_show_count) as fengmianShowCount,
+        sum(fengmian_click_count) as fengmianClickCount,
+        sum(sucai_show_count) as sucaiShowCount,
+        sum(convert_count) as convertCount,
+        sum(fengmian_click_rate) as fengmianClickRate,
+        sum(convert_click_rate) as convertClickRate
         from
         ctop_kuaishou_report_daily_agent_sum
         where
@@ -51,14 +51,14 @@
         date &gt;= #{startDate}
     </select>
 
-    <!-- 根据传入时间获取公司报表账户的列表 -->
+
     <select id="companyReportAccountDetailList" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgent">
             select
-            date_format(date, '%Y-%m-%d') as date,  <!-- 日期 -->
-            account_id as accountId,  <!-- 账户id -->
-            kid as kid, <!-- 快手id -->
-            advertiser_name as advertiserName, <!-- 广告主名称 -->
-            advertiser_create_time as advertiserCreateTime, <!-- 广告主创建时间 -->
+            date_format(date, '%Y-%m-%d') as date,
+            account_id as accountId,
+            kid as kid,
+            advertiser_name as advertiserName,
+            advertiser_create_time as advertiserCreateTime,
             cost_campaign_count as costCampaignCount, <!-- 有消费计划数 -->
             balance as balance, <!-- 总余额 -->
             cost as cost, <!-- 总消耗 -->

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCampaignMapper.xml

@@ -168,7 +168,7 @@
         values
         <foreach collection="records" item="record" separator=",">
             (
-            #{record.accountId}},
+            #{record.accountId},
             #{record.campaignId},
             #{record.status},
             #{record.campaignName},

+ 78 - 78
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/MaterialReportMapper.xml

@@ -13,45 +13,45 @@
 
     <select id="selectByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        sum(t2.charge) cost, -- 花费
-        sum(t2.photo_show) photoShow, -- 封面曝光数
-        sum(t2.photo_click) photoClick, -- 封面点击数
-        sum(t2.aclick) aclick, -- 素材曝光数
-        sum(t2.bclick) bclick, -- 行为数
+        sum(t2.charge) cost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
+        sum(t2.aclick) aclick,
+        sum(t2.bclick) bclick,
         (case
         when sum(photo_show) != 0
         then (sum(t2.photo_click) / sum(photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(aclick) != 0
         then (sum(t2.bclick) / sum(aclick))
         else 0
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
         (case
         when sum(t2.photo_show) != 0
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         else 0
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
         (case
         when sum(t2.photo_click) != 0
         then (sum(t2.charge) / sum(t2.photo_click))
         else 0
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
         (CASE
         WHEN sum(t2.photo_click) != 0
         THEN (sum(t2.charge) / sum(t2.photo_click))
         ELSE 0
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
         (case
         WHEN sum(t2.form_count) != 0
@@ -60,7 +60,7 @@
         THEN sum(t2.activation)
         ELSE 0
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
         (
         CASE
@@ -70,10 +70,10 @@
         THEN (sum(t2.charge) / sum(t2.activation))
         ELSE 0
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
         t2.photo_url as  'url',
         t2.cover_url as  'coverUrl',
-        t2.signature signature -- 视频md5
+        t2.signature signature
         from
         ctop_user_allocation t1
         left join
@@ -100,45 +100,45 @@
 
     <select id="selectChainRatioByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        sum(charge) cost, -- 花费
-        sum(photo_show) photoShow, -- 封面曝光数
-        sum(photo_click) photoClick, -- 封面点击数
-        sum(aclick) aclick, -- 素材曝光数
-        sum(bclick) bclick, -- 行为数
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        sum(bclick) bclick,
         (case
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(aclick) != 0
         then (sum(bclick) / sum(aclick))
         else 0
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
         (case
         when sum(photo_show) != 0
         then ((sum(charge) / sum(photo_show)) * 1000)
         else 0
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
         (case
         when sum(photo_click) != 0
         then (sum(charge) / sum(photo_click))
         else 0
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
         (CASE
         WHEN sum(photo_click) != 0
         THEN (sum(charge) / sum(photo_click))
         ELSE 0
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
         (case
         WHEN sum(form_count) != 0
@@ -147,7 +147,7 @@
         THEN sum(activation)
         ELSE 0
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
         (
         CASE
@@ -157,7 +157,7 @@
         THEN (sum(charge) / sum(activation))
         ELSE 0
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
         from
         ctop_kuaishou_report_hourly_creative_statistic
 
@@ -184,45 +184,45 @@
     <select id="selectDailyByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
 
         SELECT
-        sum(t2.charge) cost, -- 花费
-        sum(t2.photo_show) photoShow, -- 封面曝光数
-        sum(t2.photo_click) photoClick, -- 封面点击数
-        sum(t2.aclick) aclick, -- 素材曝光数
-        sum(t2.bclick) bclick, -- 行为数
+        sum(t2.charge) cost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
+        sum(t2.aclick) aclick,
+        sum(t2.bclick) bclick,
         (case
         when sum(t2.photo_show) != 0
         then (sum(t2.photo_click) / sum(t2.photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(t2.aclick) != 0
         then (sum(t2.bclick) / sum(t2.aclick))
         else 0
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
         (case
         when sum(t2.photo_show) != 0
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         else 0
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
         (case
         when sum(t2.photo_click) != 0
         then (sum(t2.charge) / sum(t2.photo_click))
         else 0
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
         (CASE
         WHEN sum(t2.photo_click) != 0
         THEN (sum(t2.charge) / sum(t2.photo_click))
         ELSE 0
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
         (case
         WHEN sum(t2.form_count) != 0
@@ -231,7 +231,7 @@
         THEN sum(t2.activation)
         ELSE 0
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
         (
         CASE
@@ -241,10 +241,10 @@
         THEN (sum(t2.charge) / sum(t2.activation))
         ELSE 0
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
         t2.photo_url as  'url',
         t2.cover_url as  'coverUrl',
-        t2.signature signature -- 视频md5
+        t2.signature signature
         from
         ctop_user_allocation t1
         left join
@@ -273,45 +273,45 @@
 
     <select id="selectDailyChainRatioByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        sum(charge) cost, -- 花费
-        sum(photo_show) photoShow, -- 封面曝光数
-        sum(photo_click) photoClick, -- 封面点击数
-        sum(aclick) aclick, -- 素材曝光数
-        sum(bclick) bclick, -- 行为数
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        sum(bclick) bclick,
         (case
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(aclick) != 0
         then (sum(bclick) / sum(aclick))
         else 0
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
         (case
         when sum(photo_show) != 0
         then ((sum(charge) / sum(photo_show)) * 1000)
         else 0
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
         (case
         when sum(photo_click) != 0
         then (sum(charge) / sum(photo_click))
         else 0
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
         (CASE
         WHEN sum(photo_click) != 0
         THEN (sum(charge) / sum(photo_click))
         ELSE 0
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
         (case
         WHEN sum(form_count) != 0
@@ -320,7 +320,7 @@
         THEN sum(activation)
         ELSE 0
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
         (
         CASE
@@ -330,7 +330,7 @@
         THEN (sum(charge) / sum(activation))
         ELSE 0
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
         from
         ctop_kuaishou_report_daily_material
         <where>
@@ -357,45 +357,45 @@
 
     <select id="selectHourMaterialList" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        sum(t2.charge) cost, -- 花费
-        sum(t2.photo_show) photoShow, -- 封面曝光数
-        sum(t2.photo_click) photoClick, -- 封面点击数
-        sum(t2.aclick) aclick, -- 素材曝光数
-        sum(t2.bclick) bclick, -- 行为数
+        sum(t2.charge) cost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
+        sum(t2.aclick) aclick,
+        sum(t2.bclick) bclick,
         (case
         when sum(photo_show) != 0
         then (sum(t2.photo_click) / sum(photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(aclick) != 0
         then (sum(t2.bclick) / sum(aclick))
         else 0
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
         (case
         when sum(t2.photo_show) != 0
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         else 0
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
         (case
         when sum(t2.photo_click) != 0
         then (sum(t2.charge) / sum(t2.photo_click))
         else 0
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
         (CASE
         WHEN sum(t2.photo_click) != 0
         THEN (sum(t2.charge) / sum(t2.photo_click))
         ELSE 0
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
         (case
         WHEN sum(t2.form_count) != 0
@@ -404,7 +404,7 @@
         THEN sum(t2.activation)
         ELSE 0
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
         (
         CASE
@@ -414,10 +414,10 @@
         THEN (sum(t2.charge) / sum(t2.activation))
         ELSE 0
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
 
-        t2.url url, -- 视频url
-        t2.signature signature, -- 视频md5
+        t2.url url,
+        t2.signature signature,
         t2.account_id accountId
         from
         ctop_oauth_token t1
@@ -445,46 +445,46 @@
 
     <select id="selectDayMaterialList" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        sum(t1.charge) cost, -- 花费
-        sum(t1.photo_show) photoShow, -- 封面曝光数
-        sum(t1.photo_click) photoClick, -- 封面点击数
-        sum(t1.aclick) aclick, -- 素材曝光数
-        sum(t1.bclick) bclick, -- 行为数
-        sum(t1.download_completed) downloadCompleted, -- 安卓下载完成 数
+        sum(t1.charge) cost,
+        sum(t1.photo_show) photoShow,
+        sum(t1.photo_click) photoClick,
+        sum(t1.aclick) aclick,
+        sum(t1.bclick) bclick,
+        sum(t1.download_completed) downloadCompleted,
         (case
         when sum(t1.photo_show) != 0
         then (sum(t1.photo_click) / sum(t1.photo_show))
         else 0
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
         (case
         when sum(t1.aclick) != 0
         then (sum(t1.bclick) / sum(t1.aclick))
         else 0
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
         (case
         when sum(t1.photo_show) != 0
         then ((sum(t1.charge) / sum(t1.photo_show)) * 1000)
         else 0
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
         (case
         when sum(t1.photo_click) != 0
         then (sum(t1.charge) / sum(t1.photo_click))
         else 0
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
         (CASE
         WHEN sum(t1.photo_click) != 0
         THEN (sum(t1.charge) / sum(t1.photo_click))
         ELSE 0
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
         (case
         WHEN sum(t1.form_count) != 0
@@ -493,7 +493,7 @@
         THEN sum(t1.activation)
         ELSE 0
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
         (
         CASE
@@ -503,11 +503,11 @@
         THEN (sum(t1.charge) / sum(t1.activation))
         ELSE 0
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
 
         t1.photo_url  as  'url',
         t1.cover_url as  'coverUrl',
-        t1.signature signature, -- 视频md5
+        t1.signature signature,
         t1.account_id accountId
         from
         ctop_kuaishou_report_daily_material t1