数据中心--亚马逊广告费更新

data-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdGenerateReportIdJob.java

@@ -51,7 +51,11 @@ public class AmazonAdGenerateReportIdJob extends PointJob {
                         BeanUtils.copyProperties(jobAccountLog, jobPointLog);
                         jobAccountLog.setId(null);
                     }
-                    generateReportId(jobAccountLog);
+                    LocalDateTime localDateTime = jobAccountLog.getStartTime();
+                    for(long i = 10 ; i >= 0; i--) {
+                        jobAccountLog.setStartTime(localDateTime.minusDays(i));
+                        generateReportId(jobAccountLog);
+                    }
                     if (jobAccountLog.getId() == null) { //null在任务表无记录
                         jobAccountLogMapper.insertSelective(jobAccountLog);
                     } else {
@@ -78,8 +82,8 @@ public class AmazonAdGenerateReportIdJob extends PointJob {
     private void generateReportId(JobAccountLog jobAccountLog) {
         LocalDateTime startZeroTime = LocalDateTime.of(jobAccountLog.getStartTime().toLocalDate(), LocalTime.MIN);
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime localDateTime = LocalDateTime.of(now.getYear(), now.getMonth(), now.getDayOfMonth(), now.getHour(),now.getMinute(), now.getSecond());
-        if (Duration.between(startZeroTime, localDateTime).toHours() >= 37) {
+      //  LocalDateTime localDateTime = LocalDateTime.of(now.getYear(), now.getMonth(), now.getDayOfMonth(), now.getHour(),now.getMinute(), now.getSecond());
+        if (Duration.between(startZeroTime, now).toHours() >= 37) {
             DcBaseCompanyAccount dcBaseCompanyAccount = getToken(jobAccountLog);
             if (StringUtils.isNoneBlank(dcBaseCompanyAccount.getAmazonAdAuthJson())) {
                 /**
@@ -91,16 +95,16 @@ public class AmazonAdGenerateReportIdJob extends PointJob {
                  * jobAccountLog.getStartTime那天的ReportId不存在
                  * 发请求, 存在就更新时间
                  */
-                if (jobAmazonAdLog == null || (jobAmazonAdLog != null && StringUtils.isBlank(jobAmazonAdLog.getReportId()))) {
+                /*if (jobAmazonAdLog == null || (jobAmazonAdLog != null && StringUtils.isBlank(jobAmazonAdLog.getReportId()))) {*/
                     /**
                      * 授权信息存在才去调接口获取ReportId
                      */
                     AmazonAdAuth amazonAdAuth = JSON.parseObject(dcBaseCompanyAccount.getAmazonAdAuthJson(), AmazonAdAuth.class);
                     //1. 先获取ReportId
                     postReportId(jobAccountLog, amazonAdAuth, dcBaseCompanyAccount.getSiteEn(), jobAmazonAdLogMapper);
-                } else {
+                /*} else {
                     jobAccountLogUpdateTime(jobAccountLog);
-                }
+                }*/
             }
         }
     }
@@ -149,7 +153,7 @@ public class AmazonAdGenerateReportIdJob extends PointJob {
         LocalDateTime zeroTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
         LocalDateTime overStartTime = jobAccountLog.getEndTime().isAfter(zeroTime) ? zeroTime.minusHours(8) : jobAccountLog.getEndTime();
         jobAccountLog.setStartTime(overStartTime);
-        jobAccountLog.setEndTime(jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobAccountLog.getEndTime().plusDays(jobAccountLog.getIntervalTime()));
+        jobAccountLog.setEndTime(jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()));
         jobAccountLog.setMessage("执行成功");
     }