diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 67bee0adb..3fefa4885 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -7,6 +7,7 @@ import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.enums.ykc.ReturnCodeEnum; @@ -241,8 +242,8 @@ public class OrderBasicInfoController extends BaseController { public RestApiResponse queryOrderSplitData(@RequestBody QueryOrderSplitDTO dto) { RestApiResponse response = null; try { - List splitRecordInfoVOS = orderSplitRecordService.queryOrderSplitData(dto); - response = new RestApiResponse<>(ImmutableMap.of("orderList", splitRecordInfoVOS)); + PageResponse pageResponse = orderSplitRecordService.queryOrderSplitData(dto); + response = new RestApiResponse<>(pageResponse); } catch (Exception e) { logger.error("查询订单分账数据 error", e); response = new RestApiResponse<>(e); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java index 39e6fdf3d..db407603a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java @@ -3,6 +3,7 @@ package com.jsowell.pile.service; import com.jsowell.adapay.dto.PaymentConfirmParam; import com.jsowell.adapay.dto.SplitData; import com.jsowell.adapay.response.PaymentConfirmResponse; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.dto.QueryOrderSplitDTO; import com.jsowell.pile.dto.SplitOrderDTO; @@ -71,7 +72,7 @@ public interface OrderSplitRecordService { */ List getSplitOrdersInfoList(SplitOrderDTO dto); - public List queryOrderSplitData(QueryOrderSplitDTO dto); + public PageResponse queryOrderSplitData(QueryOrderSplitDTO dto); /** * 根据汇付会员id查询时间段内订单分账记录 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 41ce09d6c..813639f7e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -1,12 +1,14 @@ package com.jsowell.pile.service.impl; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.jsowell.adapay.dto.PaymentConfirmParam; import com.jsowell.adapay.dto.SplitData; import com.jsowell.adapay.response.PaymentConfirmResponse; import com.jsowell.common.constant.Constants; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.util.DateUtils; @@ -260,7 +262,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { * @return */ @Override - public List queryOrderSplitData(QueryOrderSplitDTO dto) { + public PageResponse queryOrderSplitData(QueryOrderSplitDTO dto) { List resultList = new ArrayList<>(); // 设置分页参数 @@ -269,8 +271,10 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { PageHelper.startPage(pageNo, pageSize); List orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(dto); + PageInfo pageInfo = new PageInfo<>(orderSplitRecordVOS); + // 根据 orderCode 分组 - Map> collect = orderSplitRecordVOS.stream() + Map> collect = pageInfo.getList().stream() .collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode)); for (Map.Entry> entry : collect.entrySet()) { @@ -279,8 +283,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { SplitRecordInfoVO vo = SplitRecordInfoVO.builder() .orderCode(orderCode) - .orderAmount(orderSplitRecordVOS.get(0).getOrderAmount()) - .settleAmount(String.valueOf(orderSplitRecordVOS.get(0).getSettleAmount())) + .orderAmount(pageInfo.getList().get(0).getOrderAmount()) + .settleAmount(String.valueOf(pageInfo.getList().get(0).getSettleAmount())) .build(); @@ -304,7 +308,15 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { resultList.add(vo); } - return resultList; + // 组装分页返回参数 + PageResponse pageResponse = PageResponse.builder() + .pageSize(pageSize) + .pageNum(pageNo) + .list(pageInfo.getList()) + .pages(pageInfo.getPages()) + .total(pageInfo.getTotal()) + .build(); + return pageResponse; } @Override