调整用户userId和手机号查询前后顺序

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

@@ -301,25 +301,52 @@ public class OrderServiceImpl implements IOrderService {
 
         //用户参数查询
         UserQueryParam userQueryParam = new UserQueryParam();
+        UserBasicInfo userBasicInfo = null;
+        JsonResult<UserBasicInfo> userInfoByUserParam = null;
+        if (StringUtils.isNotBlank(orderQuery.getPhoneNo())) {
             userQueryParam.setPhoneNo(orderQuery.getPhoneNo());
-        userQueryParam.setUserId(orderQuery.getUserId());
-        UserBasicInfo userBasicInfo;
-        JsonResult<UserBasicInfo> userInfoByUserParam = this.userService.findUserInfo(userQueryParam);
+            userInfoByUserParam = this.userService.findUserInfo(userQueryParam);
             if (Objects.isNull(userInfoByUserParam) || !userInfoByUserParam.isSuccess() || Objects.isNull(userBasicInfo = userInfoByUserParam.getData())) {
-            log.error("{} 查询用户失败 result={}", logPre, userInfoByUserParam);
+                log.error("{} 查询用户失败 userQueryParam={} result={}", logPre, userQueryParam, userInfoByUserParam);
                 return JsonResult.buildErrorStateResult("请求参数有误,查询不到用户信息", null);
             }
+        }
 
-        // 查询用户的优先级  userId >>> phoneNo  >>> uuid
-        if(Objects.nonNull(orderQuery.getUserId())){
-            if(StringUtils.isNotBlank(orderQuery.getPhoneNo()) && !orderQuery.getPhoneNo().equals(userBasicInfo.getPhoneNo())){
-                log.error("{} 用户输入手机号和查询结果不一致 orderQuery.getPhoneNo()={}, userBasicInfo={}", logPre, orderQuery.getPhoneNo(), userBasicInfo);
+
+        if (Objects.isNull(orderQuery.getUserId())) {
+            // userId为空  手机号为空
+            if (Objects.isNull(userInfoByUserParam)) {
+                log.error("{} userId为空,手机号为空,无法查询用户信息 orderQuery={}", logPre, orderQuery);
                 return JsonResult.buildErrorStateResult("请求参数有误,查询不到用户信息", null);
+            } else {
+                // userId为空  手机号不为空，查询出数据，直接返回
+                log.info("{} userId为空  手机号不为空，查询出数据，直接返回 orderQuery={},userInfoByUserParam={}", logPre, orderQuery, userInfoByUserParam);
+                return userInfoByUserParam;
             }
+        } else {
+            // userId 存在，手机号为空 此时需要根据userId单独查询
+            if (Objects.isNull(userInfoByUserParam)) {
+                userQueryParam.setUserId(orderQuery.getUserId());
+                userInfoByUserParam = this.userService.findUserInfo(userQueryParam);
+                if (Objects.isNull(userInfoByUserParam) || !userInfoByUserParam.isSuccess() || Objects.isNull(userInfoByUserParam.getData())) {
+                    log.error("{} userId 存在，手机号为空 查询用户失败 result={}", logPre, userInfoByUserParam);
+                    return JsonResult.buildErrorStateResult("请求参数有误,查询不到用户信息", null);
+                } else {
+                    log.info("{} userId 存在，手机号为空，查询出数据，直接返回 userQueryParam={},userInfoByUserParam={}", logPre, userQueryParam, userInfoByUserParam);
+                    return userInfoByUserParam;
                 }
-
+            } else {
+                // userId存在，手机号也存在，查询出数据  用户输入等于查询返回
+                if (orderQuery.getUserId().equals(userBasicInfo.getUserId())) {
+                    log.info("{} userId 存在，手机号也存在，查询出数据，userId等于查询返回值，直接返回 orderQuery={},userInfoByUserParam={}", logPre, orderQuery, userInfoByUserParam);
                     return userInfoByUserParam;
-
+                } else {
+                    // userId存在，手机号也存在，查询出数据  用户输入!等于查询返回
+                    log.error("{} userId存在，手机号也存在，查询出数据  用户输入!等于查询返回 orderQuery={},userInfoByUserParam={}", logPre, orderQuery, userInfoByUserParam);
+                    return JsonResult.buildErrorStateResult("请求参数有误,查询不到用户信息", null);
+                }
+            }
+        }
     }
 
     /**