无效订单补充申请订单号

src/main/java/cn/quantgroup/customer/model/order/ApplyOrder.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class ApplyOrder {
     private List<ActiveApplyOrder> activeOrders = new ArrayList<>();
 
-    private List<ActiveApplyOrder> invalidOrders = new ArrayList<>();
+    private List<InvalidApplyOrder> invalidOrders = new ArrayList<>();
 
     /**
      * 近期状况

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -8,6 +8,7 @@ import cn.quantgroup.customer.model.Tuple;
 import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
 import cn.quantgroup.customer.model.order.ActiveApplyOrder;
 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.UserCombination;
 import cn.quantgroup.customer.repo.UserRepo;
@@ -439,6 +440,7 @@ public class UserServiceImpl implements IUserService {
         }
 
         List<ActiveApplyOrder> activeApplyOrders = applyOrder.getData().getActiveOrders();
+        List<InvalidApplyOrder> invalidApplyOrders = applyOrder.getData().getInvalidOrders();
         if (CollectionUtils.isNotEmpty(activeApplyOrders)) {
             //通过申请订单号获得渠道订单号
             List<String> applyOrderNoList = activeApplyOrders.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList());
@@ -449,6 +451,17 @@ public class UserServiceImpl implements IUserService {
             Map<String, String> data = mapJsonResult.getData();
             activeApplyOrders.forEach(e -> e.setChannelNo(data.get(e.getApplyOrderNo())));
         }
+
+        if (CollectionUtils.isNotEmpty(invalidApplyOrders)) {
+            //通过申请订单号获得渠道订单号
+            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();
         UserCombination userCombination = new UserCombination();
         userCombination.setUserInfo(userBasicInfo);