Commit 3f91901e authored by 王向伟's avatar 王向伟

用户信息查询修改逻辑

parent 9e29dde6
...@@ -432,12 +432,7 @@ public class UserServiceImpl implements IUserService { ...@@ -432,12 +432,7 @@ public class UserServiceImpl implements IUserService {
} }
List<ApplyOrder> applyOrderList = applyOrders.getData(); List<ApplyOrder> applyOrderList = applyOrders.getData();
if (CollectionUtils.isEmpty(applyOrderList)) { if (CollectionUtils.isNotEmpty(applyOrderList)) {
log.info("{} 不存在对应的申请订单 param={}", logPre, userCombinationParam);
return JsonResult.buildSuccessResult("申请订单不存在", applyOrderList);
}
UserBasicInfo userBasicInfo = userInfo.getData();
//通过申请订单号获得渠道订单号 //通过申请订单号获得渠道订单号
List<String> applyOrderNoList = applyOrderList.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList()); List<String> applyOrderNoList = applyOrderList.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList());
JsonResult<Map<String, String>> mapJsonResult = kaService.findMap(applyOrderNoList); JsonResult<Map<String, String>> mapJsonResult = kaService.findMap(applyOrderNoList);
...@@ -446,7 +441,11 @@ public class UserServiceImpl implements IUserService { ...@@ -446,7 +441,11 @@ public class UserServiceImpl implements IUserService {
} }
Map<String, String> data = mapJsonResult.getData(); Map<String, String> data = mapJsonResult.getData();
applyOrderList.forEach(e -> e.setChannelOrderNo(data.get(e.getApplyOrderNo()))); applyOrderList.forEach(e -> e.setChannelOrderNo(data.get(e.getApplyOrderNo())));
}
UserBasicInfo userBasicInfo = userInfo.getData();
UserCombination userCombination = new UserCombination(); UserCombination userCombination = new UserCombination();
userCombination.setUserInfo(userBasicInfo); userCombination.setUserInfo(userBasicInfo);
userCombination.setApplyOrderList(applyOrderList); userCombination.setApplyOrderList(applyOrderList);
......
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