修改定时任务调用问题：不同dao区分不同的数据源，暂时将没有找到分区的数据放在2021数据表中

src/main/java/com/sfa/job/config/PayTimeYearShardingAlgorithm.java

 package com.sfa.job.config;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
 import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
 import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
@@ -10,20 +11,9 @@ import java.util.*;
 /**
  * ShardingSphere 5.4.1 按 pay_time 年份分表算法
  */
+@Slf4j
 public class PayTimeYearShardingAlgorithm implements StandardShardingAlgorithm<LocalDateTime> {
 
-    /**
-     * 精确分片（处理 = 条件）
-     * 例：pay_time = '2023-05-01 10:00:00' → 路由到 t_order_2023
-     */
-
-
-    /**
-     * 范围分片（处理 >、<、BETWEEN 等条件）
-     * 例：pay_time BETWEEN '2023-01-01' AND '2024-12-31' → 路由到 t_order_2023、t_order_2024
-     */
-
-
     // 初始化方法（可留空）
     @Override
     public void init(Properties props) {
@@ -46,10 +36,17 @@ public class PayTimeYearShardingAlgorithm implements StandardShardingAlgorithm<L
         return StandardShardingAlgorithm.super.isDefault();
     }
 
+    /**
+     * 精确分片（处理 = 条件）
+     * 例：pay_time = '2023-05-01 10:00:00' → 路由到 t_order_2023
+     */
     @Override
     public String doSharding(Collection<String> collection, PreciseShardingValue<LocalDateTime> preciseShardingValue) {
         // 获取精确查询的时间值
         LocalDateTime payTime = preciseShardingValue.getValue();
+        if(payTime ==  null){
+            return preciseShardingValue.getLogicTableName()+ "_2021" ;
+        }
         int year = payTime.getYear();
         // 生成目标表名（逻辑表名_年份）
         String targetTable = preciseShardingValue.getLogicTableName() + "_" + year;
@@ -60,6 +57,10 @@ public class PayTimeYearShardingAlgorithm implements StandardShardingAlgorithm<L
         throw new IllegalArgumentException("未找到匹配的表：" + targetTable);
     }
 
+    /**
+     * 范围分片（处理 >、<、BETWEEN 等条件）
+     * 例：pay_time BETWEEN '2023-01-01' AND '2024-12-31' → 路由到 t_order_2023、t_order_2024
+     */
     @Override
     public Collection<String> doSharding(Collection<String> collection, RangeShardingValue<LocalDateTime> shardingValue) {
         Set<String> result = new HashSet<>();

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

@@ -37,6 +37,7 @@ public class CollectOrderLogDaoImpl implements CollectOrderLogDao {
         logInfoMapper.insert(collectOrderLog);
     }
 
+    @DS("bi")
     @Override
     public CollectOrderLogDto selectOrderSyncLatest(Integer syncType, String method) {
         // 查询最新发货日期

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

 package com.sfa.job.domain.order.dao.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sfa.job.domain.order.dao.IProductDao;
 import com.sfa.job.domain.order.entity.PrdInfo;
@@ -18,6 +19,7 @@ import java.util.Map;
  * @describe :
  */
 
+@DS("bi")
 @Service
 public class ProductDaoImpl implements IProductDao {
     @Autowired

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import org.apache.commons.lang3.ObjectUtils;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -209,9 +210,9 @@ public class WdtQimenOrderDetailPayTime extends BaseDo {
     // 发票内容
     private String invoiceContent;
     // 支付时间，DateTime格式，取自原始订单支付时间
-    private Date payTime;
+    private LocalDateTime payTime;
     // 订单支付时间，DateTime格式，取自原始订单支付时间
-    private Date orderPayTime;
+    private LocalDateTime orderPayTime;
     // 货品简称
     private String shortName;
 

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

@@ -37,7 +37,6 @@ import java.util.*;
  * @author lvbencai
  * @date 2025年01月07日17:00:16
  */
-@DS("sharding")
 @Slf4j
 @Service
 public class WdtQimenOrderPayTimeSyncServiceImpl implements IWdtQimenOrderPayTimeSyncService {
@@ -60,7 +59,7 @@ public class WdtQimenOrderPayTimeSyncServiceImpl implements IWdtQimenOrderPayTim
     @Autowired
     WdtQimenConfig wdtQimenConfig;
 
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     @Override
     public SyncOrderDetailDto syncWdtQimenOrderByTradeNo(Date startTime, Date endTime, Integer syncType, String tradeNo, Long pageNo, Long pageSize) {
         WdtSalesTradeQueryQueryWithDetailVo request = new WdtSalesTradeQueryQueryWithDetailVo();
@@ -126,12 +125,12 @@ public class WdtQimenOrderPayTimeSyncServiceImpl implements IWdtQimenOrderPayTim
     }
 
     /**
-     * 多线程调用此方法
+     * 按照付款时间来同步旺店通订单
      *
      * @param startTime
      * @param endTime
      */
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     @Override
     public SyncOrderDetailDto syncWdtQimenOrder(Date startTime, Date endTime, Integer syncType, Long pageSize) {
         SyncOrderDetailDto detailDto = new SyncOrderDetailDto();
@@ -185,8 +184,8 @@ public class WdtQimenOrderPayTimeSyncServiceImpl implements IWdtQimenOrderPayTim
                 WdtSalesTradeQueryQueryWithDetailVo.Params params = new WdtSalesTradeQueryQueryWithDetailVo.Params();
                 params.setStartTime(DateUtil.formatDateTime(startTime));
                 params.setEndime(DateUtil.formatDateTime(endTime));
-                // 旺店通的页码从0开始，奇门从1开始
-                params.setTimeType(1);
+                // 旺店通的页码从0开始，奇门从1开始  时间类型 1:修改时间 2:付款时间 默认1
+                params.setTimeType(2);
                 request.setParams(params);
 
                 WdtSalesTradeQueryQueryWithDetailVo.Pager pager = new WdtSalesTradeQueryQueryWithDetailVo.Pager();
@@ -270,9 +269,12 @@ public class WdtQimenOrderPayTimeSyncServiceImpl implements IWdtQimenOrderPayTim
                     orderDetail.setBatchNo(batchNo);
                     orderDetail.setTradeNo(order.getTradeNo());
                     if (ObjectUtils.isEmpty(orderDetail.getPayTime())) {
-//                        orderDetail.setPayTime(order.getPayTime());
+                        orderDetail.setPayTime(order.getPayTime());
+                    }
+                    if(ObjectUtils.isEmpty(order.getPayTime())){
+                        log.info("订单号：{}，订单明细支付时间为空，使用订单支付时间", orderDetail.getTradeNo());
                     }
-//                    orderDetail.setOrderPayTime(order.getPayTime());
+                    orderDetail.setOrderPayTime(order.getPayTime());
 
                     // 计算分销信息
                     orderDetail.setFenxiaoNick(order.getFenxiaoNick());

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

@@ -20,7 +20,7 @@
             #{item.weight}, #{item.imgUrl}, #{item.actualNum}, #{item.barcode}, #{item.paid},
             #{item.suiteId}, #{item.bindOid}, #{item.printSuiteMode}, #{item.flag}, #{item.stockState},
             #{item.isConsigned}, #{item.isReceived}, #{item.cid}, #{item.modifiedDate}, #{item.createdDate},
-            #{item.sharePostPrice}, #{item.invoiceContent}, #{item.payTime}, #{item.shortName},
+            #{item.sharePostPrice}, #{item.invoiceContent}, #{item.payTime}, #{item.orderPayTime}, #{item.shortName},
             #{item.fenxiaoNick}, #{item.fenxiaoId}, #{item.fenxiaoName}, #{item.batchNo},
             #{item.startTime}, #{item.endTime}, #{item.tradeNo}, #{item.shopNo}, #{item.shopName},
             #{item.shopRemark}, #{item.tradeStatus}, #{item.tradeTime}, #{item.consignTime},
@@ -92,6 +92,7 @@
         share_post_price = VALUES(share_post_price),
         invoice_content = VALUES(invoice_content),
         pay_time = VALUES(pay_time),
+        order_pay_time = VALUES(order_pay_time),
         short_name = VALUES(short_name),
         fenxiao_nick = VALUES(fenxiao_nick),
         fenxiao_id = VALUES(fenxiao_id),
@@ -150,7 +151,7 @@
             suite_discount, api_goods_name, api_spec_name, api_goods_id, api_spec_id, goods_id, spec_id,
             commission, goods_type, from_mask, remark, modified, created, prop1, prop2, weight, img_url,
             actual_num, barcode, paid, suite_id, bind_oid, print_suite_mode, flag, stock_state, is_consigned,
-            is_received, cid, modified_date, created_date, share_post_price, invoice_content, pay_time, short_name,
+            is_received, cid, modified_date, created_date, share_post_price, invoice_content, pay_time,order_pay_time, short_name,
             fenxiao_nick, fenxiao_id, fenxiao_name, batch_no, start_time, end_time, trade_no, shop_no, shop_name,
             shop_remark, trade_status, trade_time, consign_time, receiver_area, zbj_name, zbj_id, zbj_zb_id,
             zbj_sale_type, zbj_qd_type, receivable, spec_name_erp, flavor_erp, sync_type, actual_cost,
@@ -219,6 +220,7 @@
         <result column="share_post_price" property="sharePostPrice" jdbcType="DECIMAL"/>
         <result column="invoice_content" property="invoiceContent" jdbcType="VARCHAR"/>
         <result column="pay_time" property="payTime" jdbcType="VARCHAR"/>
+        <result column="order_pay_time" property="orderPayTime" jdbcType="VARCHAR"/>
         <result column="short_name" property="shortName" jdbcType="VARCHAR"/>
         <result column="fenxiao_nick" property="fenxiaoNick" jdbcType="VARCHAR"/>
         <result column="fenxiao_id" property="fenxiaoId" jdbcType="VARCHAR"/>