mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-27 22:45:05 +08:00
新增 后管查询订单分账数据接口
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.jsowell.pile.service.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.jsowell.adapay.dto.PaymentConfirmParam;
|
||||
@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
@@ -258,12 +260,48 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<OrderSplitRecordVO> queryOrderSplitData(QueryOrderSplitDTO dto) {
|
||||
public List<SplitRecordInfoVO> queryOrderSplitData(QueryOrderSplitDTO dto) {
|
||||
List<SplitRecordInfoVO> resultList = new ArrayList<>();
|
||||
|
||||
// 设置分页参数
|
||||
int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo();
|
||||
int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
|
||||
|
||||
PageHelper.startPage(pageNo, pageSize);
|
||||
List<OrderSplitRecordVO> orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(dto);
|
||||
// 根据 orderCode 分组
|
||||
Map<String, List<OrderSplitRecordVO>> collect = orderSplitRecordVOS.stream()
|
||||
.collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode));
|
||||
return null;
|
||||
|
||||
for (Map.Entry<String, List<OrderSplitRecordVO>> entry : collect.entrySet()) {
|
||||
String orderCode = entry.getKey();
|
||||
List<OrderSplitRecordVO> splitRecordVOList = entry.getValue();
|
||||
|
||||
SplitRecordInfoVO vo = SplitRecordInfoVO.builder()
|
||||
.orderCode(orderCode)
|
||||
.orderAmount(orderSplitRecordVOS.get(0).getOrderAmount())
|
||||
.settleAmount(String.valueOf(orderSplitRecordVOS.get(0).getSettleAmount()))
|
||||
|
||||
.build();
|
||||
|
||||
List<SplitRecordInfoVO.OrderSplit> orderSplitList = new ArrayList<>();
|
||||
|
||||
for (OrderSplitRecordVO orderSplitRecordVO : splitRecordVOList) {
|
||||
SplitRecordInfoVO.OrderSplit orderSplit = SplitRecordInfoVO.OrderSplit.builder()
|
||||
.adapayMemberId(orderSplitRecordVO.getAdapayMemberId())
|
||||
.electricitySplitRatio(String.valueOf(orderSplitRecordVO.getElectricitySplitRatio()))
|
||||
.electricitySplitAmount(String.valueOf(orderSplitRecordVO.getElectricitySplitAmount()))
|
||||
.serviceSplitRatio(String.valueOf(orderSplitRecordVO.getServiceSplitRatio()))
|
||||
.serviceSplitAmount(String.valueOf(orderSplitRecordVO.getServiceSplitAmount()))
|
||||
|
||||
.build();
|
||||
orderSplitList.add(orderSplit);
|
||||
}
|
||||
vo.setOrderSplitList(orderSplitList);
|
||||
|
||||
resultList.add(vo);
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user