亚马逊广告费用调整

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

@@ -80,6 +80,7 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
                     gzin.close();
                     response.close();
                     JobAmazonAdLogMapper jobAmazonAdLogMapper = SessionUtil.getSession().getMapper(JobAmazonAdLogMapper.class);
+                    LocalDateTime startTime = LocalDateTime.now();
                     if (amazonAdProductList != null && amazonAdProductList.size() > 0) {
                         DcBaseFinanceAmazonAdProductMapper mapper = SessionUtil.getSession().getMapper(DcBaseFinanceAmazonAdProductMapper.class);
                         DcBaseFinanceAmazonAdProduct dcBaseFinanceAmazonAdProduct = new DcBaseFinanceAmazonAdProduct();
@@ -100,6 +101,8 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
                             }
                         }
                     }
+                    DcBaseFinanceAmazonAdProductMapper mapper = SessionUtil.getSession().getMapper(DcBaseFinanceAmazonAdProductMapper.class);
+                    mapper.deleteByExample(DcBaseFinanceAmazonAdProductExample.newAndCreateCriteria().andAccountIdEqualTo(jobAmazonAdLog.getAccountId()).andCompanyIdEqualTo(jobAmazonAdLog.getCompanyId()).andReportDateEqualTo(jobAmazonAdLog.getReportDate()).andBjModifyTimeLessThan(startTime.minusHours(1)).example());
                     jobAmazonAdLog.setStatus(true);
                     jobAmazonAdLogMapper.updateByExampleSelective(jobAmazonAdLog, JobAmazonAdLogExample.newAndCreateCriteria().andCompanyIdEqualTo(jobAmazonAdLog.getCompanyId()).andAccountIdEqualTo(jobAmazonAdLog.getAccountId()).andReportDateEqualTo(jobAmazonAdLog.getReportDate()).example());
                     break;

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

@@ -151,9 +151,9 @@ public class AmazonAdGenerateReportIdJob extends PointJob {
          * 如果开始时间比今天0点晚, 就设为22点(或者你随便减几个小时都可以)
          */
         LocalDateTime zeroTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
-        LocalDateTime overStartTime = jobAccountLog.getEndTime().isAfter(zeroTime) ? zeroTime.minusHours(8) : jobAccountLog.getEndTime();
+        LocalDateTime overStartTime = jobAccountLog.getEndTime().isAfter(zeroTime.plusDays(1)) ? zeroTime.minusHours(8) : jobAccountLog.getEndTime();
         jobAccountLog.setStartTime(overStartTime);
-        jobAccountLog.setEndTime(jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()));
+        jobAccountLog.setEndTime(jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()).isAfter(zeroTime.plusDays(2)) ? zeroTime.plusDays(2).minusMinutes(8) : jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()));
         jobAccountLog.setMessage("执行成功");
     }