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