Merge #64 into master from pingkang

Merge branch 'master' of codeup.aliyun.com:60c06368dbbed34fe0f0c263/job/hr_job-...

* pingkang: (3 commits)
  fix
  promotion project增加字段
  Merge branch 'master' of codeup.aliyun.com:60c06368dbbed34fe0f0c263/job/hr_job-...

Signed-off-by: 黄平康 <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>
Merged-by: 黄平康 <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>

CR-link: https://codeup.aliyun.com/60c06368dbbed34fe0f0c263/job/hr_job-bytedance/change/64

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/controller/BytedanceXingTuController.java

@@ -40,8 +40,8 @@ public class BytedanceXingTuController {
     }
 
     @GetMapping("/taskInfo")
-    public void taskInfo() {
-        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuActiveTask(null);
+    public void taskInfo(@RequestParam(required = false) Long advertiserId) {
+        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuActiveTask(advertiserId);
         for (JSONObject taskJson : xingTuTasks) {
             Long advId = taskJson.getLong("advertiser_id");
             Long taskId = taskJson.getLong("task_id");
@@ -52,8 +52,8 @@ public class BytedanceXingTuController {
     }
 
     @GetMapping("/taskReport")
-    public void taskReport() {
-        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuReportTask(null);
+    public void taskReport(@RequestParam(required = false) Long advertiserId) {
+        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuReportTask(advertiserId);
         for (JSONObject taskJson : xingTuTasks) {
             Integer taskStatus = taskJson.getInteger("task_status");
             Long advId = taskJson.getLong("advertiser_id");

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/BytedanceCdpProject.java

@@ -152,13 +152,24 @@ public class BytedanceCdpProject {
     private String deliveryMode;
     private String bidType;
     private String deepExternalAction;
-    private String deepBidType ;
+    private String deepBidType;
     private Double bid;
-    private Double cpaBid ;
-    private Double deepCpabid ;
+    private Double cpaBid;
+    private Double deepCpabid;
     private Double searchBidRatio;
     private Double roiGoal;
 
+    private String budgetOptimizeSwitch;
+    private String audience;
+    private String scheduleType;
+    private String budgetMode;
+    private String budget;
+    private String aigcDynamicCreativeSwitch;
+    private String scheduleTime;
+    private String status;
+    private String statusFirst;
+    private String statusSecond;
+
 
     /**
      * 创建时间
@@ -171,7 +182,6 @@ public class BytedanceCdpProject {
      */
     //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     //private Date updateTime;
-
     public BytedanceCdpProject() {
     }
 
@@ -222,6 +232,16 @@ public class BytedanceCdpProject {
             this.cpaBid = deliverySetting.getDouble("cpa_bid");
             this.deepCpabid = deliverySetting.getDouble("deep_cpabid");
             this.roiGoal = deliverySetting.getDouble("roi_goal");
+            this.budgetOptimizeSwitch = deliverySetting.getString("budget_optimize_switch");
+            this.scheduleType = deliverySetting.getString("schedule_type");
+            this.budgetMode = deliverySetting.getString("budget_mode");
+            this.budget = deliverySetting.getString("budget");
+            this.scheduleTime = deliverySetting.getString("schedule_time");
         }
+        this.audience = o.getString("audience");
+        this.aigcDynamicCreativeSwitch = o.getString("aigc_dynamic_creative_switch");
+        this.status = o.getString("status");
+        this.statusFirst = o.getString("status_first");
+        this.statusSecond = o.getString("status_second");
     }
 }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/BytedanceCdpProjectServiceImpl.java

@@ -149,6 +149,7 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
         entity.put("advertiser_id", advertiserId);
         JSONObject promotionMaterials = entity.getJSONObject("promotion_materials");
         if (!Check.isNull(promotionMaterials)) {
+            entity.put("external_url_material_list", promotionMaterials.getString("external_url_material_list"));
             entity.put("playlet_series_url_list", promotionMaterials.getString("playlet_series_url_list"));
             JSONObject miniProgramInfo = promotionMaterials.getJSONObject("mini_program_info");
             if (!Check.isNull(miniProgramInfo)) {