autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 11:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 添加分页参数

Browse Source
This commit is contained in:
Lemon
2025-04-11 15:56:43 +08:00
parent 4156df68c0
commit c9b8938cbb
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
View File

@@ -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<SplitOrdersInfoVO> getSplitOrdersInfoList(SplitOrderDTO dto);
public List<SplitRecordInfoVO> queryOrderSplitData(QueryOrderSplitDTO dto);
public PageResponse queryOrderSplitData(QueryOrderSplitDTO dto);
/**
* 根据汇付会员id查询时间段内订单分账记录

22
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -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<SplitRecordInfoVO> queryOrderSplitData(QueryOrderSplitDTO dto) {
public PageResponse queryOrderSplitData(QueryOrderSplitDTO dto) {
List<SplitRecordInfoVO> resultList = new ArrayList<>();
// 设置分页参数
@@ -269,8 +271,10 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
PageHelper.startPage(pageNo, pageSize);
List<OrderSplitRecordVO> orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(dto);
PageInfo<OrderSplitRecordVO> pageInfo = new PageInfo<>(orderSplitRecordVOS);
// 根据 orderCode 分组
Map<String, List<OrderSplitRecordVO>> collect = orderSplitRecordVOS.stream()
Map<String, List<OrderSplitRecordVO>> collect = pageInfo.getList().stream()
.collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode));
for (Map.Entry<String, List<OrderSplitRecordVO>> 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