订单 未授信等情况

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

@@ -111,21 +111,28 @@ public class OrderService {
             orderVo.setChannelId(it.getRegisteredFrom());
             orderVo.setChannelOrderNumber(it.getChannelOrderNo());
             orderVo.setCreatedAt(it.getCreatedAt().getTime());
-
-            OrderApprove orderApprove = orderApproveRepository.findByCreditNumber(it.getApplyNo());
-
-            ServiceResult<XyqbCurrentOrderStatusServiceResultModel> xyqbCenterServiceXyqbOrderStatus = xyqbCenterService.getXyqbOrderStatus(it.getApplyNo(), it.getLoanId());
-            log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus));
-            if (xyqbCenterServiceXyqbOrderStatus.isSuccess()) {
-                QueryXyqbOrderStatus currentStatus = xyqbCenterServiceXyqbOrderStatus.getData().getCurrentStatus();
-
-                Tuple<String, List<OrderVo.OptButton>> currentStatusAndButtons = OrderUtil.getCurrentStatusAndButtons(currentStatus, orderApprove);
-                orderVo.setStatus(currentStatusAndButtons.getKey());
-                orderVo.setOpt(currentStatusAndButtons.getValue());
-                orderVo.setMessage("");
+            if (StringUtils.isNotEmpty(it.getApplyNo())) {
+
+                OrderApprove orderApprove = orderApproveRepository.findByCreditNumber(it.getApplyNo());
+
+                ServiceResult<XyqbCurrentOrderStatusServiceResultModel> xyqbCenterServiceXyqbOrderStatus = xyqbCenterService.getXyqbOrderStatus(it.getApplyNo(), it.getLoanId());
+                log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus));
+                if (xyqbCenterServiceXyqbOrderStatus.isSuccess()) {
+                    QueryXyqbOrderStatus currentStatus = xyqbCenterServiceXyqbOrderStatus.getData().getCurrentStatus();
+
+                    Tuple<String, List<OrderVo.OptButton>> currentStatusAndButtons = OrderUtil.getCurrentStatusAndButtons(currentStatus, orderApprove);
+                    orderVo.setStatus(currentStatusAndButtons.getKey());
+                    orderVo.setOpt(currentStatusAndButtons.getValue());
+                    orderVo.setMessage("");
+                } else {
+                    orderVo.setMessage("订单查询错误");
+                }
             } else {
-                orderVo.setMessage("订单查询错误");
+                orderVo.setStatus("授信中");
+                orderVo.setOpt(new ArrayList<>());
+                orderVo.setMessage("");
             }
+
             return orderVo;
         });
     }