三端用户手机号联通，增加临时用户

app/main/api/internal/logic/agent/applyforagentlogic.go

@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"fmt"
 	"qnc-server/app/main/model"
-	jwtx "qnc-server/common/jwt"
+	"qnc-server/common/ctxdata"
 	"qnc-server/common/xerr"
 	"qnc-server/pkg/lzkit/crypto"
 	"time"
@@ -35,6 +35,10 @@ func NewApplyForAgentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *App
 }
 
 func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *types.AgentApplyResp, err error) {
+	claims, err := ctxdata.GetClaimsFromCtx(l.ctx)
+	if err != nil && !errors.Is(err, ctxdata.ErrNoInCtx) {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "代理申请, %v", err)
+	}
 	secretKey := l.svcCtx.Config.Encrypt.SecretKey
 	encryptedMobile, err := crypto.EncryptMobile(req.Mobile, secretKey)
 	if err != nil {
@@ -63,29 +67,20 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type
 			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 读取数据库获取用户失败, mobile: %s, err: %+v", encryptedMobile, err)
 		}
 		if user == nil {
-			user = &model.User{Mobile: sql.NullString{String: encryptedMobile, Valid: true}}
-			// if len(main.Nickname) == 0 {
-			// 	main.Nickname = encryptedMobile
-			// }
-			insertResult, userInsertErr := l.svcCtx.UserModel.Insert(transCtx, session, user)
-			if userInsertErr != nil {
-				return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 数据库插入新用户失败, mobile%s, err: %+v", encryptedMobile, userInsertErr)
+			userID, err = l.svcCtx.UserService.RegisterUser(l.ctx, encryptedMobile)
+			if err != nil {
+				return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "代理申请, 注册用户失败: %+v", err)
 			}
-			lastId, lastInsertIdErr := insertResult.LastInsertId()
-			if lastInsertIdErr != nil {
-				return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 获取新用户ID失败, err:%+v, main:%+v", lastInsertIdErr, user)
-			}
-			user.Id = lastId
-			userID = lastId
-			userAuth := new(model.UserAuth)
-			userAuth.UserId = lastId
-			userAuth.AuthKey = encryptedMobile
-			userAuth.AuthType = model.UserAuthTypeAgentDirect
-			if _, userAuthInsertErr := l.svcCtx.UserAuthModel.Insert(transCtx, session, userAuth); userAuthInsertErr != nil {
-				return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 数据库插入用户认证失败, err:%+v", userAuthInsertErr)
+		} else {
+			if claims != nil && claims.UserType == model.UserTypeTemp {
+				// 临时用户，转为正式用户
+				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
 		}
-		userID = user.Id
 
 		// 使用SelectBuilder构建查询，查找符合user_id的记录并按创建时间降序排序获取最新一条
 		builder := l.svcCtx.AgentAuditModel.SelectBuilder().Where("user_id = ?", user.Id).OrderBy("create_time DESC").Limit(1)
@@ -113,17 +108,6 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type
 			return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "代理申请, 保存代理审核信息失败: %v", insetAgentAuditErr)
 		}
 
-		//agentAuditID, _ := agentAuditInsert.LastInsertId()
-		//agentAuditRow, findAgentAuditModelErr := l.svcCtx.AgentAuditModel.FindOne(l.ctx, agentAuditID)
-		//if findAgentAuditModelErr != nil {
-		//	return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "代理申请, 查找代理审核信息失败: %v", insetAgentAuditErr)
-		//}
-		//agentAuditRow.Status = 1
-		//updateAgentAuditErr := l.svcCtx.AgentAuditModel.UpdateWithVersion(transCtx, session, agentAuditRow)
-		//if updateAgentAuditErr != nil {
-		//	return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 通过代理审核失败: %+v", updateAgentAuditErr)
-		//}
-
 		// 新增代理
 		var agentModel model.Agent
 		agentModel.Mobile = agentAudit.Mobile
@@ -169,9 +153,9 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type
 	if transErr != nil {
 		return nil, transErr
 	}
-	token, generaErr := jwtx.GenerateJwtToken(userID, l.svcCtx.Config.JwtAuth.AccessSecret, l.svcCtx.Config.JwtAuth.AccessExpire)
-	if generaErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "代理申请, 生成token失败 : %d", userID)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "手机登录, 生成token失败 : %d", userID)
 	}
 
 	// 获取当前时间戳

