1、数据源修改2、代码方法合并3、退换货请求旺店通返回数据

src/main/java/com/sfa/job/domain/order/dao/CollectErrorLogDao.java

 package com.sfa.job.domain.order.dao;
 
-import com.sfa.job.domain.order.entity.CollectErrorLog;
+import com.sfa.job.pojo.response.SyncOrderDetailDto;
 
 public interface CollectErrorLogDao {
     // 插入一条记录
-    void insert(CollectErrorLog collectErrorLog);
+    void insert(SyncOrderDetailDto collectErrorLog);
 
 }

src/main/java/com/sfa/job/domain/order/dao/CollectOrderLogDao.java

 package com.sfa.job.domain.order.dao;
 
-import com.sfa.job.domain.order.entity.CollectOrderLog;
 import com.sfa.job.pojo.response.CollectOrderLogDto;
+import com.sfa.job.pojo.response.SyncOrderDetailDto;
 
 public interface CollectOrderLogDao {
     // 插入一条记录
-    void insert(CollectOrderLog collectOrderLog);
+    void insert(SyncOrderDetailDto collectOrderLog);
 
     CollectOrderLogDto selectOrderSyncLatest(Integer syncType);
 }

src/main/java/com/sfa/job/domain/order/dao/impl/CollectErrorLogImpl.java

 package com.sfa.job.domain.order.dao.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sfa.job.constants.Constants;
 import com.sfa.job.domain.order.dao.CollectErrorLogDao;
 import com.sfa.job.domain.order.entity.CollectErrorLog;
 import com.sfa.job.domain.order.mapper.CollectErrorLogMapper;
