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

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

@@ -49,17 +49,19 @@ public class BytedanceController {
     @Autowired
     private IBytedanceMiniAppService bytedanceMiniAppService;
 
+    @Autowired
+    private IBytedanceCdpProjectService cdpProjectService;
 
     @GetMapping("/accountReport")
-    public void getChannel(String param) {
+    public void getChannel() {
+
+        List<JSONObject> infos = adminAdvertiserListService.getAdvertiserInfosByAdminIds();
+
 
-        List<JSONObject> infos = adminAdvertiserListService.getAdvertiserInfos();
-        System.err.println(infos);
-        adminAdvertiserListService.batchUpdateAdvertiserName(infos);
 
-      /*  List<JSONObject> allList = promoterReportService.getAllList();
-        for (int i = 0; i < allList.size(); i++) {
-            JSONObject jsonObject = allList.get(i);
+
+        for (int i = 0; i < infos.size(); i++) {
+            JSONObject jsonObject = infos.get(i);
             Long advertiserId = jsonObject.getLong("advertiserId");
             String accessToken = jsonObject.getString("accessToken");
 
@@ -67,15 +69,19 @@ public class BytedanceController {
                 @Override
                 public void run() {
                     if (!Check.isNull(accessToken)) {
-                        accountReportService.getBytedanceAccountDaily(advertiserId, accessToken, "2025-01-01", "2025-03-25", 1, 1);
-                    //    accountReportService.getBytedanceAccountHour(advertiserId, accessToken, "2025-01-01", "2025-03-25", 1, 1);
-                      //  promoterReportService.getBytedancePromoterHour(advertiserId, accessToken, "2025-01-01", "2025-03-25", 1, 1);
-                        promoterReportService.getBytedancePromoterDaily(advertiserId, accessToken, "2025-01-01", "2025-03-25", 1, 1);
+
+                        /*cdpProjectService.getProjectList(advertiserId, null);
+                        cdpProjectService.getpromotionList(advertiserId, null);*/
+
+                   //     accountReportService.getBytedanceAccountDaily(advertiserId,accessToken,"2025-06-01","2025-06-03",1,1);
+                        promoterReportService.getBytedancePromoterDaily(advertiserId,accessToken,"2025-06-01","2025-06-03",1,1);
+
+
                     }
                 }
             });
 
-        }*/
+        }
 
 
     }

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

