fix

2025-12-10 13:10:39 +08:00
parent c23ab8338b
commit 0f676d3c76
31 changed files with 375 additions and 5916 deletions
--- a/app/main/api/internal/logic/agent/applyforagentlogic.go
+++ b/app/main/api/internal/logic/agent/applyforagentlogic.go
@@ -1,22 +1,22 @@
 package agent

 import (
-    "context"
-    "database/sql"
-    "fmt"
-    "os"
-    "time"
-    "ycc-server/app/main/model"
-    "ycc-server/common/ctxdata"
-    "ycc-server/common/globalkey"
-    "ycc-server/common/xerr"
-    "ycc-server/pkg/lzkit/crypto"
-    "strconv"
+	"context"
+	"database/sql"
+	"fmt"
+	"os"
+	"strconv"
+	"time"
+	"ycc-server/app/main/model"
+	"ycc-server/common/ctxdata"
+	"ycc-server/common/globalkey"
+	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/crypto"

-    "github.com/google/uuid"
-    "github.com/pkg/errors"
-    "github.com/zeromicro/go-zero/core/stores/redis"
-    "github.com/zeromicro/go-zero/core/stores/sqlx"
+	"github.com/google/uuid"
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/stores/redis"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"

 	"ycc-server/app/main/api/internal/svc"
 	"ycc-server/app/main/api/internal/types"
@@ -50,9 +50,9 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "加密手机号失败: %v", err)
 	}

-    if req.Referrer == "" {
-        return nil, errors.Wrapf(xerr.NewErrMsg("请填写邀请信息"), "")
-    }
+	if req.Referrer == "" {
+		return nil, errors.Wrapf(xerr.NewErrMsg("请填写邀请信息"), "")
+	}

 	// 2. 校验验证码（开发环境下跳过验证码校验）
 	if os.Getenv("ENV") != "development" {
@@ -115,49 +115,49 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type
 			return errors.Wrapf(xerr.NewErrMsg("您已经是代理"), "")
 		}

-        var inviteCodeModel *model.AgentInviteCode
-        var parentAgentId string
-        var targetLevel int64
+		var inviteCodeModel *model.AgentInviteCode
+		var parentAgentId string
+		var targetLevel int64

-        inviteCodeModel, err = l.svcCtx.AgentInviteCodeModel.FindOneByCode(transCtx, req.Referrer)
-        if err != nil && !errors.Is(err, model.ErrNotFound) {
-            return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询邀请码失败, %v", err)
-        }
-        if inviteCodeModel != nil {
-            if inviteCodeModel.Status != 0 {
-                if inviteCodeModel.Status == 1 {
-                    return errors.Wrapf(xerr.NewErrMsg("邀请码已使用"), "")
-                }
-                return errors.Wrapf(xerr.NewErrMsg("邀请码已失效"), "")
-            }
-            if inviteCodeModel.ExpireTime.Valid && inviteCodeModel.ExpireTime.Time.Before(time.Now()) {
-                return errors.Wrapf(xerr.NewErrMsg("邀请码已过期"), "")
-            }
-            targetLevel = inviteCodeModel.TargetLevel
-            if inviteCodeModel.AgentId.Valid {
-                parentAgentId = inviteCodeModel.AgentId.String
-            }
-        } else {
-            if codeVal, parseErr := strconv.ParseInt(req.Referrer, 10, 64); parseErr == nil && codeVal > 0 {
-                parentAgent, err := l.findAgentByCode(transCtx, codeVal)
-                if err != nil {
-                    return err
-                }
-                parentAgentId = parentAgent.Id
-                targetLevel = 1
-            } else {
-                encRefMobile, _ := crypto.EncryptMobile(req.Referrer, l.svcCtx.Config.Encrypt.SecretKey)
-                agents, findErr := l.svcCtx.AgentModel.FindAll(transCtx, l.svcCtx.AgentModel.SelectBuilder().Where("mobile = ? AND del_state = ?", encRefMobile, globalkey.DelStateNo).Limit(1), "")
-                if findErr != nil {
-                    return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询上级代理失败, %v", findErr)
-                }
-                if len(agents) == 0 {
-                    return errors.Wrapf(xerr.NewErrMsg("邀请信息无效"), "")
-                }
-                parentAgentId = agents[0].Id
-                targetLevel = 1
-            }
-        }
+		inviteCodeModel, err = l.svcCtx.AgentInviteCodeModel.FindOneByCode(transCtx, req.Referrer)
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询邀请码失败, %v", err)
+		}
+		if inviteCodeModel != nil {
+			if inviteCodeModel.Status != 0 {
+				if inviteCodeModel.Status == 1 {
+					return errors.Wrapf(xerr.NewErrMsg("邀请码已使用"), "")
+				}
+				return errors.Wrapf(xerr.NewErrMsg("邀请码已失效"), "")
+			}
+			if inviteCodeModel.ExpireTime.Valid && inviteCodeModel.ExpireTime.Time.Before(time.Now()) {
+				return errors.Wrapf(xerr.NewErrMsg("邀请码已过期"), "")
+			}
+			targetLevel = inviteCodeModel.TargetLevel
+			if inviteCodeModel.AgentId.Valid {
+				parentAgentId = inviteCodeModel.AgentId.String
+			}
+		} else {
+			if codeVal, parseErr := strconv.ParseInt(req.Referrer, 10, 64); parseErr == nil && codeVal > 0 {
+				parentAgent, err := l.findAgentByCode(transCtx, codeVal)
+				if err != nil {
+					return err
+				}
+				parentAgentId = parentAgent.Id
+				targetLevel = 1
+			} else {
+				encRefMobile, _ := crypto.EncryptMobile(req.Referrer, l.svcCtx.Config.Encrypt.SecretKey)
+				agents, findErr := l.svcCtx.AgentModel.FindAll(transCtx, l.svcCtx.AgentModel.SelectBuilder().Where("mobile = ? AND del_state = ?", encRefMobile, globalkey.DelStateNo).Limit(1), "")
+				if findErr != nil {
+					return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询上级代理失败, %v", findErr)
+				}
+				if len(agents) == 0 {
+					return errors.Wrapf(xerr.NewErrMsg("邀请信息无效"), "")
+				}
+				parentAgentId = agents[0].Id
+				targetLevel = 1
+			}
+		}

 		// 4.5 创建代理记录
 		newAgent := &model.Agent{
@@ -279,7 +279,7 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type
 	}

 	// 6. 生成并返回token
