Merge branch 'feature-tob-20230809' of git.quantgroup.cn:head_group/xyqb-user2...

Merge branch 'feature-tob-20230809' of git.quantgroup.cn:head_group/xyqb-user2 into feature-tob-20230809

src/main/java/cn/quantgroup/xyqb/controller/api/v2/UserInfoEntityApiV2Controller.java

@@ -48,7 +48,7 @@ public class UserInfoEntityApiV2Controller implements IBaseController {
     @Transactional
     public JsonResult<UserInfoEntity> token(@RequestBody UserInfoEntityReq req) {
 
-        if (UserInfoEntityReq.checkParam(req)) {
+        if (!UserInfoEntityReq.checkParam(req)) {
             return JsonResult.buildErrorStateResult(BizExceptionEnum.ERROR_PARAM.getMsg(), null);
         }
 

src/main/java/cn/quantgroup/xyqb/controller/req/v2/UserInfoEntityReq.java

@@ -15,42 +15,36 @@ import java.time.LocalDate;
 @Data
 public class UserInfoEntityReq {
 
-    //用户ID
-    private Long userId;
+  //用户ID
+  private Long userId;
 
 
-    //0 未知 1 女 2 男
-    private Gender gender;
+  //0 未知 1 女 2 男
+  private Gender gender;
 
-    private String email;
+  private String email;
 
-    private String qq;
+  private String qq;
 
-    //姓名预留字段，目前无场景使用
-    private String name;
+  //姓名预留字段，目前无场景使用
+  private String name;
 
-    //昵称
-    private String nickName;
+  //昵称
+  private String nickName;
 
-    //头像
-    private String photo;
+  //头像
+  private String photo;
 
-    //生日
-    private String birthday;
+  //生日
+  private String birthday;
 
-    public static boolean checkParam(UserInfoEntityReq req) {
-        if (req == null || req.getUserId() == null ||
-                (StringUtils.isEmpty(req.getBirthday())
-                        && StringUtils.isEmpty(req.getEmail())
-                        && StringUtils.isEmpty(req.getQq())
-                        && StringUtils.isEmpty(req.getName())
-                        && StringUtils.isEmpty(req.getNickName())
-                        && StringUtils.isEmpty(req.getPhoto())
-                        && req.getGender() == null)) {
+  public static boolean checkParam(UserInfoEntityReq req) {
+    if (req == null || req.getUserId() == null ||
+        (StringUtils.isEmpty(req.getNickName()) && StringUtils.isEmpty(req.getPhoto()))) {
 
-            return false;
-        }
-        return true;
+      return false;
     }
+    return true;
+  }
 
 }