+import com.sfa.job.pojo.response.SyncOrderDetailDto;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
-@DS("Bi")
+import java.util.Date;
+
+@DS("bi")
 @Repository
 public class CollectErrorLogImpl implements CollectErrorLogDao {
 
@@ -15,8 +21,16 @@ public class CollectErrorLogImpl implements CollectErrorLogDao {
     private CollectErrorLogMapper collectErrorLogMapper;
 
     @Override
-    public void insert(CollectErrorLog collectErrorLog) {
-        collectErrorLogMapper.insert(collectErrorLog);
+    public void insert(SyncOrderDetailDto detailDto) {
+        // 记录错误日志表 collect_error_info
+        CollectErrorLog errorInfo = new CollectErrorLog();
+        errorInfo.setBatchNo(detailDto.getBatchNo());
+        errorInfo.setType(Constants.SYNC_TYPE_XXL_JOB);
+        errorInfo.setErrorMsg(ObjectUtil.isNotEmpty(detailDto.getMessage())? StringUtils.substring(detailDto.getMessage(),0,2000):"");
+        errorInfo.setEndTime(detailDto.getEndTime());
+        errorInfo.setStartTime(detailDto.getStartTime());
+        errorInfo.setCollectTime(new Date());
+        collectErrorLogMapper.insert(errorInfo);
     }
 
 

src/main/java/com/sfa/job/domain/order/dao/impl/CollectOrderLogDaoImpl.java

@@ -7,13 +7,14 @@ import com.sfa.job.domain.order.dao.CollectOrderLogDao;
 import com.sfa.job.domain.order.entity.CollectOrderLog;
 import com.sfa.job.domain.order.mapper.CollectOrderLogMapper;
 import com.sfa.job.pojo.response.CollectOrderLogDto;
+import com.sfa.job.pojo.response.SyncOrderDetailDto;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class CollectOrderLogDaoImpl implements CollectOrderLogDao {
 
@@ -21,7 +22,16 @@ public class CollectOrderLogDaoImpl implements CollectOrderLogDao {
     private CollectOrderLogMapper logInfoMapper;
 
     @Override
-    public void insert(CollectOrderLog collectOrderLog) {
+    public void insert(SyncOrderDetailDto detailDto) {
+        CollectOrderLog collectOrderLog = new CollectOrderLog();
+        collectOrderLog.setSyncType(detailDto.getSyncType());
+        collectOrderLog.setMethod(detailDto.getMethod());
+        collectOrderLog.setOrderCount(detailDto.getOrderCount());
+        collectOrderLog.setOrderDetailCount(detailDto.getOrderDetailCount());
+        collectOrderLog.setBatchNo(detailDto.getBatchNo());
+        collectOrderLog.setLatestTime(detailDto.getLatestTime() );
+        collectOrderLog.setPageNo(detailDto.getPageNo());
+        collectOrderLog.setTotalCount(detailDto.getTotalCount());
         logInfoMapper.insert(collectOrderLog);
     }
 

src/main/java/com/sfa/job/domain/order/dao/impl/FinianceBaseProductDaoImpl.java

@@ -12,7 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class FinianceBaseProductDaoImpl implements FinianceBaseProductDao {
 

src/main/java/com/sfa/job/domain/order/dao/impl/FinianceBaseZbjTypeDaoImpl.java

@@ -12,7 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class FinianceBaseZbjTypeDaoImpl implements FinanceBaseZbjTypeDao {
 

src/main/java/com/sfa/job/domain/order/dao/impl/FinianceOrderDaoImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class FinianceOrderDaoImpl implements FinanceOrderDao {
 

src/main/java/com/sfa/job/domain/order/dao/impl/FinianceOrderDetailDaoImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class FinianceOrderDetailDaoImpl implements FinanceOrderDetailDao {
 

src/main/java/com/sfa/job/domain/order/dao/impl/WdtRefundOrderDaoImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class WdtRefundOrderDaoImpl implements WdtRefundOrderDao {
 

src/main/java/com/sfa/job/domain/order/dao/impl/WdtRefundOrderDetailDaoImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class WdtRefundOrderDetailDaoImpl implements WdtRefundOrderDetailDao {
 

src/main/java/com/sfa/job/domain/order/dao/impl/WdtSwapOrderDaoImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class WdtSwapOrderDaoImpl implements WdtSwapOrderDao {
 

src/main/java/com/sfa/job/domain/order/dao/impl/WdtSwapOrderDetailDaoImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@DS("Bi")
+@DS("bi")
 @Repository
 public class WdtSwapOrderDetailDaoImpl implements WdtSwapOrderDetailDao {
 

src/main/java/com/sfa/job/domain/order/entity/CollectOrderLog.java

@@ -25,6 +25,7 @@ public class CollectOrderLog implements Serializable {
      */
     @TableId(value = "cli_id",type= IdType.AUTO)
     private Long cliId;
+    private String method;
 
     /**
      * 采集订单的数量，存储为字符串，长度不超过 20 个字符

src/main/java/com/sfa/job/pojo/response/SyncOrderDetailDto.java

@@ -10,6 +10,7 @@ import java.util.Date;
  */
 @Data
 public class SyncOrderDetailDto {
+    private String method;
     /**
      * 订单数量
      */
@@ -19,6 +20,8 @@ public class SyncOrderDetailDto {
     private Date startTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
+    private Date latestTime;
+
     private Integer syncType;
     private String batchNo;
     private Integer pageNo;
@@ -29,4 +32,15 @@ public class SyncOrderDetailDto {
     private String message;
     private Integer code = 200;
 
+    public SyncOrderDetailDto setDetailInfo(int size, int mergerListSize, int beginPageNo, Integer totalCount, String batchNo, Date endTime, Date startTime) {
+        // 接口测试使用
+        this.setOrderCount(size);
+        this.setOrderDetailCount(mergerListSize);
+        this.setStartTime(startTime);
+        this.setPageNo(beginPageNo);
+        this.setEndTime(endTime);
+        this.setTotalCount(totalCount);
+        this.setBatchNo(batchNo);
+        return this;
+    }
 }

src/main/java/com/sfa/job/service/order/impl/FinanceOrderSyncServiceImpl.java

@@ -9,7 +9,6 @@ import com.alibaba.fastjson2.JSONReader;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.sfa.common.core.exception.ServiceException;
 import com.sfa.common.core.utils.DateUtils;
-import com.sfa.job.constants.Constants;
 import com.sfa.job.domain.order.dao.*;
 import com.sfa.job.domain.order.entity.*;
 import com.sfa.job.pojo.request.WdtOrderQueryVO;
@@ -103,8 +102,7 @@ public class FinanceOrderSyncServiceImpl implements FinanceOrderSyncService {
             wdtOrderQueryVO.setStart_time(com.alibaba.fastjson2.util.DateUtils.format(startTime));
             wdtOrderQueryVO.setEnd_time(com.alibaba.fastjson2.util.DateUtils.format(endTime));
             HashMap<String, Object> params = new HashMap<>();
-            Map<String, Object> stringObjectMap = BeanUtil.beanToMap(wdtOrderQueryVO);
-            params.putAll(stringObjectMap);
+            params.putAll(BeanUtil.beanToMap(wdtOrderQueryVO));
 
             // 旺店通入参 和其他入参分开传入   旺店通入参bean转map
             String method = "sales.TradeQuery.queryWithDetail";
@@ -212,37 +210,27 @@ public class FinanceOrderSyncServiceImpl implements FinanceOrderSyncService {
             log.info("插入订单和订单详情完成，批次{}开始时间{},结束时间{},订单数量:{},详情数量：{},下一次开始页数:{}", batchNo, DateUtil.formatDateTime(startTime),
                     DateUtil.formatDateTime(endTime), orders.size(), mergeList.size(), beginPageNo.get());
 
-            CollectOrderLog collectOrderLog = new CollectOrderLog();
-            collectOrderLog.setSyncType(syncType);
-            collectOrderLog.setOrderCount(orders.size());
-            collectOrderLog.setOrderDetailCount(mergeList.size());
-            collectOrderLog.setBatchNo(batchNo);
-            collectOrderLog.setLatestTime(endTime);
-            collectOrderLog.setPageNo(beginPageNo.get());
-            collectOrderLog.setTotalCount(wangdiantongQueryDto.getTotalCount());
-            orderLogInfoDao.insert(collectOrderLog);
+//            dealCollectOrderLog(syncType, method, orders.size(), mergeList.size(), batchNo, endTime, beginPageNo, wangdiantongQueryDto);
+
+
 
             // 接口测试使用
-            detailDto.setOrderCount(orders.size());
-            detailDto.setOrderDetailCount(mergeList.size());
-            detailDto.setStartTime(finalStartTime);
-            detailDto.setPageNo(beginPageNo.get());
-            detailDto.setEndTime(finalEndTime);
-            detailDto.setTotalCount(wangdiantongQueryDto.getTotalCount());
-            detailDto.setBatchNo(batchNo);
+//            detailDto.setOrderCount(orders.size());
+//            detailDto.setOrderDetailCount(mergeList.size());
+//            detailDto.setStartTime(finalStartTime);
+//            detailDto.setPageNo(beginPageNo.get());
+//            detailDto.setEndTime(finalEndTime);
+//            detailDto.setTotalCount(wangdiantongQueryDto.getTotalCount());
+//            detailDto.setBatchNo(batchNo);
+            detailDto.setDetailInfo(orders.size(),  mergeList.size(), beginPageNo.get(), wangdiantongQueryDto.getTotalCount(), batchNo, endTime, startTime);
+            orderLogInfoDao.insert(detailDto);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            // 记录错误日志表 collect_error_info
-            CollectErrorLog errorInfo = new CollectErrorLog();
-            errorInfo.setBatchNo(batchNo);
-            errorInfo.setType(Constants.SYNC_TYPE_XXL_JOB);
-            errorInfo.setErrorMsg(e.getMessage());
-            errorInfo.setEndTime(endTime);
-            errorInfo.setStartTime(startTime);
-            errorInfo.setCollectTime(new Date());
-            errorInfoDao.insert(errorInfo);
             detailDto.setCode(HttpStatus.HTTP_INTERNAL_ERROR);
             detailDto.setMessage(e.toString());
+            log.error(e.getMessage(), e);
+            // 记录错误日志表 collect_error_info
+            errorInfoDao.insert(detailDto);
+
         }
         return detailDto;
     }
@@ -280,7 +268,6 @@ public class FinanceOrderSyncServiceImpl implements FinanceOrderSyncService {
             HashMap<String, Object> params = new HashMap<>();
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(wdtOrderQueryVO);
             params.putAll(stringObjectMap);
-//           https://open.wangdian.cn/qjb/open/apidoc/doc?path=aftersales.refund.Refund.search 1.4 时间跨度：请求时间最大跨度为30天。
             // 退换单查询
             String method = "aftersales.refund.Refund.search";
             WangdiantongQueryDto wangdiantongQueryDto = wangdiantongUtil.queryWithDetail(params, beginPageNo, method);
@@ -301,42 +288,21 @@ public class FinanceOrderSyncServiceImpl implements FinanceOrderSyncService {
             log.info("插入订单和订单详情完成，批次{}开始时间{},结束时间{},订单数量:{},详情数量：{},下一次开始页数:{}", batchNo, DateUtil.formatDateTime(startTime),
                     DateUtil.formatDateTime(endTime), orders.size(), mergeList.size(), beginPageNo.get());
 
-            CollectOrderLog collectOrderLog = new CollectOrderLog();
-            collectOrderLog.setSyncType(syncType);
-            collectOrderLog.setOrderCount(orders.size());
-            collectOrderLog.setOrderDetailCount(mergeList.size());
-            collectOrderLog.setBatchNo(batchNo);
-            collectOrderLog.setLatestTime(endTime);
-            collectOrderLog.setPageNo(beginPageNo.get());
-            collectOrderLog.setTotalCount(wangdiantongQueryDto.getTotalCount());
-            orderLogInfoDao.insert(collectOrderLog);
 
-            // 接口测试使用
-            detailDto.setOrderCount(orders.size());
-            detailDto.setOrderDetailCount(mergeList.size());
-            detailDto.setStartTime(startTime);
-            detailDto.setPageNo(beginPageNo.get());
-            detailDto.setEndTime(endTime);
-            detailDto.setTotalCount(wangdiantongQueryDto.getTotalCount());
-            detailDto.setBatchNo(batchNo);
+            detailDto.setDetailInfo(orders.size(),  mergeList.size(), beginPageNo.get(), wangdiantongQueryDto.getTotalCount(), batchNo, endTime, startTime);
+            orderLogInfoDao.insert(detailDto);
         }catch (Exception e){
-            log.error(e.getMessage(), e);
-            // 记录错误日志表 collect_error_info
-            CollectErrorLog errorInfo = new CollectErrorLog();
-            errorInfo.setBatchNo(batchNo);
-            errorInfo.setType(Constants.SYNC_TYPE_XXL_JOB);
-            errorInfo.setErrorMsg(e.getMessage());
-            errorInfo.setEndTime(endTime);
-            errorInfo.setStartTime(startTime);
-            errorInfo.setCollectTime(new Date());
-            errorInfoDao.insert(errorInfo);
             detailDto.setCode(HttpStatus.HTTP_INTERNAL_ERROR);
             detailDto.setMessage(e.toString());
-        }finally {
-
+            log.error(e.getMessage(), e);
+            errorInfoDao.insert(detailDto);
         }
-        return null;
+        return detailDto;
     }
+
+
+
+
     private void setupTimeRange(Date[] startTime, Date[] endTime, Integer syncType, AtomicInteger beginPageNo) {
         // startTime 为空，默认是定时任务调用
         if (ObjectUtils.isEmpty(startTime[0])) {

src/main/resources/mapper/order/WdtRefundOrderMapper.xml

@@ -16,7 +16,7 @@
         shop_id, trade_id, raw_refund_nos, pay_id, provider_refund_no,
         shop_platform_id, tid_list, sub_platform_id, return_warehouse_id,
         platform_id, wms_owner_no, warehouse_type, bad_reason, modified_date,
-        return_mask_info, process_status, reason_id, revert_reason_id,
+        return_mask_info, process_status, reason_id, revert_reason,
         customer_id, consign_mode, refund_time, fenxiao_tid, fenxiao_nick_no,
         wms_code, rr_status, current_phase_timeout
         )
@@ -74,7 +74,7 @@
             #{item.returnMaskInfo},
             #{item.processStatus},
             #{item.reasonId},
-            #{item.revertReasonId},
+            #{item.revertReason},
             #{item.customerId},
             #{item.consignMode},
             #{item.refundTime},
@@ -136,7 +136,7 @@
         return_mask_info = VALUES(return_mask_info),
         process_status = VALUES(process_status),
         reason_id = VALUES(reason_id),
-        revert_reason_id = VALUES(revert_reason_id),
+        revert_reason = VALUES(revert_reason),
         customer_id = VALUES(customer_id),
         consign_mode = VALUES(consign_mode),
         refund_time = VALUES(refund_time),