Commit 1a0cb91c authored by fengjie's avatar fengjie

修改逻辑

parent 51be9f9b
...@@ -14,7 +14,7 @@ import java.util.List; ...@@ -14,7 +14,7 @@ import java.util.List;
public class ApplyOrder { public class ApplyOrder {
private List<ActiveApplyOrder> activeOrders = new ArrayList<>(); private List<ActiveApplyOrder> activeOrders = new ArrayList<>();
private List<InvalidApplyOrder> invalidOrders = new ArrayList<>(); private List<ActiveApplyOrder> invalidOrders = new ArrayList<>();
/** /**
* 近期状况 * 近期状况
......
...@@ -8,7 +8,6 @@ import cn.quantgroup.customer.model.Tuple; ...@@ -8,7 +8,6 @@ import cn.quantgroup.customer.model.Tuple;
import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping; import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
import cn.quantgroup.customer.model.order.ActiveApplyOrder; import cn.quantgroup.customer.model.order.ActiveApplyOrder;
import cn.quantgroup.customer.model.order.ApplyOrder; import cn.quantgroup.customer.model.order.ApplyOrder;
import cn.quantgroup.customer.model.order.InvalidApplyOrder;
import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo; import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
import cn.quantgroup.customer.model.xyqbuser.UserCombination; import cn.quantgroup.customer.model.xyqbuser.UserCombination;
import cn.quantgroup.customer.repo.UserRepo; import cn.quantgroup.customer.repo.UserRepo;
...@@ -440,7 +439,7 @@ public class UserServiceImpl implements IUserService { ...@@ -440,7 +439,7 @@ public class UserServiceImpl implements IUserService {
} }
List<ActiveApplyOrder> activeApplyOrders = applyOrder.getData().getActiveOrders(); List<ActiveApplyOrder> activeApplyOrders = applyOrder.getData().getActiveOrders();
List<InvalidApplyOrder> invalidApplyOrders = applyOrder.getData().getInvalidOrders(); List<ActiveApplyOrder> invalidApplyOrders = applyOrder.getData().getInvalidOrders();
if (CollectionUtils.isNotEmpty(activeApplyOrders)) { if (CollectionUtils.isNotEmpty(activeApplyOrders)) {
//通过申请订单号获得渠道订单号 //通过申请订单号获得渠道订单号
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());
...@@ -454,13 +453,13 @@ public class UserServiceImpl implements IUserService { ...@@ -454,13 +453,13 @@ public class UserServiceImpl implements IUserService {
if (CollectionUtils.isNotEmpty(invalidApplyOrders)) { if (CollectionUtils.isNotEmpty(invalidApplyOrders)) {
//通过申请订单号获得渠道订单号 //通过申请订单号获得渠道订单号
List<String> applyOrderNoList = activeApplyOrders.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; return mapJsonResult;
} }
Map<String, String> data = mapJsonResult.getData(); Map<String, String> data = mapJsonResult.getData();
activeApplyOrders.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();
......
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