fix: 修改出库单同步服务的分页参数和事务注解

src/main/java/com/sfa/job/controller/order/WdtQimenStockoutOrderController.java

@@ -40,7 +40,7 @@ public class WdtQimenStockoutOrderController {
         SyncStockoutRequest syncStockoutRequest = new SyncStockoutRequest();
         syncStockoutRequest.setStartTime(startTime);
         syncStockoutRequest.setEndTime(endTime);
-        syncStockoutRequest.setSyncType(1);
+        syncStockoutRequest.setSyncType(0);
         return stockoutOrderSyncService.syncStockoutOrder(syncStockoutRequest, pageSize);
     }
 

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

@@ -76,7 +76,7 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
     @Autowired
     CollectOrderLogDao orderLogInfoDao;
 
-    @Transactional(rollbackFor = Exception.class)
+    // @Transactional(rollbackFor = Exception.class)
     @Override
     public SyncOrderDetailDto syncStockoutOrder(SyncStockoutRequest syncStockoutRequest,Integer pageSize) { 
         WdtStockoutSalesQueryWithDetailRequest request = new WdtStockoutSalesQueryWithDetailRequest();
@@ -95,8 +95,13 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
         String targetAppSecret = wdtQimenConfig.getTargetAppSecret();
         String wdtSid = wdtQimenConfig.getWdtSid();
 
-        Integer pageNo = 1;
-        Integer totalPage = 1;
+        //分页编号，分页查询必传，标准接口page_no从0开始
+        Integer wdtPageNo = 1;
+        // 分页大小，分页查询必传
+        Integer wdtPageSize = pageSize;
+
+        Integer wdtTotalPage = 1;
+
         Integer totalCount = 1;
         Integer totalDetailCount = 0;
         SyncOrderDetailDto detailDto = new SyncOrderDetailDto();
@@ -140,6 +145,8 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
             log.info("查询出库单参数：开始时间{},结束时间{}", DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime));
 
             do {
+
+
                 QimenCloudClient client = new DefaultQimenCloudClient(serverUrl, appKey, appSecret);
                 WdtStockoutSalesQueryWithDetailRequest.Params params = new WdtStockoutSalesQueryWithDetailRequest.Params();
                 params.setStartTime(DateUtil.formatDateTime(startTime));
@@ -153,8 +160,8 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
                 request.setParams(params);
 
                 WdtStockoutSalesQueryWithDetailRequest.Pager pager = new WdtStockoutSalesQueryWithDetailRequest.Pager();
-                pager.setPageNo(Long.valueOf(pageNo));
-                pager.setPageSize(Long.valueOf(pageSize));
+                pager.setPageNo(Long.valueOf(wdtPageNo));
+                pager.setPageSize(Long.valueOf(wdtPageSize));
                 request.setPager(pager);
 
                 String dateTime = DateUtil.formatDateTime(new Date());
@@ -167,7 +174,7 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
                 String wdtSign = WdtQimenUtil.getQimenCustomWdtSign(request, wdtSecret);
 
                 request.setWdtSign(wdtSign);
-                log.debug("请求参数 - 页码: {}, 页大小: {}", pageNo, pageSize);
+                log.debug("请求参数 - 页码: {}, 页大小: {}", wdtPageNo, pageSize);
 
                 long startTimeQuery = System.currentTimeMillis();
                 WdtWmsStockoutSalesQuerywithdetailResponse response = client.execute(request);
@@ -186,7 +193,7 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
                 WdtQimenStockoutDataDto wdtQimenDataDto = wdtQimenResponseDto.getData();
 
                 totalCount = wdtQimenDataDto.getTotalCount();
-                totalPage = totalCount / pageSize + 1;
+                wdtTotalPage = totalCount / wdtPageSize + 1;
 
                 List<WdtQimenStockoutOrder> stockoutOrderSubList = wdtQimenDataDto.getOrder();
                 List<WdtQimenStockoutOrder> pageOrderList = new ArrayList<>();
@@ -292,23 +299,24 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
                     if (!pageGovSubsidyList.isEmpty()) {
                         stockoutGovSubsidyDao.insertOrUpdateBatch(pageGovSubsidyList);
                     }
-                    log.info("第 {} 页处理完成 - 订单: {}, 明细: {}, 货位: {}, 拣货位: {}, 物流: {}, 国补: {}",
-                            pageNo, pageOrderList.size(), pageDetailList.size(), pagePositionDetailList.size(),
+                    
+                }
+                log.info("第 {} 页处理完成，总页数: {} - 订单: {}, 明细: {}, 货位: {}, 拣货位: {}, 物流: {}, 国补: {}",
+                            wdtPageNo, wdtTotalPage, pageOrderList.size(), pageDetailList.size(), pagePositionDetailList.size(),
                             pagePickPositionDetailList.size(), pageLogisticsDetailList.size(),
                             pageGovSubsidyList.size());
-                }
-                detailDto.setPageNo(pageNo);
-                pageNo++;
-            } while (pageNo <= totalPage);
+                detailDto.setPageNo(wdtPageNo);
+                wdtPageNo++;
+            } while (wdtPageNo <= wdtTotalPage);
             String remark = String.format("订单数量:%s,详情数量：%s", totalCount, totalDetailCount);
 
-            log.info("同步销售出库单完成 - 总订单: {}, 总明细: {}, 总页数: {}", totalCount, totalDetailCount, totalPage);
+            log.info("同步销售出库单完成 - 总订单: {}, 总明细: {}, 总页数: {}", totalCount, totalDetailCount, wdtTotalPage);
             log.debug("批次: {}, 开始时间: {}, 结束时间: {}", batchNo,
                     DateUtil.formatDateTime(startTime),
                     DateUtil.formatDateTime(endTime));
             detailDto.setOrderCount(totalCount);
             detailDto.setDetailCount(totalDetailCount);
-            detailDto.setTotalPage(totalPage);
+            detailDto.setTotalPage(wdtTotalPage);
             detailDto.setPageSize(pageSize);
             detailDto.setRemark(remark);
             detailDto.setLatestTime(endTime);