ding

src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.api.order.controller;
 
 import cn.quantgroup.cashloanflowboss.api.order.model.ApproveVo;
 import cn.quantgroup.cashloanflowboss.api.order.model.LendingFormModel;
+import cn.quantgroup.cashloanflowboss.api.order.service.MoOrderServiceImpl;
 import cn.quantgroup.cashloanflowboss.api.order.service.OrderService;
 import cn.quantgroup.cashloanflowboss.component.route.ServiceRoute;
 import cn.quantgroup.cashloanflowboss.component.security.annotiation.Security;
@@ -54,7 +55,7 @@ public class OrderController {
         if (pageNumber == null || pageSize == null) {
             return Result.buildFail("page信息不对");
         }
-        OrderService orderService = serviceRoute.routeOrderService(channelId,channelOrderNumber,loanId);
+        OrderService orderService = Application.getBean(MoOrderServiceImpl.class);
         return Result.buildSuccess(orderService.orderList(channelId, channelOrderNumber, applyNo, loanId, pageNumber, pageSize));
     }
 

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/MoOrderServiceImpl.java

@@ -10,6 +10,7 @@ import cn.quantgroup.cashloanflowboss.api.order.entity.OrderApprove;
 import cn.quantgroup.cashloanflowboss.api.order.model.*;
 import cn.quantgroup.cashloanflowboss.api.order.repository.OrderApproveRepository;
 import cn.quantgroup.cashloanflowboss.api.order.util.OrderUtil;
+import cn.quantgroup.cashloanflowboss.component.route.ServiceRoute;
 import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.core.annotation.opt.OperationAnno;
 import cn.quantgroup.cashloanflowboss.core.base.ServiceResult;
@@ -100,6 +101,9 @@ public class MoOrderServiceImpl implements OrderService{
     @Autowired
     private CancelPreLoanRepository cancelPreLoanRepository;
 
+    @Autowired
+    private ServiceRoute serviceRoute;
+
     @Autowired
     private OPCenter opCenter;
 
@@ -152,8 +156,21 @@ public class MoOrderServiceImpl implements OrderService{
             }
             orderVo.setCreatedAt(it.getCreatedAt());
             if (StringUtils.isNotEmpty(it.getApplyNo())) {
-
-                JsonResult<XyqbCurrentOrderStatusServiceResultModel> xyqbCenterServiceXyqbOrderStatus = koalaCenterService.getOrderStatus(it.getApplyNo(), it.getLoanId());
+                OrderService orderService = serviceRoute.routeOrderService(it.getRegisteredFrom(), null, null);
+                JsonResult<XyqbCurrentOrderStatusServiceResultModel> xyqbCenterServiceXyqbOrderStatus;
+                if(orderService instanceof MoOrderServiceImpl){
+                   xyqbCenterServiceXyqbOrderStatus = koalaCenterService.getOrderStatus(it.getApplyNo(), it.getLoanId());
+                }else {
+                    //
+                    ServiceResult<XyqbCurrentOrderStatusServiceResultModel>orderStatusResult = xyqbCenterService.getXyqbOrderStatus(it.getApplyNo(),it.getLoanId());
+                    if(Objects.nonNull(orderStatusResult) && orderStatusResult.isSuccess()){
+                        xyqbCenterServiceXyqbOrderStatus = JsonResult.buildSuccess("success",orderStatusResult.getData());
+                        xyqbCenterServiceXyqbOrderStatus.setSuccess(true);
+                    }else {
+                        xyqbCenterServiceXyqbOrderStatus = JsonResult.buildError("success",null);
+                        xyqbCenterServiceXyqbOrderStatus.setSuccess(false);
+                    }
+                }
                 log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus));
                 if (xyqbCenterServiceXyqbOrderStatus.getSuccess()) {
                     QueryXyqbOrderStatus currentStatus = xyqbCenterServiceXyqbOrderStatus.getData().getCurrentStatus();