提交 0772bce0 authored 作者: 吕本才's avatar 吕本才

fix: 将pageSize参数类型从Long改为Integer

修改接口和实现类中pageSize及相关分页参数的类型,统一使用Integer类型 移除测试类中的main方法注释 调整控制器参数为非必填 优化同步订单详情时的日志记录和参数设置
上级 8adf4e03
...@@ -32,10 +32,10 @@ public class WdtQimenStockoutOrderController { ...@@ -32,10 +32,10 @@ public class WdtQimenStockoutOrderController {
*/ */
@GetMapping("/sync") @GetMapping("/sync")
public SyncOrderDetailDto syncStockoutOrder( public SyncOrderDetailDto syncStockoutOrder(
@RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, @RequestParam(value = "startTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
@RequestParam("endTime")@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime, @RequestParam(value = "endTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
@RequestParam(value = "pageSize", required = false, defaultValue = "200") Long pageSize) { @RequestParam(value = "pageSize", required = false, defaultValue = "200") Integer pageSize) {
return stockoutOrderSyncService.syncStockoutOrder(startTime, endTime, 1,pageSize); return stockoutOrderSyncService.syncStockoutOrder(startTime, endTime, 1, pageSize);
} }
/** /**
......
package com.sfa.job.pojo.response; package com.sfa.job.pojo.response;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import io.swagger.v3.oas.models.security.SecurityScheme.In;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.sfa.common.core.utils.DateUtils; import com.sfa.common.core.utils.DateUtils;
import lombok.Data; import lombok.Data;
...@@ -36,8 +38,8 @@ public class SyncOrderDetailDto { ...@@ -36,8 +38,8 @@ public class SyncOrderDetailDto {
*/ */
private String message; private String message;
private Integer code = 200; private Integer code = 200;
private Long pageSize; private Integer pageSize;
private Long totalPage; private Integer totalPage;
public SyncOrderDetailDto setDetailInfo(String method, String remark, public SyncOrderDetailDto setDetailInfo(String method, String remark,
...@@ -105,11 +107,11 @@ public class SyncOrderDetailDto { ...@@ -105,11 +107,11 @@ public class SyncOrderDetailDto {
this.orderDetailCount = totalDetailCount; this.orderDetailCount = totalDetailCount;
} }
public void setTotalPage(Long totalPage) { public void setTotalPage(Integer totalPage) {
this.totalPage = totalPage; this.totalPage = totalPage;
} }
public void setPageSize(Long pageSize) { public void setPageSize(Integer pageSize) {
this.pageSize = pageSize; this.pageSize = pageSize;
} }
......
...@@ -17,7 +17,7 @@ public interface IWdtQimenStockoutOrderSyncService { ...@@ -17,7 +17,7 @@ public interface IWdtQimenStockoutOrderSyncService {
* @param shopNo 店铺编号 * @param shopNo 店铺编号
* @return 同步结果 * @return 同步结果
*/ */
SyncOrderDetailDto syncStockoutOrder(Date startTime, Date endTime, Integer syncType, Long pageSize); SyncOrderDetailDto syncStockoutOrder(Date startTime, Date endTime, Integer syncType, Integer pageSize);
/** /**
* 同步单个销售出库单 * 同步单个销售出库单
......
...@@ -77,7 +77,7 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr ...@@ -77,7 +77,7 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public SyncOrderDetailDto syncStockoutOrder(Date startTime, Date endTime, Integer syncType, Long pageSize) { public SyncOrderDetailDto syncStockoutOrder(Date startTime, Date endTime, Integer syncType, Integer pageSize) {
WdtStockoutSalesQueryWithDetailRequest request = new WdtStockoutSalesQueryWithDetailRequest(); WdtStockoutSalesQueryWithDetailRequest request = new WdtStockoutSalesQueryWithDetailRequest();
String serverUrl = wdtQimenConfig.getServerUrl(); String serverUrl = wdtQimenConfig.getServerUrl();
String appKey = wdtQimenConfig.getAppKey(); String appKey = wdtQimenConfig.getAppKey();
...@@ -94,8 +94,8 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr ...@@ -94,8 +94,8 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
String targetAppSecret = wdtQimenConfig.getTargetAppSecret(); String targetAppSecret = wdtQimenConfig.getTargetAppSecret();
String wdtSid = wdtQimenConfig.getWdtSid(); String wdtSid = wdtQimenConfig.getWdtSid();
Long pageNo = 1L; Integer pageNo = 1;
Long totalPage = 1L; Integer totalPage = 1;
Integer totalCount = 1; Integer totalCount = 1;
Integer totalDetailCount = 0; Integer totalDetailCount = 0;
SyncOrderDetailDto detailDto = new SyncOrderDetailDto(); SyncOrderDetailDto detailDto = new SyncOrderDetailDto();
...@@ -109,7 +109,6 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr ...@@ -109,7 +109,6 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
detailDto.setSyncType(syncType); detailDto.setSyncType(syncType);
detailDto.setStartTime(startTime); detailDto.setStartTime(startTime);
detailDto.setEndTime(endTime); detailDto.setEndTime(endTime);
detailDto.setPageNo(-1);
// 查询最新的同步记录 // 查询最新的同步记录
CollectOrderLogDto collectOrderLog = orderLogInfoDao.selectOrderSyncLatest(syncType, method); CollectOrderLogDto collectOrderLog = orderLogInfoDao.selectOrderSyncLatest(syncType, method);
...@@ -140,8 +139,8 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr ...@@ -140,8 +139,8 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
request.setParams(params); request.setParams(params);
WdtStockoutSalesQueryWithDetailRequest.Pager pager = new WdtStockoutSalesQueryWithDetailRequest.Pager(); WdtStockoutSalesQueryWithDetailRequest.Pager pager = new WdtStockoutSalesQueryWithDetailRequest.Pager();
pager.setPageNo(pageNo); pager.setPageNo(Long.valueOf(pageNo));
pager.setPageSize(pageSize); pager.setPageSize(Long.valueOf(pageSize));
request.setPager(pager); request.setPager(pager);
String dateTime = DateUtil.formatDateTime(new Date()); String dateTime = DateUtil.formatDateTime(new Date());
...@@ -283,11 +282,12 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr ...@@ -283,11 +282,12 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
pageNo, pageOrderList.size(), pageDetailList.size(), pagePositionDetailList.size(), pageNo, pageOrderList.size(), pageDetailList.size(), pagePositionDetailList.size(),
pagePickPositionDetailList.size(), pageLogisticsDetailList.size(), pageGovSubsidyList.size()); pagePickPositionDetailList.size(), pageLogisticsDetailList.size(), pageGovSubsidyList.size());
} }
detailDto.setPageNo(pageNo);
pageNo++; pageNo++;
} while (pageNo <= totalPage); } while (pageNo <= totalPage);
String remark = String.format("订单数量:%s,详情数量:%s", totalCount, totalDetailCount);
log.info("同步销售出库单完成 - 总订单: {}, 总明细: {}, 总页数: {}", totalCount, totalDetailCount, totalPage); log.info("同步销售出库单完成 - 总订单: {}, 总明细: {}, 总页数: {}", totalCount, totalDetailCount, totalPage);
String remark = String.format("订单数量:%s,详情数量:%s", totalCount, totalDetailCount);
log.debug("批次: {}, 开始时间: {}, 结束时间: {}", batchNo, log.debug("批次: {}, 开始时间: {}, 结束时间: {}", batchNo,
DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(startTime),
DateUtil.formatDateTime(endTime)); DateUtil.formatDateTime(endTime));
...@@ -295,9 +295,10 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr ...@@ -295,9 +295,10 @@ public class WdtQimenStockoutOrderSyncServiceImpl implements IWdtQimenStockoutOr
detailDto.setDetailCount(totalDetailCount); detailDto.setDetailCount(totalDetailCount);
detailDto.setTotalPage(totalPage); detailDto.setTotalPage(totalPage);
detailDto.setPageSize(pageSize); detailDto.setPageSize(pageSize);
detailDto.setDetailInfo(request.getApiMethodName(), remark, detailDto.setRemark(remark);
Integer.valueOf(1), totalCount, totalDetailCount,Integer.parseInt(totalPage+""), // detailDto.setDetailInfo(method, remark,
batchNo,endTime, startTime); // syncType, totalCount, totalDetailCount,Integer.parseInt(totalPage+""),
// batchNo,endTime, startTime);
// 保存同步日志到数据库 // 保存同步日志到数据库
orderLogInfoDao.insert(detailDto); orderLogInfoDao.insert(detailDto);
} catch (ApiException e) { } catch (ApiException e) {
......
...@@ -54,7 +54,7 @@ public class WdtQimenStockoutOrderTask { ...@@ -54,7 +54,7 @@ public class WdtQimenStockoutOrderTask {
XxlJobHelper.log("xxl-job开始同步-旺店通订单明细api接口数据"); XxlJobHelper.log("xxl-job开始同步-旺店通订单明细api接口数据");
// 定时任务不设定开始时间和结束时间 // 定时任务不设定开始时间和结束时间
SyncOrderDetailDto detailDto = stockoutOrderSyncService.syncStockoutOrder(startTime, endTime, 0, 200L); SyncOrderDetailDto detailDto = stockoutOrderSyncService.syncStockoutOrder(startTime, endTime, 0, 200);
XxlJobHelper.log("xxl-job结束同步-旺店通订单明细api接口数据, 共同步订单{}条数据,订单明细{}条,订单批次号:{},订单的开始时间{}和结束时间{}", XxlJobHelper.log("xxl-job结束同步-旺店通订单明细api接口数据, 共同步订单{}条数据,订单明细{}条,订单批次号:{},订单的开始时间{}和结束时间{}",
detailDto.getOrderCount(), detailDto.getOrderDetailCount(), detailDto.getBatchNo(), detailDto.getOrderCount(), detailDto.getOrderDetailCount(), detailDto.getBatchNo(),
DateUtil.formatDateTime(detailDto.getStartTime()), DateUtil.formatDateTime(detailDto.getEndTime())); DateUtil.formatDateTime(detailDto.getStartTime()), DateUtil.formatDateTime(detailDto.getEndTime()));
......
...@@ -27,9 +27,9 @@ public class EventCallbackServiceImplTest { ...@@ -27,9 +27,9 @@ public class EventCallbackServiceImplTest {
eventCallbackService.userResigned("7566837232418670089"); eventCallbackService.userResigned("7566837232418670089");
} }
public static void main(String[] args) { // public static void main(String[] args) {
String offboardingDate = "2025-11-28"; // String offboardingDate = "2025-11-28";
Date date = DateUtils.parseDate(offboardingDate); // Date date = DateUtils.parseDate(offboardingDate);
System.out.println(date); // System.out.println(date);
} // }
} }
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论