Merge #50 into master from pingkang

fix(data): 修复快手短剧剧集报表数据处理及调用参数问题

* pingkang: (1 commits)
  fix(data): 修复快手短剧剧集报表数据处理及调用参数问题

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-kuaishou/change/50

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/impl/KuaiShouDramaServiceImpl.java

@@ -557,7 +557,7 @@ public class KuaiShouDramaServiceImpl implements IKuaiShouDramaService {
         int batchSize = 20;
         for (int i = 0; i < seriesIds.size(); i += batchSize) {
             List<Long> batchSeriesIds = seriesIds.subList(i, Math.min(i + batchSize, seriesIds.size()));
-            queryEpisodeReportBySeriesIds(accessToken, advertiserId, startDate, endDate, batchSeriesIds, 1, isLog, errId, isSend);
+            queryEpisodeReportBySeriesIds(accessToken, advertiserId, startDate, endDate, batchSeriesIds, 1, isLog);
         }
         log.info("【{}】录入快手短剧剧集报表数据完成 {} {}", advertiserId, startDate, endDate);
         if (errId != null) {
@@ -568,7 +568,8 @@ public class KuaiShouDramaServiceImpl implements IKuaiShouDramaService {
         }
     }
 
-    private void queryEpisodeReportBySeriesIds(String accessToken, Long advertiserId, String startDate, String endDate, List<Long> seriesIds, int page, Integer isLog, Long errId, Integer isSend) {
+    private void queryEpisodeReportBySeriesIds(String accessToken, Long advertiserId, String startDate, String endDate, List<Long> seriesIds, int page, Integer isLog) {
+        log.info("获取快手短剧剧集报表:accountId:{} startDate:{} endDate:{} seriesIds:{}", advertiserId, startDate, endDate, seriesIds);
         String url = KuaishouLinkConstants.KS_PREFIX + KuaishouLinkConstants.DRAMA_EPISODE_REPORT;
         Map<String, String> headers = new HashMap<>();
         headers.put("Content-Type", "application/json");
@@ -615,7 +616,7 @@ public class KuaiShouDramaServiceImpl implements IKuaiShouDramaService {
                 report.setAccountId(detailJson.getString("account_id"));
                 report.setResourceType(detailJson.getString("resource_type"));
                 report.setIsPayEpisode(detailJson.getInteger("is_pay_episode"));
-                report.setSeriesPayTemplateId(detailJson.getString("series_pay_template_id"));
+                report.setSeriesPayTemplateId(detailJson.getString("series_pay_template_id") == null ? "0" : detailJson.getString("series_pay_template_id"));
                 report.setShowCnt(detailJson.getInteger("show_cnt"));
                 report.setPlayCnt(detailJson.getInteger("play_cnt"));
                 report.setCompletePlayCnt(detailJson.getInteger("complete_play_cnt"));
@@ -629,7 +630,7 @@ public class KuaiShouDramaServiceImpl implements IKuaiShouDramaService {
             kuaiShouDramaMapper.insertEpisodeReport(addList);
         }
         if (page < totalPage) {
-            queryEpisodeReportBySeriesIds(accessToken, advertiserId, startDate, endDate, seriesIds, page + 1, isLog, errId, isSend);
+            queryEpisodeReportBySeriesIds(accessToken, advertiserId, startDate, endDate, seriesIds, page + 1, isLog);
         }
     }
 }

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouDramaJob.java

@@ -121,7 +121,7 @@ public class KuaiShouDramaJob {
             log.error("入参为空");
             return;
         }
-        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", -2);
+        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", -3);
         String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", -2);
         String[] s = param.split("_");
         Long adminAdvertiserId = Long.valueOf(s[0]);