Procházet zdrojové kódy

Merge remote-tracking branch 'origin/test' into test

syh před 4 roky
rodič
revize
c8cea1660d

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyAccountDTO.java

@@ -50,4 +50,5 @@ public class KuaishouReportDailyAccountDTO implements Serializable {
     private Long photoId;
     private String url;
     private String coverUrl;
+    private Integer materialType;
 }

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

@@ -691,6 +691,7 @@
                 #{item}
             </foreach>
             group by b.project_id
+            order by sum(a.charge) desc
         ) m
         <if test="yn = 1">
         where
@@ -776,6 +777,7 @@
         </if>
 
         group by a.campaign_id
+        order by sum(a.charge) desc
         ) m
 
         <if test="yn = 1">
@@ -864,6 +866,7 @@
                 </foreach>
             </if>
             group by unit_id
+            order by sum(a.charge) desc
             ) m
         <if test="yn = 1">
             where
@@ -1025,7 +1028,8 @@
             end
             ) 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 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
             from
             ctop_kuaishou_report_daily_creative a
             left join (select * from ctop_user_allocation group by account_id) b on a.account_id = b.account_id
@@ -1047,6 +1051,7 @@
                 </foreach>
             </if>
             group by a.creative_id
+            order by sum(a.charge) desc
         )m
         <if test="yn=1">
             where m.charge != 0

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceAdvertisePlanController.java

@@ -59,9 +59,9 @@ public class ByteDanceAdvertisePlanController {
         if (!pageList.getRecords().isEmpty()) {
             pageList.getRecords().forEach(it -> {
                 if (it.getToutiaoStatus().equals("AD_STATUS_DELIVERY_OK")) {
-                    it.setStatus(true);
+                    it.setPlanStatus(true);
                 } else {
-                    it.setStatus(false);
+                    it.setPlanStatus(false);
                 }
             });
         }

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/ByteDanceAdvertisePlan.java

@@ -72,7 +72,7 @@ public class ByteDanceAdvertisePlan {
     private String toutiaoStatus;
 
     //true:投放中 false:暂停
-    private Boolean status;
+    private Boolean planStatus;
 
     // 广告计划操作状态
     private String optStatus;

+ 47 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/controller/ByteDanceQueryToolController.java

@@ -2,6 +2,7 @@ package cn.com.ctop.toutiao.modules.tool.controller;
 
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.toutiao.modules.tool.service.IByteDanceConvertToolService;
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -35,10 +37,52 @@ public class ByteDanceQueryToolController {
                 landingType, appType, downloadType, externalUrl, toutiaoPackage, downloadUrl);
         if(!convertQueryMap.get("code").equals(0)){
             result.error500("查询转化目标结果失败");
-            return result;
+        }else{
+            ((List)((JSONObject)convertQueryMap.get("data")).get("list")).forEach(it->{
+                if(((Map)it).get("convert_type")!=null){
+                    ((Map)it).put("name",getName(((Map)it).get("convert_type").toString()));
+                }
+            });
+            result.setSuccess(true);
+            result.setResult(convertQueryMap);
         }
-        result.setSuccess(true);
-        result.setResult(convertQueryMap);
         return result;
     }
+
+    private String getName(String convertType){
+        String convertName="";
+        switch (convertType) {
+            case "AD_CONVERT_SOURCE_TYPE_INTERNAL":
+                convertName = "线索通";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_JS":
+                convertName = "代码检测转化";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_XPATH":
+                convertName = "应用下载API";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_H5_API":
+                convertName = "落地页API(H5)";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_SDK":
+                convertName = "应用下载SDK";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_OPEN_URL":
+                convertName = "应用直达API(应用直达链接)";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_NORMAL_APP_DOWNLOAD":
+                convertName = "普通应用下载";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_CONFIG":
+                convertName = "无转化跟踪";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_CPS_GAME":
+                convertName = "内部游戏cps应用下载";
+                break;
+            case "AD_CONVERT_SOURCE_TYPE_APP_API_TEMAI":
+                convertName = "落地页API(支持特卖)";
+                break;
+        }
+        return convertName;
+    }
 }