# update

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

@@ -5,7 +5,6 @@ import com.bailuntec.common.JsonUtilByFsJson;
 import com.bailuntec.common.ListUtil;
 import com.bailuntec.domain.DcBaseCompanyAccount;
 import com.bailuntec.domain.DcBaseFinanceEbay;
-import com.bailuntec.domain.DcJobConfig;
 import com.bailuntec.domain.EbayAccountReportTask;
 import com.bailuntec.infrastructure.mapper.DcBaseCompanyAccountMapper;
 import com.bailuntec.infrastructure.mapper.EbayAccountReportTaskMapper;
@@ -26,6 +25,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import java.text.MessageFormat;
 import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
@@ -54,8 +54,7 @@ public class CustomerReader implements ItemReader<EbayItem> {
     private GetAccountCall getAccountCall;
     //当前页码
     private Integer pageNum;
-    //配置
-    private DcJobConfig dcJobConfig;
+
 
     @Resource
     private DcBaseCompanyAccountMapper dcBaseCompanyAccountMapper;
@@ -72,9 +71,7 @@ public class CustomerReader implements ItemReader<EbayItem> {
         ebayAccountReportTaskList = ebayAccountReportTaskMapper.selectList(new LambdaQueryWrapper<EbayAccountReportTask>()
                 .ne(EbayAccountReportTask::getStatus, 1));
 
-        this.dcJobConfig = jobProperty.getDcJobConfig();
-        this.pageNum = dcJobConfig.getPageNum();
-
+        this.pageNum = 1;
         log.info("初始化reader 结束");
 
         this.nextAccount();
@@ -96,7 +93,7 @@ public class CustomerReader implements ItemReader<EbayItem> {
             }
         }
         if (ebayItem != null) {
-            log.info("读取一条广告费用记录:{}", JsonUtilByFsJson.beanToJson(ebayItem));
+            log.info("读取一条广告费用记录:{}", JsonUtilByFsJson.beanToJson(ebayItem.getAccountEntryType()));
         }
         return ebayItem;
     }
@@ -113,6 +110,10 @@ public class CustomerReader implements ItemReader<EbayItem> {
     }
 
     private void nextAccount() {
+        if (ebayAccountReportTask != null) {
+            ebayAccountReportTaskMapper.updateById(ebayAccountReportTask);
+        }
+
         this.pageNum = 1;
         if (ListUtil.isNotEmpty(ebayAccountReportTaskList)) {
             ebayAccountReportTask = ebayAccountReportTaskList.remove(0);
@@ -126,7 +127,7 @@ public class CustomerReader implements ItemReader<EbayItem> {
 
             //切换账号后 抓取广告费用前 前先清除已经抓取的数据
             dcBaseFinanceEbayService.remove(new LambdaQueryWrapper<DcBaseFinanceEbay>()
-                    .between(DcBaseFinanceEbay::getBjDate, dcJobConfig.getStartTime(), dcJobConfig.getEndTime())
+                    .between(DcBaseFinanceEbay::getBjDate, ebayAccountReportTask.getStartTime(), ebayAccountReportTask.getEndTime())
                     .eq(DcBaseFinanceEbay::getAccountId, dcBaseCompanyAccount.getAccountId()));
         }
         if (ListUtil.isEmpty(accountEntryTypeList) && ListUtil.isNotEmpty(ebayAccountReportTaskList)) {
@@ -162,6 +163,9 @@ public class CustomerReader implements ItemReader<EbayItem> {
     }
 
     private void refreshPage() {
+        if (getAccountCall == null) {
+            return;
+        }
         PaginationType paginationType = new PaginationType();
         paginationType.setPageNumber(pageNum);
         getAccountCall.setPagination(paginationType);
@@ -172,10 +176,14 @@ public class CustomerReader implements ItemReader<EbayItem> {
                 accountEntryTypeList = Lists.newArrayList(accountEntryTypes);
             }
         } catch (Exception ex) {
-            log.info("请求ebay广告服务异常,当前账号:{}，当前页码:{}", dcBaseCompanyAccount.getAccountName(), pageNum);
+            String errMsg = MessageFormat.format("请求ebay广告服务异常,当前账号:{1}，当前页码:{2}", dcBaseCompanyAccount.getAccountName(), pageNum);
+            log.error(errMsg);
             //todo log ebay exception
+            ebayAccountReportTask.setStatus(2);
+            ebayAccountReportTask.setErrorMsg(errMsg);
         } finally {
             log.info("请求ebay广告服务结束,当前账号:{}，当前页码:{}", dcBaseCompanyAccount.getAccountName(), pageNum);
+            ebayAccountReportTask.setStatus(1);
         }
     }
 }