fix

datacenter-job/datacenter-base/base-sync-ebay-transaction/src/main/java/com/bailuntec/job/EbayFeeJob.java

@@ -22,7 +22,7 @@ public class EbayFeeJob {
     @Resource
     private SyncEbayFeeService service;
 
-    @Scheduled(cron = "* 16 * * * ?")
+    @Scheduled(cron = "0 0 16 * * ?")
     public void SyncEbayTransaction(){
         service.SyncEbayTransaction();
     }

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

@@ -39,23 +39,35 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
     @Resource
     private DcBaseEbayTransactionMapper dcBaseEbayTransactionMapper;
 
+    //当前需要跑的账号
+    private final static String[] RUN_ACCOUNT = new String[]{"ottlueilwitz3","jalenhe","uha4mmada","rownmelody5","nthonyp6ecket","rayallen9","barbara_spence95","nbrysonhall","credit4free"};
+
     @Resource
     private EbayTransactionApi ebayTransactionApi;
 
     @Override
     public void SyncEbayTransaction() {
         //获取未跑或失败的任务
-        List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(new LambdaQueryWrapper<EbayAccountReportTask>()
-                .ne(EbayAccountReportTask::getStatus, 1));
+        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, 4, 16, 0, 0, 0))
-                .lt(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 5, 1, 0, 0, 0)));*/
+                .ge(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 5, 1, 0, 0, 0))
+                .lt(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 5, 26, 0, 0, 0)));*/
         //获取账号信息
         List<Integer> accountIdList = ebayAccountReportTaskList.stream().map(x -> x.getAccountId()).distinct().collect(Collectors.toList());
-        List<DcBaseCompanyAccount> accountList = dcBaseCompanyAccountService.list(new LambdaQueryWrapper<DcBaseCompanyAccount>().in(DcBaseCompanyAccount::getAccountId, accountIdList));
-
+        List<DcBaseCompanyAccount> accountList = dcBaseCompanyAccountService.list(
+                new LambdaQueryWrapper<DcBaseCompanyAccount>()
+                        .in(DcBaseCompanyAccount::getAccountId, accountIdList)
+                        .in(DcBaseCompanyAccount::getAccountName,RUN_ACCOUNT)
+        );
         //循环跑任务
+        List<EbayAccountReportTask> needUpdateEbayAccountReportTaskList = new ArrayList<>();
         ebayAccountReportTaskList.forEach(x -> {
+            if(accountList.stream().noneMatch(a -> a.getAccountId().equals(x.getAccountId()))){
+                return;
+            }
             //获取token
             Integer pageNum = 1;
             StringBuffer accessToken = new StringBuffer("Bearer ");
@@ -63,6 +75,9 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
             try {
                 //禁用账号直接跳过
                 if(!currentAccount.getStatus()){
+                    x.setStatus(2);
+                    x.setErrorMsg("当前账号被禁用");
+                    needUpdateEbayAccountReportTaskList.add(x);
                     return;
                 }
                 accessToken.append(JSON.parseObject(currentAccount.getAuthJson()).get("access_token"));
@@ -71,6 +86,7 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
                 log.error(msg);
                 x.setStatus(2);
                 x.setErrorMsg(msg);
+                needUpdateEbayAccountReportTaskList.add(x);
                 return;
             }
             DateTimeFormatter pattern = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
@@ -88,8 +104,9 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
                 x.setStatus(2);
                 x.setErrorMsg(msg);
             }
+            needUpdateEbayAccountReportTaskList.add(x);
         });
-        //ebayAccountReportTaskService.updateBatchById(ebayAccountReportTaskList);
+        ebayAccountReportTaskService.updateBatchById(needUpdateEbayAccountReportTaskList);
     }
 
     private boolean doGet(String accessToken, String filter, Integer limit, Integer pageNum, List<Transaction> transactions) {

datacenter-task/ebay-report-consumer/src/main/java/com/bailuntec/task/reader/CustomerReader.java

@@ -26,9 +26,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.time.ZoneId;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -53,6 +51,8 @@ public class CustomerReader implements ItemReader<EbayItem> {
     private GetAccountCall getAccountCall;
     //当前页码
     private Integer pageNum;
+    //无需跑任务的账号
+    private final static String[] CANNOT_RUN_ACCOUNT = new String[]{"ottlueilwitz3","jalenhe","uha4mmada","rownmelody5","nthonyp6ecket","rayallen9","barbara_spence95","nbrysonhall","credit4free"};
 
 
     @Resource
@@ -119,7 +119,12 @@ public class CustomerReader implements ItemReader<EbayItem> {
             dcBaseCompanyAccount = dcBaseCompanyAccountMapper.selectOne(new LambdaQueryWrapper<DcBaseCompanyAccount>()
                     .eq(DcBaseCompanyAccount::getPlatformId, DcBaseCompanyAccount.EBAY_PLATFORM_ID)
                     .eq(DcBaseCompanyAccount::getAccountId, ebayAccountReportTask.getAccountId()));
-
+            if(Arrays.stream(this.CANNOT_RUN_ACCOUNT).anyMatch(x -> x.equals(dcBaseCompanyAccount.getAccountName().toLowerCase()))){
+                ebayAccountReportTask.setStatus(2);
+                ebayAccountReportTask.setErrorMsg("旧接口不跑该任务");
+                this.nextAccount();
+                return;
+            }
             log.info("切换任务 切换后当前账号:{},剩余待跑任务数量:{}", dcBaseCompanyAccount.getAccountName(), ebayAccountReportTaskList.size());
             this.refreshAccountCall();
             this.refreshPage();

datacenter-task/ebay-report-consumer/src/main/java/com/bailuntec/task/writer/CustomerWriter.java

@@ -29,6 +29,6 @@ public class  CustomerWriter implements ItemWriter<DcBaseFinanceEbay> {
     @Override
     public void write(@NonNull List<? extends DcBaseFinanceEbay> items) {
         log.info("批量写入DcBaseFinanceEbay");
-        dcBaseFinanceEbayService.saveBatch(items.stream().map(var -> (DcBaseFinanceEbay) var).collect(Collectors.toList()));
+        dcBaseFinanceEbayService.InsertAllIgnoreExist(items.stream().map(var -> (DcBaseFinanceEbay) var).collect(Collectors.toList()));
     }
 }