修复逻辑问题

web/handlers/user.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/shopspring/decimal"
 	"golang.org/x/crypto/bcrypt"
+	"gorm.io/gen/field"
 	"gorm.io/gorm"
 )
 
@@ -305,14 +306,26 @@ func UpdateUser(c *fiber.Ctx) error {
 	}
 
 	// 更新用户信息
+	do := make([]field.AssignExpr, 0)
+	if req.Username != nil && *req.Username != "" {
+		do = append(do, q.User.Username.Value(*req.Username))
+	}
+	if req.Email != nil {
+		if *req.Email == "" {
+			do = append(do, q.User.Email.Null())
+		} else {
+			do = append(do, q.User.Email.Value(*req.Email))
+		}
+	}
+	if req.ContactQQ != nil {
+		do = append(do, q.User.ContactQQ.Value(*req.ContactQQ))
+	}
+	if req.ContactWechat != nil {
+		do = append(do, q.User.ContactWechat.Value(*req.ContactWechat))
+	}
 	_, err = q.User.
 		Where(q.User.ID.Eq(authCtx.User.ID)).
-		Updates(m.User{
-			Username:      &req.Username,
-			Email:         &req.Email,
-			ContactQQ:     &req.ContactQQ,
-			ContactWechat: &req.ContactWechat,
-		})
+		UpdateSimple(do...)
 	if errors.Is(err, gorm.ErrDuplicatedKey) {
 		return core.NewBizErr("用户名或邮箱已被占用")
 	}
@@ -325,10 +338,10 @@ func UpdateUser(c *fiber.Ctx) error {
 }
 
 type UpdateUserReq struct {
-	Username      string `json:"username" validate:"omitempty,min=3,max=20"`
-	Email         string `json:"email" validate:"omitempty,email"`
-	ContactQQ     string `json:"contact_qq" validate:"omitempty,qq"`
-	ContactWechat string `json:"contact_wechat" validate:"omitempty,wechat"`
+	Username      *string `json:"username" validate:"omitempty,min=3,max=20"`
+	Email         *string `json:"email" validate:"omitempty,email"`
+	ContactQQ     *string `json:"contact_qq" validate:"omitempty,qq"`
+	ContactWechat *string `json:"contact_wechat" validate:"omitempty,wechat"`
 }
 
 // 更新账号信息
@@ -379,16 +392,14 @@ func UpdatePassword(c *fiber.Ctx) error {
 		return err
 	}
 
-	// 验证手机号
-	if req.Phone != authCtx.User.Phone {
-		return fiber.NewError(fiber.StatusBadRequest, "手机号码不正确")
-	}
-
 	// 验证手机令牌
 	if req.Code == "" {
-		return fiber.NewError(fiber.StatusBadRequest, "手机号码和验证码不能为空")
+		return fiber.NewError(fiber.StatusBadRequest, "验证码不能为空")
+	}
+	err = s.Verifier.VerifySms(c.Context(), authCtx.User.Phone, req.Code, s.VerifierSmsPurposePassword)
+	if errors.Is(err, s.ErrVerifierServiceInvalid) {
+		return core.NewBizErr(s.ErrVerifierServiceInvalid.Error())
 	}
-	err = s.Verifier.VerifySms(c.Context(), req.Phone, req.Code)
 	if err != nil {
 		return err
 	}
@@ -411,7 +422,6 @@ func UpdatePassword(c *fiber.Ctx) error {
 }
 
 type UpdatePasswordReq struct {
-	Phone    string `json:"phone"`
 	Code     string `json:"code"`
 	Password string `json:"password"`
 }