Merge branch 'login' of http://git.quantgroup.cn/QG/customer-service into login

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

@@ -496,9 +496,7 @@ public class UserServiceImpl implements IUserService {
         log.info("{} 订单参数查询用户信息 orderQueryParam={}", logPre, orderQueryParam);
         //渠道订单号需要有渠道号
         boolean channelParam = StringUtils.isNotBlank(orderQueryParam.getChannelOrderNo()) && Objects.nonNull(orderQueryParam.getChannelId());
-        if (Objects.nonNull(orderQueryParam.getLoanId()) ||
-                channelParam ||
-                StringUtils.isNotBlank(orderQueryParam.getApplyOrderNo())) {
+        if(channelParam){
             //通过ka获得userId然后通过userId查询
             JsonResult<LoanOrderMapping> orderMapping = kaService.findOrderMapping(orderQueryParam);
             if (!orderMapping.isSuccess()) {
@@ -512,6 +510,27 @@ public class UserServiceImpl implements IUserService {
             UserSysResult<XUserDetail> userDetailByUserId = userSdk.getService().findUserDetailByUserId(qgUserId);
             return getUserBasicInfoResult(userDetailByUserId);
         }
+        if (Objects.nonNull(orderQueryParam.getLoanId()) ||
+                StringUtils.isNotBlank(orderQueryParam.getApplyOrderNo())) {
+            Long loanId = orderQueryParam.getLoanId();
+            String applyOrderNo = orderQueryParam.getApplyOrderNo();
+            ApplyOrderQuery applyOrderQuery = new ApplyOrderQuery();
+            applyOrderQuery.setOrderNo(applyOrderNo);
+            applyOrderQuery.setLoanId(loanId);
+            //申请订单查询
+            JsonResult<List<ApplyOrder>> applyOrders = xyqbService.findApplyOrders(applyOrderQuery);
+            if(!applyOrders.isSuccess()){
+                log.error("{} 获得申请订单失败 applyOrderQuery={} result={}",logPre,applyOrderQuery,applyOrders);
+                return JsonResult.buildErrorStateResult("查询失败", null);
+            }
+            if(CollectionUtils.isEmpty(applyOrders.getData())){
+                return JsonResult.buildErrorStateResult("无数据,请用其他参数查询", null);
+            }
+
+            Long userId = applyOrders.getData().get(0).getUserId();
+            UserSysResult<XUserDetail> userDetailByUserId = userSdk.getService().findUserDetailByUserId(userId);
+            return getUserBasicInfoResult(userDetailByUserId);
+        }
 
         //走到这里申请订单号和借款订单号都为空， 渠道订单号和渠道号至少一个为空
         if (StringUtils.isNotBlank(orderQueryParam.getChannelOrderNo()) || Objects.nonNull(orderQueryParam.getChannelId())) {