-	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, model.UserTypeNormal)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成token失败: %v", err)
 	}
--- a/app/main/api/internal/logic/agent/registerbyinvitecodelogic.go
+++ b/app/main/api/internal/logic/agent/registerbyinvitecodelogic.go
@@ -105,10 +105,16 @@ func (l *RegisterByInviteCodeLogic) RegisterByInviteCode(req *types.RegisterByIn
 				return errors.Wrapf(xerr.NewErrMsg("您已经是代理"), "")
 			}

-			// 如果是临时用户（微信环境下），检查手机号是否已绑定其他微信号，并绑定临时用户到正式用户
-			// 注意：非微信环境下 claims 为 nil，此逻辑不会执行，直接使用已存在的 user.Id
+			// 检查用户是否有mobile绑定（没有mobile则不能成为代理）
+			// 如果是临时用户（微信环境下），需要先绑定手机号
 			claims, err := ctxdata.GetClaimsFromCtx(l.ctx)
-			if err == nil && claims != nil && claims.UserType == model.UserTypeTemp {
+			if err == nil && claims != nil {
+				// 获取用户的mobile信息
+				if !user.Mobile.Valid || user.Mobile.String == "" {
+					// 临时用户（无mobile）不能直接成为代理，需要先绑定mobile
+					return errors.Wrapf(xerr.NewErrMsg("请先绑定手机号后再申请成为代理"), "")
+				}
+				// 检查是否已绑定手机号认证（用于确保后续可通过手机号登录）
 				userAuth, err := l.svcCtx.UserAuthModel.FindOneByUserIdAuthType(l.ctx, user.Id, claims.AuthType)
 				if err != nil && !errors.Is(err, model.ErrNotFound) {
 					return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询用户认证失败, %v", err)
@@ -116,11 +122,6 @@ func (l *RegisterByInviteCodeLogic) RegisterByInviteCode(req *types.RegisterByIn
 				if userAuth != nil && userAuth.AuthKey != claims.AuthKey {
 					return errors.Wrapf(xerr.NewErrMsg("该手机号已绑定其他微信号"), "")
 				}
-				// 绑定临时用户到正式用户
-				err = l.svcCtx.UserService.TempUserBindUser(l.ctx, session, user.Id)
-				if err != nil {
-					return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "绑定用户失败: %v", err)
-				}
 			}

 			userID = user.Id
@@ -263,7 +264,7 @@ func (l *RegisterByInviteCodeLogic) RegisterByInviteCode(req *types.RegisterByIn
 	}

 	// 5. 生成并返回token
-	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, model.UserTypeNormal)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成token失败: %v", err)
 	}