app/main/api/internal/logic/agent/getagentinfologic.go

@@ -31,10 +31,18 @@ func NewGetAgentInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetA
 }
 
 func (l *GetAgentInfoLogic) GetAgentInfo() (resp *types.AgentInfoResp, err error) {
-	userID, err := ctxdata.GetUidFromCtx(l.ctx)
+	claims, err := ctxdata.GetClaimsFromCtx(l.ctx)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取代理信息, %v", err)
 	}
+	userID := claims.UserId
+	userType := claims.UserType
+	if userType == model.UserTypeTemp {
+		return &types.AgentInfoResp{
+			IsAgent: false,
+			Status:  3,
+		}, nil
+	}
 	agent, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {

app/main/api/internal/logic/agent/getagentpromotionqrcodelogic.go

@@ -0,0 +1,72 @@
+package agent
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+	"qnc-server/common/xerr"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetAgentPromotionQrcodeLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	writer http.ResponseWriter
+}
+
+func NewGetAgentPromotionQrcodeLogic(ctx context.Context, svcCtx *svc.ServiceContext, writer http.ResponseWriter) *GetAgentPromotionQrcodeLogic {
+	return &GetAgentPromotionQrcodeLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		writer: writer,
+	}
+}
+
+func (l *GetAgentPromotionQrcodeLogic) GetAgentPromotionQrcode(req *types.GetAgentPromotionQrcodeReq) error {
+	// 1. 参数验证
+	if req.QrcodeUrl == "" {
+		return errors.Wrapf(xerr.NewErrMsg("二维码URL不能为空"), "二维码URL为空")
+	}
+
+	if req.QrcodeType == "" {
+		req.QrcodeType = "promote" // 设置默认类型
+	}
+
+	// 3. 检查指定类型的背景图是否存在
+	if !l.svcCtx.ImageService.CheckImageExists(req.QrcodeType) {
+		l.Errorf("指定的二维码类型对应的背景图不存在: %s", req.QrcodeType)
+		return errors.Wrapf(xerr.NewErrMsg("指定的二维码类型不支持"), "二维码类型: %s", req.QrcodeType)
+	}
+
+	// 4. 处理图片，添加二维码
+	imageData, contentType, err := l.svcCtx.ImageService.ProcessImageWithQRCode(req.QrcodeType, req.QrcodeUrl)
+	if err != nil {
+		l.Errorf("处理图片失败: %v, 类型: %s, URL: %s", err, req.QrcodeType, req.QrcodeUrl)
+		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成推广二维码图片失败: %v", err)
+	}
+
+	// 5. 设置响应头
+	l.writer.Header().Set("Content-Type", contentType)
+	l.writer.Header().Set("Content-Length", fmt.Sprintf("%d", len(imageData)))
+	l.writer.Header().Set("Cache-Control", "public, max-age=3600") // 缓存1小时
+	l.writer.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"qrcode_%s.png\"", req.QrcodeType))
+
+	// 6. 写入图片数据
+	_, err = l.writer.Write(imageData)
+	if err != nil {
+		l.Errorf("写入图片数据失败: %v", err)
+		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "输出图片数据失败: %v", err)
+	}
+
+	l.Infof("成功生成代理推广二维码图片，类型: %s, URL: %s, 图片大小: %d bytes",
+		req.QrcodeType, req.QrcodeUrl, len(imageData))
+
+	return nil
+}

app/main/api/internal/logic/agent/saveagentmembershipuserconfiglogic.go

@@ -48,7 +48,7 @@ func (l *SaveAgentMembershipUserConfigLogic) SaveAgentMembershipUserConfig(req *
 			agentMembershipUserConfigModel = &model.AgentMembershipUserConfig{
 				UserId:              userID,
 				AgentId:             agentModel.Id,
-				ProductId:           req.ProductID,
+				ProductId:           req.ProductID,	
 				PriceRatio:          req.PriceRatio,
 				PriceIncreaseAmount: req.PriceIncreaseAmount,
 				PriceRangeFrom:      req.PriceRangeFrom,