fix

app/main/api/internal/logic/user/wxminiauthlogic.go

@@ -1,21 +1,21 @@
 package user
 
 import (
-    "context"
-    "encoding/json"
-    "fmt"
-    "io"
-    "net/http"
-    "time"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"time"
 
-    "ycc-server/app/main/api/internal/svc"
-    "ycc-server/app/main/api/internal/types"
-    "ycc-server/app/main/model"
-    "ycc-server/common/xerr"
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+	"ycc-server/app/main/model"
+	"ycc-server/common/xerr"
 
-    "github.com/google/uuid"
-    "github.com/pkg/errors"
-    "github.com/zeromicro/go-zero/core/logx"
+	"github.com/google/uuid"
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type WxMiniAuthLogic struct {
@@ -46,29 +46,27 @@ func (l *WxMiniAuthLogic) WxMiniAuth(req *types.WXMiniAuthReq) (resp *types.WXMi
 	}
 
 	// 3. 处理用户信息
-    var userID string
-    var userType int64
-    if userAuth != nil {
-        // 已存在用户，直接登录
-        userID = userAuth.UserId
-        userType = model.UserTypeNormal
-    } else {
-        user := &model.User{Id: uuid.NewString()}
-        _, err := l.svcCtx.UserModel.Insert(l.ctx, nil, user)
-        if err != nil {
-            return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户失败: %v", err)
-        }
-        ua := &model.UserAuth{Id: uuid.NewString(), UserId: user.Id, AuthType: model.UserAuthTypeWxMiniOpenID, AuthKey: sessionKeyResp.Openid}
-        _, err = l.svcCtx.UserAuthModel.Insert(l.ctx, nil, ua)
-        if err != nil {
-            return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户授权失败: %v", err)
-        }
-        userID = user.Id
-        userType = model.UserTypeTemp
-    }
+	var userID string
+	if userAuth != nil {
+		// 已存在用户，直接登录
+		userID = userAuth.UserId
+	} else {
+		// 新用户创建为临时用户（没有mobile）
+		user := &model.User{Id: uuid.NewString()}
+		_, err := l.svcCtx.UserModel.Insert(l.ctx, nil, user)
+		if err != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户失败: %v", err)
+		}
+		ua := &model.UserAuth{Id: uuid.NewString(), UserId: user.Id, AuthType: model.UserAuthTypeWxMiniOpenID, AuthKey: sessionKeyResp.Openid}
+		_, err = l.svcCtx.UserAuthModel.Insert(l.ctx, nil, ua)
+		if err != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户授权失败: %v", err)
+		}
+		userID = user.Id
+	}
 
-	// 4. 生成JWT Token
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	// 4. 生成JWT Token（动态计算userType）
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成JWT Token失败: %v", err)
 	}