Merge remote-tracking branch 'origin/dev' into dev-zzx

This commit is contained in:
YAS\29473
2025-04-14 17:02:17 +08:00
7 changed files with 79 additions and 35 deletions

View File

@@ -282,6 +282,9 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
// 分页(注意:这里要先单独查询订单编号进行分页,因为对分账信息分页,当前页不一定能完全展示完毕同一订单号的分账信息)
PageHelper.startPage(pageNo, pageSize);
List<String> orderCodes = orderSplitRecordMapper.queryOrderCodesByParams(dto);
if (CollectionUtils.isEmpty(orderCodes)) {
return new PageResponse();
}
PageInfo<String> pageInfo = new PageInfo<>(orderCodes);
// 查询符合条件的分账记录