Commit 9338874a authored by 王向伟's avatar 王向伟

补充申请订单号

parent cf93ffec
...@@ -439,7 +439,17 @@ public class UserServiceImpl implements IUserService { ...@@ -439,7 +439,17 @@ public class UserServiceImpl implements IUserService {
return applyOrder; return applyOrder;
} }
List<ActiveApplyOrder> activeApplyOrders = applyOrder.getData().getActiveOrders();
if (CollectionUtils.isNotEmpty(activeApplyOrders)) {
//通过申请订单号获得渠道订单号
List<String> applyOrderNoList = activeApplyOrders.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList());
JsonResult<Map<String, String>> mapJsonResult = kaService.findChannelOrderNosByApplyOrderNos(applyOrderNoList);
if (!mapJsonResult.isSuccess()) {
return mapJsonResult;
}
Map<String, String> data = mapJsonResult.getData();
activeApplyOrders.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);
...@@ -471,6 +481,7 @@ public class UserServiceImpl implements IUserService { ...@@ -471,6 +481,7 @@ public class UserServiceImpl implements IUserService {
applyOrderQuery.setOrderNo(applyNo); applyOrderQuery.setOrderNo(applyNo);
//申请订单查询 //申请订单查询
JsonResult<ApplyOrder> applyOrders = xyqbService.findApplyOrders(applyOrderQuery); JsonResult<ApplyOrder> applyOrders = xyqbService.findApplyOrders(applyOrderQuery);
return applyOrders; return applyOrders;
} }
......
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