fix

datacenter-job/datacenter-base/base-sync-ebay-transaction/src/main/java/com/bailuntec/job/service/impl/SyncEbayFeeServiceImpl.java

@@ -18,7 +18,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -58,13 +57,13 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
     @Override
     public void SyncEbayTransaction() {
         //获取未跑或失败的任务
-        /*List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(
+        List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(
                 new LambdaQueryWrapper<EbayAccountReportTask>()
                         .ne(EbayAccountReportTask::getStatus, 1)
-        );*/
-        List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(new LambdaQueryWrapper<EbayAccountReportTask>()
-                .ge(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 6, 28, 0, 0, 0))
-                .lt(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 7, 8, 0, 0, 0)));
+        );
+        /*List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(new LambdaQueryWrapper<EbayAccountReportTask>()
+                .ge(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 7, 7, 0, 0, 0))
+                .lt(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 7, 13, 0, 0, 0)));*/
         //获取账号信息
         List<Integer> accountIdList = ebayAccountReportTaskList.stream().map(x -> x.getAccountId()).distinct().collect(Collectors.toList());
         List<DcBaseCompanyAccount> accountList = dcBaseCompanyAccountService.list(

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

@@ -119,7 +119,7 @@ public class BalanceSheetJob {
     /**
      * 每周六日获取物流供应商往来数据
      */
-    @Scheduled(cron = "0 0 2 ? 1-12 1,7 *")
+    @Scheduled(cron = "0 0 2 ? 1-12 1,7")
     public void syncLogisticsSupplierTransaction() {
         try {
             log.info("每周六日 获取物流供应商往来数据 开始");

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

@@ -498,6 +498,9 @@ public class BalanceSheetService {
         //取供应商往来数据：应付账款和预付账款
         getSupplierTransaction(date);
 
+        //获取半成品在途
+        getSemiTransferAmount(date);
+
         //货品库存
         dcInventoryBalanceMapper.insertInventoryBalance(date);
         //货品调拨在途
@@ -1017,9 +1020,7 @@ public class BalanceSheetService {
      * 获取半成品在途
      */
     @Transactional(rollbackFor = Exception.class)
-    public void getSemiTransferAmount(){
-        DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(baseSyncSemiTransfer);
-        LocalDate start = dcJobConfig.getStartTime().toLocalDate();
+    public void getSemiTransferAmount(LocalDate start){
         boolean isOk = true;
         int page = 1;
         int row = 4000;