1、修复定时任务分页边界问题

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

@@ -87,5 +87,6 @@ public class CollectOrderLogInfo implements Serializable {
 
     private Integer syncType;
 
+    private Integer totalCount;
 
 }

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

@@ -212,6 +212,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
             collectOrderLogInfo.setBatchNo(batchNo);
             collectOrderLogInfo.setLatestTime(endTime);
             collectOrderLogInfo.setPageNo(beginPageNo.get());
+            collectOrderLogInfo.setTotalCount(wangdiantongQueryDto.getTotalCount());
             orderLogInfoDao.insert(collectOrderLogInfo);
 
             // 接口测试使用

src/main/java/com/sfa/job/util/WangdiantongUtil.java

@@ -87,14 +87,18 @@ public class WangdiantongUtil {
                     throw new ServiceException("访问旺店通接口错误" + messageJson.toString());
                 }
                 totalCount = dataR.getInteger("total_count");
+                maxPage = (totalCount / 200)+1;
+
                 JSONArray orderJsonArray = dataR.getJSONArray("order");
                 allArray.addAll(orderJsonArray);
+
                 size = allArray.size();
-                pageNo++;
-                maxPage = (totalCount / 200);
                 log.info("当前时间段{}-{},查询返回的order条数:{},总条数totalCount:{},page_no:{}", wangdiantongQuery.getStart_time(), wangdiantongQuery.getEnd_time(), orderJsonArray.size(), totalCount, pageNo);
-            } while (size < maxDealCount && pageNo <= maxPage);
+                // 计算下一次分页的页码
+                pageNo++;
+            } while (size < maxDealCount && pageNo < maxPage);
             if (pageNo >= maxPage) {
+                // 已经到最后一页了，设置成-1，表示已经处理完了，不再查询
                 beginPageNo.set(-1);
             } else {
                 beginPageNo.set(pageNo);