🐛 代理设置

internal/ent/schema/sys_user.go

@@ -46,14 +46,14 @@ func (SysUser) Edges() []ent.Edge {
 		edge.To("children", SysUser.Type).
 			From("parent").
 			Unique(),
-		edge.To("roles", SysRole.Type),                                               // 用户拥有角色
-		edge.To("agent", SysAgent.Type).Unique(),                                     // 用户拥有代理
-		edge.To("images", CpImage.Type).Annotations(entsql.OnDelete(entsql.Cascade)), // 用户拥有的图片
-		edge.To("cpuser", CpUser.Type).Annotations(entsql.OnDelete(entsql.Cascade)),  // 用户拥有的cp用户
-		edge.To("cp_task", CpTask.Type),
-		edge.To("cp_task_logs", CpTaskLog.Type), // 用户拥有的cp任务日志
-		edge.To("created_cards", SysCard.Type),  // 用户创建的卡
-		edge.To("used_cards", SysCard.Type),     // 用户使用的卡
+		edge.To("roles", SysRole.Type).Annotations(entsql.OnDelete(entsql.Cascade)),           // 用户拥有角色
+		edge.To("agent", SysAgent.Type).Unique().Annotations(entsql.OnDelete(entsql.Cascade)), // 用户拥有代理
+		edge.To("images", CpImage.Type).Annotations(entsql.OnDelete(entsql.Cascade)),          // 用户拥有的图片
+		edge.To("cpuser", CpUser.Type).Annotations(entsql.OnDelete(entsql.Cascade)),           // 用户拥有的cp用户
+		edge.To("cp_task", CpTask.Type).Annotations(entsql.OnDelete(entsql.Cascade)),
+		edge.To("cp_task_logs", CpTaskLog.Type).Annotations(entsql.OnDelete(entsql.Cascade)), // 用户拥有的cp任务日志
+		edge.To("created_cards", SysCard.Type),                                               // 用户创建的卡
+		edge.To("used_cards", SysCard.Type),                                                  // 用户使用的卡
 		edge.To("cashback_cards", SysCard.Type),
 	}
 }

internal/service/agent/agent_service.go

@@ -185,11 +185,11 @@ func (s *AgentServiceV1) AgentPutInfoReq(ctx context.Context, req *v1.AgentPutIn
 		oldBalance = utils.RevertBalance(user.Balance, user.Edges.Agent.Rate)
 		tx.SysAgent.UpdateOne(user.Edges.Agent).SetLevel(req.Level).SetRate(req.Rate).SaveX(ctx)
 	}
+	err = tx.Commit()
 	//按照新费率计算余额
 	newBalance := utils.TransformBalance(oldBalance, req.Rate)
 	// 6. 更新用户余额
 	balance.BalanceService.ChangeUserBalance(ctx, user.ID, newBalance.Sub(oldBalance))
-	err = tx.Commit()
 	utils.OkOrPanic(err, func(err error) error {
 		return oops.
 			WithContext(ctx).

internal/service/balance/balance_service.go

@@ -4,33 +4,38 @@ import (
 	"context"
 	"likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/db"
+	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/ent/sysuser"
 	"likedream-goframe/internal/utils"
-	"sync"
 
-	"github.com/samber/oops"
 	"github.com/shopspring/decimal"
 )
 
-var BalanceService = &BalanceServiceV1{
-	lock: sync.Mutex{},
-}
+var BalanceService = &BalanceServiceV1{}
 
 type BalanceServiceV1 struct {
-	lock sync.Mutex
 }
 
-func (v *BalanceServiceV1) ChangeUserBalance(ctx context.Context, userId int64, balance decimal.Decimal) {
-	v.lock.Lock()
-	defer v.lock.Unlock()
-	tx, err := db.Global.Tx(ctx)
-	utils.OkOrPanic(err, oops.WithContext(ctx).Wrap)
-	defer tx.Rollback()
-	user := tx.SysUser.Query().Where(sysuser.ID(userId)).WithRoles().OnlyX(ctx)
-	newBalance := user.Balance.Add(balance)
-	if newBalance.LessThan(decimal.Zero) {
-		utils.OkOrPanic(errors.NewBusinessError(400, "余额不足"))
-	}
-	tx.SysUser.Update().Where(sysuser.ID(userId)).SetBalance(newBalance).SaveX(ctx)
-	tx.Commit()
+func (v *BalanceServiceV1) ChangeUserBalance(ctx context.Context, userId int64, balance decimal.Decimal) error {
+	return db.WithTx(ctx, func(c context.Context, tx *ent.Tx) {
+		// 使用 SELECT ... FOR UPDATE 锁定用户记录
+		user, err := tx.SysUser.Query().
+			Where(sysuser.ID(userId)).
+			ForUpdate().
+			Only(ctx)
+		if err != nil {
+			utils.OkOrPanic(err)
+		}
+
+		newBalance := user.Balance.Add(balance)
+		if newBalance.LessThan(decimal.Zero) {
+			utils.OkOrPanic(errors.NewBusinessError(400, "余额不足"))
+		}
+
+		// 更新余额
+		tx.SysUser.Update().
+			Where(sysuser.ID(userId)).
+			SetBalance(newBalance).
+			ExecX(ctx)
+	}, nil)
 }

internal/service/user_login/user_login_service.go

@@ -81,19 +81,18 @@ func (s *UserLoginServiceV1) Register(ctx context.Context, req *v1.UserRegisterR
 			With("提交事务失败").
 			Wrap(err)
 	})
-
 	// 注册成功后发送欢迎邮件（异步发送，不影响注册结果）
 	go func() {
+		ctx2 := context.Background()
 		token := make([]byte, 32)
 		_, _ = rand.Read(token)
 		tokenStr := base64.URLEncoding.EncodeToString(token)
-		set := redis.GetClient().Set(ctx, cst.RedisVerifyCode+tokenStr, req.Email, time.Duration(cst.RedisVerifyCodeExpire)*time.Second)
-		err2 := set.Err()
-		utils.OkOrPanic(err2)
+		err2 := redis.GetClient().SetEx(ctx2, cst.RedisVerifyCode+tokenStr, req.Email, time.Duration(cst.RedisVerifyCodeExpire)*time.Second).Err()
+		utils.OkOrPanic(err2, oops.WithContext(ctx2).Wrap)
 		// 创建新的context避免原context被取消
-		emailCtx := context.Background()
 		emailService := email.NewV1()
-		emailService.SendSignupEmail(emailCtx, req.Email, req.Username, tokenStr)
+		emailService.SendSignupEmail(ctx2, req.Email, req.Username, tokenStr)
+
 	}()
 
 	return utils.SuccessWithMsg("注册成功")