旗开得胜

src/main/java/com/greenorange/promotion/model/dto/user/UserInfoAddRequest.java

@@ -3,19 +3,23 @@ package com.greenorange.promotion.model.dto.user;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 用户表添加请求体
+ * 用户添加请求体
  */
 @Data
-@Schema(description = "用户表添加请求体", requiredProperties = {"name", "categoryId", "price", "image", "period", "isShelves"})
+@Schema(description = "用户表添加请求体", requiredProperties = {"nickName", "userAvatar", "phoneNumber",
+        "userAccount", "userPassword", "invitationCode", "userRole", "parentUserId", "superUserList"})
 public class UserInfoAddRequest implements Serializable {
 
     /**
      * 用户昵称
      */
+    @NotBlank(message = "参数不能为空")
     @Schema(description = "用户昵称", example = "${field.example}")
     private String nickName;
 
@@ -28,13 +32,22 @@ public class UserInfoAddRequest implements Serializable {
     /**
      * 手机号
      */
+    @NotBlank(message = "参数不能为空")
     @Schema(description = "手机号", example = "${field.example}")
     private String phoneNumber;
 
     /**
-     * 密码（建议加密存储）
+     * 账号
      */
-    @Schema(description = "密码（建议加密存储）", example = "${field.example}")
+    @NotBlank(message = "参数不能为空")
+    @Schema(description = "账号", example = "${field.example}")
+    private String userAccount;
+
+    /**
+     * 密码
+     */
+    @NotBlank(message = "参数不能为空")
+    @Schema(description = "密码", example = "${field.example}")
     private String userPassword;
 
     /**
@@ -46,6 +59,7 @@ public class UserInfoAddRequest implements Serializable {
     /**
      * 用户角色
      */
+    @NotBlank(message = "参数不能为空")
     @Schema(description = "用户角色", example = "${field.example}")
     private String userRole;
 

src/main/java/com/greenorange/promotion/model/dto/user/UserInfoLoginRequest.java

@@ -0,0 +1,27 @@
+package com.greenorange.promotion.model.dto.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户登录请求体
+ */
+@Data
+@Schema(description = "用户登录请求体", requiredProperties = {"userAccount", "userPassword"})
+public class UserInfoLoginRequest implements Serializable {
+
+    /**
+     * 账号
+     */
+    @Schema(description = "账号", example = "${field.example}")
+    private String userAccount;
+
+    /**
+     * 密码
+     */
+    @Schema(description = "密码", example = "${field.example}")
+    private String userPassword;
+
+}

src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 import com.greenorange.promotion.common.PageRequest;
 
 /**
- * 用户表查询请求体，继承自分页请求 PageRequest
+ * 用户查询请求体，继承自分页请求 PageRequest
  */
 @Data
 @Schema(description = "用户表查询请求体", requiredProperties = {"current", "pageSize"})
@@ -19,54 +19,12 @@ public class UserInfoQueryRequest extends PageRequest implements Serializable {
     @Schema(description = "用户表 ID", example = "1")
     private Long id;
 
-    /**
-     * 用户昵称
-     */
-    @Schema(description = "用户昵称", example = "${field.example}")
-    private String nickName;
-
-    /**
-     * 用户头像URL
-     */
-    @Schema(description = "用户头像URL", example = "${field.example}")
-    private String userAvatar;
-
     /**
      * 手机号
      */
     @Schema(description = "手机号", example = "${field.example}")
     private String phoneNumber;
 
-    /**
-     * 密码（建议加密存储）
-     */
-    @Schema(description = "密码（建议加密存储）", example = "${field.example}")
-    private String userPassword;
-
-    /**
-     * 邀请码
-     */
-    @Schema(description = "邀请码", example = "${field.example}")
-    private String invitationCode;
-
-    /**
-     * 用户角色
-     */
-    @Schema(description = "用户角色", example = "${field.example}")
-    private String userRole;
-
-    /**
-     * 上级用户id
-     */
-    @Schema(description = "上级用户id", example = "${field.example}")
-    private Long parentUserId;
-
-    /**
-     * 上级用户列表（1,2,3）
-     */
-    @Schema(description = "上级用户列表（1,2,3）", example = "${field.example}")
-    private String superUserList;
-
 
     @Serial
     private static final long serialVersionUID = 1L;

src/main/java/com/greenorange/promotion/model/dto/user/UserInfoUpdateRequest.java

@@ -7,10 +7,11 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 用户表更新请求体
+ * 用户更新请求体
  */
 @Data
-@Schema(description = "用户表更新请求体", requiredProperties = {"id", "name", "categoryId", "price", "image", "period", "isShelves"})
+@Schema(description = "用户表更新请求体", requiredProperties = {"id", "nickName", "userAvatar", "phoneNumber",
+        "userAccount", "userPassword", "invitationCode", "userRole", "parentUserId", "superUserList"})
 public class UserInfoUpdateRequest implements Serializable {
 
     /**
@@ -38,9 +39,15 @@ public class UserInfoUpdateRequest implements Serializable {
     private String phoneNumber;
 
     /**
-     * 密码（建议加密存储）
+     * 账号
      */
-    @Schema(description = "密码（建议加密存储）", example = "${field.example}")
+    @Schema(description = "账号", example = "${field.example}")
+    private String userAccount;
+
+    /**
+     * 密码
+     */
+    @Schema(description = "密码", example = "${field.example}")
     private String userPassword;
 
     /**

src/main/java/com/greenorange/promotion/model/entity/UserInfo.java

@@ -37,7 +37,12 @@ public class UserInfo implements Serializable {
     private String phoneNumber;
 
     /**
-     * 密码（建议加密存储）
+     * 账号
+     */
+    private String userAccount;
+
+    /**
+     * 密码
      */
     private String userPassword;