Commit 26b1cadc authored by fengjie's avatar fengjie

修改查询逻辑

parent 1a0cb91c
...@@ -444,23 +444,21 @@ public class UserServiceImpl implements IUserService { ...@@ -444,23 +444,21 @@ public class UserServiceImpl implements IUserService {
//通过申请订单号获得渠道订单号 //通过申请订单号获得渠道订单号
List<String> applyOrderNoList = activeApplyOrders.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList()); List<String> applyOrderNoList = activeApplyOrders.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList());
JsonResult<Map<String, String>> mapJsonResult = kaService.findChannelOrderNosByApplyOrderNos(applyOrderNoList); JsonResult<Map<String, String>> mapJsonResult = kaService.findChannelOrderNosByApplyOrderNos(applyOrderNoList);
if (!mapJsonResult.isSuccess()) { if (mapJsonResult.isSuccess()) {
return mapJsonResult;
}
Map<String, String> data = mapJsonResult.getData(); Map<String, String> data = mapJsonResult.getData();
activeApplyOrders.forEach(e -> e.setChannelNo(data.get(e.getApplyOrderNo()))); activeApplyOrders.forEach(e -> e.setChannelNo(data.get(e.getApplyOrderNo())));
} }
}
if (CollectionUtils.isNotEmpty(invalidApplyOrders)) { if (CollectionUtils.isNotEmpty(invalidApplyOrders)) {
//通过申请订单号获得渠道订单号 //通过申请订单号获得渠道订单号
List<String> applyOrderNoList = invalidApplyOrders.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList()); List<String> applyOrderNoList = invalidApplyOrders.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList());
JsonResult<Map<String, String>> mapJsonResult = kaService.findChannelOrderNosByApplyOrderNos(applyOrderNoList); JsonResult<Map<String, String>> mapJsonResult = kaService.findChannelOrderNosByApplyOrderNos(applyOrderNoList);
if (!mapJsonResult.isSuccess()) { if (mapJsonResult.isSuccess()) {
return mapJsonResult;
}
Map<String, String> data = mapJsonResult.getData(); Map<String, String> data = mapJsonResult.getData();
invalidApplyOrders.forEach(e -> e.setChannelNo(data.get(e.getApplyOrderNo()))); invalidApplyOrders.forEach(e -> e.setChannelNo(data.get(e.getApplyOrderNo())));
} }
}
UserBasicInfo userBasicInfo = userInfo.getData(); UserBasicInfo userBasicInfo = userInfo.getData();
UserCombination userCombination = new UserCombination(); UserCombination userCombination = new UserCombination();
userCombination.setUserInfo(userBasicInfo); userCombination.setUserInfo(userBasicInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment