Merge remote-tracking branch 'origin/master'

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

@@ -17,9 +17,9 @@ public interface BytedanceMiniAppMapper {
                              @Param("startTime") String startTime,
                              @Param("endTime") String endTime);
 
-    List<String> getIaaAppIds();
+    List<String> getIaaAppIds(@Param("status") Integer status);
 
-    List<String> getAllAppIds();
+    List<String> getAllAppIds(@Param("status") Integer status);
 
     List<JSONObject> getMaEcpmRetryJob();
 

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

@@ -23,11 +23,11 @@
     </select>
 
     <select id="getAllAppIds" resultType="java.lang.String">
-        select app_id from deepthink.mini_app_info where app_id like 'tt%'
+        select app_id from deepthink.mini_app_info where status = #{status} and app_id like 'tt%'
     </select>
 
     <select id="getIaaAppIds" resultType="java.lang.String">
-        select app_id from deepthink.mini_app_info where business_method in('IAA','MIX') and app_id like 'tt%'
+        select app_id from deepthink.mini_app_info where status = #{status} and business_method in('IAA','MIX') and app_id like 'tt%'
     </select>
 
     <select id="getMaEcpmRetryJob" resultType="com.alibaba.fastjson.JSONObject">

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

@@ -559,6 +559,11 @@
         )t3 on t1.stat_date = t3.stat_date and t1.app_id = t3.ma_appid
         )tb
     </select>
+
+    <!--
+    if(m.stat_date >= 20251216,m.link_id,coalesce(m.link_id,t1.link_id,u.link_id)) link_id
+    20251216完善了用户明细数据link_id等相关信息的补全操作，不需要再去关联查询
+    -->
     <select id="runCPSIaaWxSettlementData" resultType="com.alibaba.fastjson.JSONObject">
         select stat_date, link_id, app_id, person_id, person_pid, company_id,
         ad_total_income, ad_play_user_count,
@@ -571,7 +576,7 @@
                     ifnull(user_count, 0) ad_play_user_count,
                     ifnull(ad_fund, 0) * (link_count/all_count) ad_amount
              from (
-                      select m.stat_date,m.app_id,coalesce(m.link_id,t1.link_id,u.link_id) link_id, count(*) link_count,
+                      select m.stat_date,m.app_id,if(m.stat_date >= 20251216,m.link_id,coalesce(m.link_id,t1.link_id,u.link_id)) link_id, count(*) link_count,
                              count(distinct m.login_id) user_count
                       from hr_playlet.mp_event m
                                left join

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

@@ -42,12 +42,12 @@ public class BytedanceMiniAppServiceImpl implements IBytedanceMiniAppService {
 
     @Override
     public List<String> getIaaAppIds() {
-        return bytedanceMiniAppMapper.getIaaAppIds();
+        return bytedanceMiniAppMapper.getIaaAppIds(1);
     }
 
     @Override
     public List<String> getAllAppIds() {
-        return bytedanceMiniAppMapper.getAllAppIds();
+        return bytedanceMiniAppMapper.getAllAppIds(1);
     }
 
     @Override