修改查询逻辑

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

@@ -157,22 +157,38 @@ public class OrderServiceImpl implements IOrderService {
         }
 
         // 获取用户userId
+        boolean isExistUserParam = existUserParam(orderQuery);
+        if (isExistUserParam) {
             JsonResult<UserBasicInfo> userInfo = this.queryAndCheckUserInfo(orderQuery);
-        if (!userInfo.isSuccess()) {
+            if (Objects.isNull(userInfo) || !userInfo.isSuccess()) {
                 return JsonResult.buildErrorStateResult("查询不到用户信息", null);
             }
+            UserBasicInfo userBasicInfo = userInfo.getData();
+            if (Objects.nonNull(userBasicInfo)) {
+                orderQuery.setPhoneNo(userBasicInfo.getPhoneNo());
+                orderQuery.setUserId(userBasicInfo.getUserId());
+            }
+
+        }
+
 
         // 获取订单loanId
+        boolean isExistOrderParam = existOrderParam(orderQuery);
+        if (isExistOrderParam) {
             JsonResult<LoanOrderMapping> loanOrder = this.queryAndCheckOrderInfo(orderQuery);
             if (Objects.isNull(loanOrder) || !loanOrder.isSuccess()) {
                 return JsonResult.buildErrorStateResult("查询不到订单信息", null);
             }
 
-        // 请求xyqb
-        UserBasicInfo userBasicInfo = userInfo.getData();
             LoanOrderMapping loanOrderMapping = loanOrder.getData();
-        orderQuery.setUserId(userBasicInfo.getUserId());
+            if (Objects.nonNull(loanOrderMapping)) {
                 orderQuery.setLoanId(loanOrderMapping.getLoanId());
+                orderQuery.setChannelId(loanOrderMapping.getRegisteredFrom());
+                orderQuery.setChannelOrderNo(loanOrderMapping.getChannelOrderNo());
+            }
+        }
+
+        // 请求xyqb
         JsonResult<List<EarlySettleUpOrder>> xyqbOrderResult = this.xyqbService.findLoanOrder4EarlySettleUp(orderQuery);
         if (Objects.isNull(xyqbOrderResult) || !xyqbOrderResult.isSuccess()) {
             return JsonResult.buildErrorStateResult("查询订单信息出错", null);
@@ -183,8 +199,8 @@ public class OrderServiceImpl implements IOrderService {
          */
         List<EarlySettleUpOrder> settleUpOrders = xyqbOrderResult.getData();
         settleUpOrders.forEach(e -> {
-            e.setChannelOrderNo(loanOrderMapping.getChannelOrderNo());
-            e.setPhoneNo(userBasicInfo.getPhoneNo());
+            e.setChannelOrderNo(orderQuery.getChannelOrderNo());
+            e.setPhoneNo(orderQuery.getPhoneNo());
             e.setShowOplog(dealWithShowOplog(e.getLoanId()));
         });
 
@@ -211,12 +227,6 @@ public class OrderServiceImpl implements IOrderService {
     private JsonResult<LoanOrderMapping> queryAndCheckOrderInfo(EarlySettleUpOrderQueryParam orderQuery) {
         String logPre = "OrderServiceImpl.queryAndCheckOrderInfo";
 
-        boolean isExistOrderParam = existOrderParam(orderQuery);
-        if (!isExistOrderParam) {
-            log.error("{} 查询订单信息，订单相关参数为空 orderQuery={}", logPre, orderQuery);
-            return JsonResult.buildErrorStateResult("查询订单信息,订单参数为空", null);
-        }
-
         OrderQueryParam orderQueryParam = new OrderQueryParam();
         orderQueryParam.setLoanId(orderQuery.getLoanId());
         orderQueryParam.setChannelId(orderQuery.getChannelId());
@@ -240,13 +250,6 @@ public class OrderServiceImpl implements IOrderService {
     private JsonResult<UserBasicInfo> queryAndCheckUserInfo(EarlySettleUpOrderQueryParam orderQuery) {
         String logPre = "OrderServiceImpl.queryAndCheckUserInfo";
 
-        // 说明业务参数和用户参数都为空
-        boolean isExistUserParam = existUserParam(orderQuery);
-        if (!isExistUserParam) {
-            log.error("{} 查询用户信息请求参数为空 orderQuery={}", logPre, orderQuery);
-            return JsonResult.buildErrorStateResult("查询用户信息,用户参数为空", null);
-        }
-
         //用户参数查询
         UserQueryParam userQueryParam = new UserQueryParam();
         userQueryParam.setPhoneNo(orderQuery.getPhoneNo());

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

@@ -369,8 +369,15 @@ public class XyqbServiceImpl implements IXyqbService {
             log.error("{} 请求参数都为空，不允许查询 orderQuery={}", logPre, orderQuery);
             return JsonResult.buildErrorStateResult("查询参数都为空,不允许查询", null);
         }
+
+        if(Objects.nonNull(orderQuery.getLoanId())){
             queryParam.put("loan_id", String.valueOf(orderQuery.getLoanId()));
+        }
+
+        if(Objects.nonNull(orderQuery.getUserId())){
             queryParam.put("user_id", String.valueOf(orderQuery.getUserId()));
+        }
+
         if(StringUtils.isNotBlank(orderQuery.getFundOrderNo())){
             queryParam.put("fund_order_no", orderQuery.getFundOrderNo());
         }