修改用户判断

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

@@ -287,27 +287,21 @@ public class OrderServiceImpl implements IOrderService {
         UserQueryParam userQueryParam = new UserQueryParam();
         userQueryParam.setPhoneNo(orderQuery.getPhoneNo());
         userQueryParam.setUserId(orderQuery.getUserId());
+        UserBasicInfo userBasicInfo;
         JsonResult<UserBasicInfo> userInfoByUserParam = this.userService.findUserInfo(userQueryParam);
-        if (Objects.isNull(userInfoByUserParam) || !userInfoByUserParam.isSuccess()) {
+        if (Objects.isNull(userInfoByUserParam) || !userInfoByUserParam.isSuccess() || Objects.isNull(userBasicInfo = userInfoByUserParam.getData())) {
             log.error("{} 查询用户失败 result={}", logPre, userInfoByUserParam);
             return JsonResult.buildErrorStateResult("请求参数有误,查询不到用户信息", null);
         }
 
-        UserBasicInfo userBasicInfo = userInfoByUserParam.getData();
-        if (StringUtils.isNotBlank(orderQuery.getPhoneNo())) {
-            if (!orderQuery.getPhoneNo().equals(userBasicInfo.getPhoneNo())) {
+        // 查询用户的优先级  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);
                 return JsonResult.buildErrorStateResult("请求参数有误,查询不到用户信息", null);
             }
         }
 
-        if (Objects.nonNull(orderQuery.getUserId())) {
-            if (!orderQuery.getUserId().equals(userBasicInfo.getUserId())) {
-                log.error("{} 用户输入userId和查询结果不一致 orderQuery.getUserId()={}, userBasicInfo={}", logPre, orderQuery.getUserId(), userBasicInfo);
-                return JsonResult.buildErrorStateResult("请求参数有误,查询不到用户信息", null);
-            }
-        }
-
         return userInfoByUserParam;
 
     }