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

update

Browse Source
This commit is contained in:
Lemon
2025-04-12 16:07:50 +08:00
parent 0ec76dd08b
commit e7cba4eefd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,6 +268,10 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
@Override @Override
public PageResponse queryOrderSplitData(QueryOrderSplitDTO dto) { public PageResponse queryOrderSplitData(QueryOrderSplitDTO dto) {
List<SplitRecordInfoVO> resultList = new ArrayList<>(); List<SplitRecordInfoVO> resultList = new ArrayList<>();
// 获取当前登录用户信息
LoginUser loginUser = SecurityUtils.getLoginUser();
// 通过 depId 查询运营商记录表，如果查出来，则为运营商
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(String.valueOf(loginUser.getDeptId()));
// 设置分页参数 // 设置分页参数
int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo(); int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo();
@@ -278,17 +282,13 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
List<String> orderCodes = orderSplitRecordMapper.queryOrderCodesByParams(dto); List<String> orderCodes = orderSplitRecordMapper.queryOrderCodesByParams(dto);
PageInfo<String> pageInfo = new PageInfo<>(orderCodes); PageInfo<String> pageInfo = new PageInfo<>(orderCodes);
// 查询符合条件的分账记录
List<OrderSplitRecordVO> orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(pageInfo.getList()); List<OrderSplitRecordVO> orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(pageInfo.getList());
// 根据 orderCode 分组 // 根据 orderCode 分组
Map<String, List<OrderSplitRecordVO>> collect = orderSplitRecordVOS.stream() Map<String, List<OrderSplitRecordVO>> collect = orderSplitRecordVOS.stream()
.collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode)); .collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode));
// 获取当前登录用户信息
LoginUser loginUser = SecurityUtils.getLoginUser();
// 通过 depId 查询运营商记录表，如果查出来，则为运营商
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(String.valueOf(loginUser.getDeptId()));
for (Map.Entry<String, List<OrderSplitRecordVO>> entry : collect.entrySet()) { for (Map.Entry<String, List<OrderSplitRecordVO>> entry : collect.entrySet()) {
String orderCode = entry.getKey(); String orderCode = entry.getKey();
List<OrderSplitRecordVO> splitRecordVOList = entry.getValue(); List<OrderSplitRecordVO> splitRecordVOList = entry.getValue();
@@ -321,7 +321,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
for (int i = 0; i < orderSplitList.size(); i++) { for (int i = 0; i < orderSplitList.size(); i++) {
SplitRecordInfoVO.OrderSplit orderSplit = orderSplitList.get(i); SplitRecordInfoVO.OrderSplit orderSplit = orderSplitList.get(i);
if (StringUtils.equals(String.valueOf(pileMerchantInfo.getId()), orderSplit.getMerchantId())) { if (StringUtils.equals(String.valueOf(pileMerchantInfo.getId()), orderSplit.getMerchantId())) {
// 实则是将符合条件的记录与第一条记录进行位置互换 // 实则是调用swap()方法，将符合条件的记录与第一条记录进行位置互换
Collections.swap(orderSplitList, i, 0); Collections.swap(orderSplitList, i, 0);
} }
} }