修改只传loanId的时候，不再查询ka

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

@@ -183,9 +183,11 @@ public class OrderServiceImpl implements IOrderService {
             }
 
             LoanOrderMapping loanOrderMapping = loanOrder.getData();
-            orderQuery.setLoanId(loanOrderMapping.getLoanId());
-            orderQuery.setChannelId(loanOrderMapping.getRegisteredFrom());
-            orderQuery.setChannelOrderNo(loanOrderMapping.getChannelOrderNo());
+            if(Objects.nonNull(loanOrderMapping)){
+                orderQuery.setLoanId(loanOrderMapping.getLoanId());
+                orderQuery.setChannelId(loanOrderMapping.getRegisteredFrom());
+                orderQuery.setChannelOrderNo(loanOrderMapping.getChannelOrderNo());
+            }
         }
 
         // 请求xyqb 为空或者不成功，直接返回
@@ -257,36 +259,30 @@ public class OrderServiceImpl implements IOrderService {
         String logPre = "OrderServiceImpl.queryAndCheckOrderInfo";
 
         OrderQueryParam orderQueryParam = new OrderQueryParam();
-        orderQueryParam.setLoanId(orderQuery.getLoanId());
-        orderQueryParam.setChannelId(orderQuery.getChannelId());
-        orderQueryParam.setChannelOrderNo(orderQuery.getChannelOrderNo());
-        JsonResult<LoanOrderMapping> orderMappingJsonResult = this.kaService.findOrderMapping(orderQueryParam);
-        if (Objects.isNull(orderMappingJsonResult) || !orderMappingJsonResult.isSuccess()) {
-            log.error("{} 查询订单失败 result={}", logPre, orderMappingJsonResult);
-            return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
-        }
-
-        LoanOrderMapping loanOrderMapping = orderMappingJsonResult.getData();
-        if (Objects.isNull(loanOrderMapping)) {
-            log.error("{} 查询订单信息，返回结果为空 result={}", logPre, orderMappingJsonResult);
-            return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
-        }
-        if (Objects.nonNull(orderQuery.getLoanId()) && !orderQuery.getLoanId().equals(loanOrderMapping.getLoanId())) {
-            log.error("{} 查询出订单信息与loanId不一致 loanId={},result={}", logPre, orderQuery.getLoanId(), orderMappingJsonResult);
-            return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
-        }
-
-        if (StringUtils.isNotBlank(orderQuery.getChannelOrderNo()) && !orderQuery.getChannelOrderNo().equals(loanOrderMapping.getChannelOrderNo())) {
-            log.error("{} 查询出订单信息与渠道订单号不一致 channelOrderNo={},result={}", logPre, orderQuery.getChannelOrderNo(), orderMappingJsonResult);
-            return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
-        }
+        if(Objects.nonNull(orderQuery.getChannelId()) && StringUtils.isNotBlank(orderQuery.getChannelOrderNo())){
+            orderQueryParam.setChannelId(orderQuery.getChannelId());
+            orderQueryParam.setChannelOrderNo(orderQuery.getChannelOrderNo());
+            JsonResult<LoanOrderMapping> orderMappingJsonResult = this.kaService.findOrderMapping(orderQueryParam);
+            if (Objects.isNull(orderMappingJsonResult) || !orderMappingJsonResult.isSuccess()) {
+                log.error("{} 查询订单失败 result={}", logPre, orderMappingJsonResult);
+                return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
+            }
 
-        if (Objects.nonNull(orderQuery.getChannelId()) && !orderQuery.getChannelId().equals(loanOrderMapping.getRegisteredFrom())) {
-            log.error("{} 查询出订单信息与渠道号不一致 channelId={},result={}", logPre, orderQuery.getChannelId(), orderMappingJsonResult);
-            return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
+            LoanOrderMapping loanOrderMapping = orderMappingJsonResult.getData();
+            if (Objects.isNull(loanOrderMapping)) {
+                log.error("{} 查询订单信息，返回结果为空 result={}", logPre, orderMappingJsonResult);
+                return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
+            }
+            if (Objects.nonNull(orderQuery.getLoanId()) && !orderQuery.getLoanId().equals(loanOrderMapping.getLoanId())) {
+                log.error("{} 查询出订单信息与loanId不一致 loanId={},result={}", logPre, orderQuery.getLoanId(), orderMappingJsonResult);
+                return JsonResult.buildErrorStateResult("请求参数有误,查询不到订单信息", null);
+            }
+            return orderMappingJsonResult;
+        }else{
+            log.info("{} 渠道号和渠道订单号输入有问题，直接返回 channelId={},channelOrderNo={}", logPre,orderQuery.getChannelId(), orderQuery.getChannelOrderNo());
+            return JsonResult.buildSuccessResult("",null);
         }
 
-        return orderMappingJsonResult;
     }