修改传入参数

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

@@ -789,6 +789,38 @@ public class UserServiceImpl implements IUserService {
     public JsonResult<UserBasicInfo> findUserInfoByUserParam(UserQueryParam userQueryParam) {
         final String LOG_PRE = "UserServiceImpl.findUserInfoByUserParam";
         log.info("{} 查询用户信息 UserQueryParam={}", LOG_PRE, userQueryParam);
+        //通过userId查询
+        UserSysResult<XUser> userByUserId = null;
+        UserSysResult<XUserDetail> userDetailByUserId= null;
+        if (Objects.nonNull(userQueryParam.getUserId())) {
+            log.info("{} 通过userId查询 userId={}", LOG_PRE, userQueryParam.getUserId());
+            userByUserId = userSdk.getService().findUserByUserId(userQueryParam.getUserId());
+            userDetailByUserId = userSdk.getService().findUserDetailByUserId(userQueryParam.getUserId());
+
+        }
+        UserSysResult<XUser> userByPhoneNo  = null;
+        UserSysResult<XUserDetail> userDetailByPhone  = null;
+        if (StringUtils.isNotBlank(userQueryParam.getPhoneNo())) {
+            log.info("{} 通过phoneNo查询 phoneNo={}", LOG_PRE, userQueryParam.getPhoneNo());
+            userByPhoneNo = userSdk.getService().findUserByPhoneNo(userQueryParam.getPhoneNo());
+            userDetailByPhone = userSdk.getService().findUserDetailByPhone(userQueryParam.getPhoneNo());
+            //根据传入的身份证和查询出的用户信息中身份证进行比较,如果不一致返回查询失败
+            if (StringUtils.isNotEmpty(userQueryParam.getIdNo()) && userDetailByPhone.getData() != null) {
+                XUserDetail xUserDetail = userDetailByPhone.getData();
+                String idNo = xUserDetail.getIdNo();
+                if (StringUtils.isNotEmpty(idNo)) {
+                    idNo = idNo.trim().toUpperCase();
+                }
+                String paramIdNo = userQueryParam.getIdNo().trim().toUpperCase();
+                if (!paramIdNo.equals(idNo)) {
+                    return JsonResult.buildErrorStateResult("无有效查询参数", null);
+                }
+            }
+
+        }
+        if(userByUserId ==null && userDetailByUserId == null &&  userByPhoneNo == null && userDetailByPhone == null){
+            return JsonResult.buildErrorStateResult("未查询到对应的用户", null);
+        }
         //调用kdsp接口获取会员权益相关信息
         String url= kdspOperationUrl +"/api/kdsp/op/userBenefits/user-benefits-point/getUserBenefit";
         //String url= "http://192.168.28.55:8033/api/kdsp/op/userBenefits/user-benefits-point/getUserBenefit";
@@ -800,41 +832,21 @@ public class UserServiceImpl implements IUserService {
             if (Objects.nonNull(userQueryParam.getUserId())) {
                 param.put("userId", String.valueOf(userQueryParam.getUserId()));
             }
-            if (Objects.nonNull(userQueryParam.getPhoneNo())) {
-                param.put("phoneNo", String.valueOf(userQueryParam.getUserId()));
+            if (StringUtils.isNotBlank(userQueryParam.getPhoneNo())) {
+                param.put("userId", String.valueOf(userByPhoneNo.getData().getId()));
             }
             result = httpService.post(url, header,param);
         } catch (Exception e) {
             log.error("[userServiceImpl][findUserInfoByUserParam] 网络通讯异常,userId:{},ex:{}",ExceptionUtils.getStackTrace(e));
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
-        //通过userId查询
         if (Objects.nonNull(userQueryParam.getUserId())) {
-            log.info("{} 通过userId查询 userId={}", LOG_PRE, userQueryParam.getUserId());
-            UserSysResult<XUser> userByUserId = userSdk.getService().findUserByUserId(userQueryParam.getUserId());
-            UserSysResult<XUserDetail> userDetailByUserId = userSdk.getService().findUserDetailByUserId(userQueryParam.getUserId());
             return getUserBasicInfoResultAndUserBenefits(userByUserId, userDetailByUserId,result);
         }
-
         if (StringUtils.isNotBlank(userQueryParam.getPhoneNo())) {
-            log.info("{} 通过phoneNo查询 phoneNo={}", LOG_PRE, userQueryParam.getPhoneNo());
-            UserSysResult<XUser> userByPhoneNo = userSdk.getService().findUserByPhoneNo(userQueryParam.getPhoneNo());
-            UserSysResult<XUserDetail> userDetailByPhone = userSdk.getService().findUserDetailByPhone(userQueryParam.getPhoneNo());
-            //根据传入的身份证和查询出的用户信息中身份证进行比较,如果不一致返回查询失败
-            if (StringUtils.isNotEmpty(userQueryParam.getIdNo()) && userDetailByPhone.getData() != null) {
-                XUserDetail xUserDetail = userDetailByPhone.getData();
-                String idNo = xUserDetail.getIdNo();
-                if (StringUtils.isNotEmpty(idNo)) {
-                    idNo = idNo.trim().toUpperCase();
-                }
-
-                String paramIdNo = userQueryParam.getIdNo().trim().toUpperCase();
-                if (!paramIdNo.equals(idNo)) {
-                    return JsonResult.buildErrorStateResult("无有效查询参数", null);
-                }
-            }
             return getUserBasicInfoResultAndUserBenefits(userByPhoneNo, userDetailByPhone,result);
         }
+
         return null;
     }