@@ -132,6 +132,7 @@ public class BytedanceAdvertiserReportDaily {
      * 3日LTV
      */
     private BigDecimal attributionMicroGame3dLtv;
+    private BigDecimal statMicroGame0dAmount;
 
     public Long getAdvertiserId() {
         return advertiserId;
@@ -325,6 +326,14 @@ public class BytedanceAdvertiserReportDaily {
         this.attributionMicroGame3dLtv = attributionMicroGame3dLtv;
     }
 
+    public BigDecimal getStatMicroGame0dAmount() {
+        return statMicroGame0dAmount;
+    }
+
+    public void setStatMicroGame0dAmount(BigDecimal statMicroGame0dAmount) {
+        this.statMicroGame0dAmount = statMicroGame0dAmount;
+    }
+
     @Override
     public String toString() {
         return "BytedanceAdvertiserReportDaily{" +
@@ -352,6 +361,7 @@ public class BytedanceAdvertiserReportDaily {
                 ", attributionMicroGame0dLtv=" + attributionMicroGame0dLtv +
                 ", attributionMicroGame7dLtv=" + attributionMicroGame7dLtv +
                 ", attributionMicroGame3dLtv=" + attributionMicroGame3dLtv +
+                ", statMicroGame0dAmount=" + statMicroGame0dAmount +
                 '}';
     }
 }

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

@@ -136,6 +136,7 @@ public class BytedanceAdvertiserReportHour {
      * 3日LTV
      */
     private BigDecimal attributionMicroGame3dLtv;
+    private BigDecimal statMicroGame0dAmount;
 
     public Long getAdvertiserId() {
         return advertiserId;
@@ -337,6 +338,14 @@ public class BytedanceAdvertiserReportHour {
         this.attributionMicroGame3dLtv = attributionMicroGame3dLtv;
     }
 
+    public BigDecimal getStatMicroGame0dAmount() {
+        return statMicroGame0dAmount;
+    }
+
+    public void setStatMicroGame0dAmount(BigDecimal statMicroGame0dAmount) {
+        this.statMicroGame0dAmount = statMicroGame0dAmount;
+    }
+
     @Override
     public String toString() {
         return "BytedanceAdvertiserReportHour{" +
@@ -365,6 +374,7 @@ public class BytedanceAdvertiserReportHour {
                 ", attributionMicroGame0dLtv=" + attributionMicroGame0dLtv +
                 ", attributionMicroGame7dLtv=" + attributionMicroGame7dLtv +
                 ", attributionMicroGame3dLtv=" + attributionMicroGame3dLtv +
+                ", statMicroGame0dAmount=" + statMicroGame0dAmount +
                 '}';
     }
 }

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

@@ -142,6 +142,7 @@ public class BytedancePromoterReportDaily {
     private BigDecimal attributionMicroGame0dLtv;
     private BigDecimal attributionMicroGame3dLtv;
     private BigDecimal attributionMicroGame7dLtv;
+    private BigDecimal statMicroGame0dAmount;
 
     public Long getAdvertiserId() {
         return advertiserId;
@@ -367,6 +368,14 @@ public class BytedancePromoterReportDaily {
         this.attributionMicroGame7dLtv = attributionMicroGame7dLtv;
     }
 
+    public BigDecimal getStatMicroGame0dAmount() {
+        return statMicroGame0dAmount;
+    }
+
+    public void setStatMicroGame0dAmount(BigDecimal statMicroGame0dAmount) {
+        this.statMicroGame0dAmount = statMicroGame0dAmount;
+    }
+
     @Override
     public String toString() {
         return "BytedancePromoterReportDaily{" +
@@ -398,6 +407,7 @@ public class BytedancePromoterReportDaily {
                 ", attributionMicroGame0dLtv=" + attributionMicroGame0dLtv +
                 ", attributionMicroGame3dLtv=" + attributionMicroGame3dLtv +
                 ", attributionMicroGame7dLtv=" + attributionMicroGame7dLtv +
+                ", statMicroGame0dAmount=" + statMicroGame0dAmount +
                 '}';
     }
 }

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

@@ -148,6 +148,7 @@ public class BytedancePromoterReportHour {
     private BigDecimal attributionMicroGame0dLtv;
     private BigDecimal attributionMicroGame3dLtv;
     private BigDecimal attributionMicroGame7dLtv;
+    private BigDecimal statMicroGame0dAmount;
 
 
     public Long getAdvertiserId() {
@@ -382,6 +383,14 @@ public class BytedancePromoterReportHour {
         this.attributionMicroGame7dLtv = attributionMicroGame7dLtv;
     }
 
+    public BigDecimal getStatMicroGame0dAmount() {
+        return statMicroGame0dAmount;
+    }
+
+    public void setStatMicroGame0dAmount(BigDecimal statMicroGame0dAmount) {
+        this.statMicroGame0dAmount = statMicroGame0dAmount;
+    }
+
     @Override
     public String toString() {
         return "BytedancePromoterReportHour{" +
@@ -414,6 +423,7 @@ public class BytedancePromoterReportHour {
                 ", attributionMicroGame0dLtv=" + attributionMicroGame0dLtv +
                 ", attributionMicroGame3dLtv=" + attributionMicroGame3dLtv +
                 ", attributionMicroGame7dLtv=" + attributionMicroGame7dLtv +
+                ", statMicroGame0dAmount=" + statMicroGame0dAmount +
                 '}';
     }
 }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/AdminAdvertiserListMapper.java

@@ -12,4 +12,6 @@ public interface AdminAdvertiserListMapper {
     List<JSONObject> getAdvertiserInfos();
 
     void batchUpdateAdvertiserName(@Param("infos") List<JSONObject> infos);
+
+    List<JSONObject> getAdvertiserInfosByAdminIds();
 }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/AdminAdvertiserListMapper.xml

@@ -39,4 +39,17 @@
         WHERE t1.media_type = 1
           AND t1.advertiser_name != t2.advertiser_name
     </select>
+    <select id="getAdvertiserInfosByAdminIds" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT *
+        FROM (SELECT t1.advertiser_id AS 'advertiserId', t3.access_token AS 'accessToken'
+              FROM (SELECT advertiser_id
+                    FROM media_api.bytedance_advertiser_report_hour
+                    WHERE stat_time_day >= 20250601
+                      AND stat_time_day &lt;= 20250603
+                    GROUP BY advertiser_id) t1
+                       LEFT JOIN deepthink.bytedance_advertiser_list t2 ON t1.advertiser_id = t2.advertiser_id
+                       LEFT JOIN deepthink.bytedance_auth_list t3 ON t2.admin_advertiser_id = t3.admin_advertiser_id) t
+        WHERE t.advertiserId IS NOT NULL
+
+    </select>
 </mapper>

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/BytedanceAccountReportMapper.xml

@@ -28,7 +28,8 @@
         attribution_billing_game_in_app_ltv_1day,
         attribution_micro_game_0d_ltv,
         attribution_micro_game_3d_ltv,
-        attribution_micro_game_7d_ltv
+        attribution_micro_game_7d_ltv,
+        stat_micro_game_0d_amount
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -57,7 +58,8 @@
             #{item.attributionBillingGameInAppLtv1day},
             #{item.attributionMicroGame0dLtv},
             #{item.attributionMicroGame3dLtv},
-            #{item.attributionMicroGame7dLtv}
+            #{item.attributionMicroGame7dLtv},
+            #{item.statMicroGame0dAmount}
             )
         </foreach>
     </insert>
@@ -86,7 +88,8 @@
         attribution_billing_game_in_app_ltv_1day,
         attribution_micro_game_0d_ltv,
         attribution_micro_game_3d_ltv,
-        attribution_micro_game_7d_ltv
+        attribution_micro_game_7d_ltv,
+        stat_micro_game_0d_amount
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -114,7 +117,8 @@
             #{item.attributionBillingGameInAppLtv1day},
             #{item.attributionMicroGame0dLtv},
             #{item.attributionMicroGame3dLtv},
-            #{item.attributionMicroGame7dLtv}
+            #{item.attributionMicroGame7dLtv},
+            #{item.statMicroGame0dAmount}
             )
         </foreach>
 

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/BytedancePromoterReportMapper.xml

@@ -63,8 +63,8 @@
         attribution_billing_game_in_app_ltv_1day,
         attribution_micro_game_0d_ltv,
         attribution_micro_game_3d_ltv,
-        attribution_micro_game_7d_ltv
-
+        attribution_micro_game_7d_ltv,
+        stat_micro_game_0d_amount
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -97,7 +97,8 @@
             #{item.attributionBillingGameInAppLtv1day},
             #{item.attributionMicroGame0dLtv},
             #{item.attributionMicroGame3dLtv},
-            #{item.attributionMicroGame7dLtv}
+            #{item.attributionMicroGame7dLtv},
+            #{item.statMicroGame0dAmount}
             )
         </foreach>
     </insert>
@@ -132,7 +133,8 @@
         attribution_billing_game_in_app_ltv_1day,
         attribution_micro_game_0d_ltv,
         attribution_micro_game_3d_ltv,
-        attribution_micro_game_7d_ltv
+        attribution_micro_game_7d_ltv,
+        stat_micro_game_0d_amount
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -164,7 +166,8 @@
             #{item.attributionBillingGameInAppLtv1day},
             #{item.attributionMicroGame0dLtv},
             #{item.attributionMicroGame3dLtv},
-            #{item.attributionMicroGame7dLtv}
+            #{item.attributionMicroGame7dLtv},
+            #{item.statMicroGame0dAmount}
             )
         </foreach>
     </insert>

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

@@ -12,4 +12,6 @@ public interface IAdminAdvertiserListService {
     List<JSONObject> getAdvertiserInfos();
 
     void batchUpdateAdvertiserName(List<JSONObject> infos);
+
+    List<JSONObject> getAdvertiserInfosByAdminIds();
 }

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

@@ -111,6 +111,11 @@ public class AdminAdvertiserListServiceImpl implements IAdminAdvertiserListServi
         adminAdvertiserListMapper.batchUpdateAdvertiserName(infos);
     }
 
+    @Override
+    public List<JSONObject> getAdvertiserInfosByAdminIds() {
+        return adminAdvertiserListMapper.getAdvertiserInfosByAdminIds();
+    }
+
     // 分页结果包装类
     static class PageResult {
         private final int pageNumber;

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

@@ -173,7 +173,10 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                 //不传默认返回不限（不含已删除）
                 filtering.put("status_first", "PROJECT_STATUS_DELETE");
             }
-            filtering.put("project_modify_time", date);
+            if(!Check.isNull(date)){
+                filtering.put("project_modify_time", date);
+            }
+
             params.put("filtering", filtering);
             params.put("page", page);
             params.put("page_size", 100);//最大100

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/utils/FieldsConfig.java

@@ -67,6 +67,7 @@ public class FieldsConfig {
         metricslds.add("attribution_micro_game_0d_ltv");
         metricslds.add("attribution_micro_game_3d_ltv");
         metricslds.add("attribution_micro_game_7d_ltv");
+        metricslds.add("stat_micro_game_0d_amount");
         return metricslds;
 
     }