新的银行账户余额

datacenter-base/base-sync-amazon-ad/src/main/docker/Dockerfile

@@ -4,5 +4,5 @@ ADD base-sync-amazon-ad-1.0-SNAPSHOT.jar app.jar
 
 RUN echo "Asia/Shanghai" > /etc/timezone
 
-ENTRYPOINT ["java","-Xms300m","-Xmx600m","-jar","-Dspring.profiles.active=prod","/app.jar"]
+ENTRYPOINT ["java","-Xms2G","-Xmx2G","-jar","-Dspring.profiles.active=prod","/app.jar"]
 EXPOSE 8080

datacenter-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdJob.java

@@ -35,7 +35,6 @@ public class AmazonAdJob {
      * </p>
      */
     @Scheduled(cron = "0 0 13 * * ?")
-//    @Scheduled(cron = "0/10 * * * * ?")
     public void generateAmazonAdReport() {
         log.info("每天下午1点生成昨天的亚马逊广告报告 任务开始");
         amazonJobService.generateAmazonAdReport();
@@ -47,8 +46,7 @@ public class AmazonAdJob {
      * 每小时下载未下载的报告
      * </p>
      */
-//    @Scheduled(cron = "0/10 * * * * ?")
-    @Scheduled(cron = "0 0 0/1 * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     public void downloadAmazonAdReport() {
         log.info("每小时下载未下载的报告 任务开始");
         amazonJobService.downloadAmazonAdReport();

datacenter-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/service/AmazonJobService.java

@@ -82,7 +82,7 @@ public class AmazonJobService {
                 .collect(Collectors.toList());
 
         //需要生成报告时间：昨天
-        LocalDate localDate = dcJobConfig.getStartTime().minusHours(36).toLocalDate();
+        LocalDate localDate = dcJobConfig.getStartTime().toLocalDate();
         this.generateAmazonAdReport(dcBaseCompanyAccountList, localDate, localDate);
 
         dcJobConfigMapper.updateById(dcJobConfig.refresh());

datacenter-base/base-sync-ebay/src/main/java/com/bailuntec/job/service/EbayService.java

 package com.bailuntec.job.service;
 
-import com.bailuntec.common.BeanUtils;
-import com.bailuntec.common.ListUtil;
-import com.bailuntec.cost.api.CostApi;
-import com.bailuntec.cost.api.dto.CostDto;
-import com.bailuntec.cost.api.dto.ManageCostDto;
-import com.bailuntec.cost.api.response.CostResult;
-import com.bailuntec.domain.DcBaseFinanceFee;
-import com.bailuntec.domain.DcBaseFinanceLogistics;
-import com.bailuntec.domain.DcBaseFinanceManagecost;
 import com.bailuntec.domain.DcJobConfig;
-import com.bailuntec.infrastructure.mapper.DcBaseFinanceFeeMapper;
-import com.bailuntec.infrastructure.mapper.DcBaseFinanceLogisticsMapper;
-import com.bailuntec.infrastructure.mapper.DcBaseFinanceManagecostMapper;
+import com.bailuntec.domain.JobAmazonAdLog;
 import com.bailuntec.infrastructure.mapper.DcJobConfigMapper;
+import com.bailuntec.infrastructure.mapper.JobAmazonAdLogMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageInfo;
+import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-
 import java.util.List;
 
 /**
@@ -36,7 +24,18 @@ import java.util.List;
 @Service
 public class EbayService {
 
+    private final static String baseSyncFinanceEbayAd = "base-sync-finance-ebay-ad";
+
+    @Resource
+    DcJobConfigMapper dcJobConfigMapper;
+    @Resource
+    JobAmazonAdLogMapper jobAmazonAdLogMapper;
 
     public void sync() {
+        DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(baseSyncFinanceEbayAd);
+        List<JobAmazonAdLog> jobAmazonAdLogList = jobAmazonAdLogMapper.selectList(new LambdaQueryWrapper<JobAmazonAdLog>()
+                .eq(JobAmazonAdLog::getStatus, false));
+
+        dcJobConfigMapper.updateById(dcJobConfig.refresh());
     }
 }

datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/job/service/BalanceSheetService.java

@@ -55,6 +55,8 @@ public class BalanceSheetService {
     @Resource
     IDcBankAccountBalanceService dcBankAccountBalanceService;
     @Resource
+    IDcBankAccountBalanceNewService dcBankAccountBalanceNewService;
+    @Resource
     DcBankAccountBalanceMapper dcBankAccountBalanceMapper;
     @Resource
     IDcWithdrawOnWayService dcWithdrawOnWayService;
@@ -64,7 +66,7 @@ public class BalanceSheetService {
     /**
      * 同步银行余额
      */
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public void syncBankAccount() {
         DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncBankAccount);
 
@@ -86,6 +88,22 @@ public class BalanceSheetService {
 
         dcBankAccountBalanceService.saveBatch(dcBankAccountBalanceList);
 
+        //新的
+
+        //先清空
+        dcBankAccountBalanceNewService.remove(new LambdaQueryWrapper<DcBankAccountBalanceNew>()
+                .eq(DcBankAccountBalanceNew::getStatisticalTime, date));
+        //保存
+        List<DcBankAccountBalanceNew> dcBankAccountBalanceNewList = bankAccountBalanceDTOList.stream()
+                .map(bankAccountBalanceDTO -> {
+                    DcBankAccountBalanceNew dcBankAccountBalanceNew = new DcBankAccountBalanceNew();
+                    BeanUtils.copyProperties(bankAccountBalanceDTO, dcBankAccountBalanceNew);
+                    dcBankAccountBalanceNew.setStatisticalTime(date);
+                    return dcBankAccountBalanceNew;
+                }).collect(Collectors.toList());
+
+        dcBankAccountBalanceNewService.saveBatch(dcBankAccountBalanceNewList);
+
         // 删除需要过滤的数据
         dcBankAccountBalanceMapper.deleteUnusedData(date);
         dcBankAccountBalanceMapper.deleteUnusedData1(date);
@@ -115,6 +133,7 @@ public class BalanceSheetService {
 
         //如果指定日期在途金额 快照已经存在 跳过
         if (dcWithdrawOnWayService.count(wrapper) > 0) {
+            dcJobConfigMapper.updateById(dcJobConfig.refresh());
             return;
         }
 

datacenter-mid/mid-daily-snapshot/src/main/java/com/bailuntec/job/service/DailySnapshotService.java

@@ -47,7 +47,6 @@ public class DailySnapshotService {
      * 每天0点10分
      * 保存库存每日快照
      */
-    @Transactional
     public void saveDcBastStockDailySnapshot() {
 
         DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(baseStockDailySnapshot);