From 665bd12fdffe325032bab52f17993912cd218407 Mon Sep 17 00:00:00 2001
From: zzw <1464003642@qq.com>
Date: Fri, 11 Sep 2026 17:28:11 +0800
Subject: [PATCH] chore: user type

---
 services/user/internal/dao/client.go       |  1 +
 services/user/internal/logic/authHelper.go |  6 +-----
 services/user/internal/logic/response.go   | 24 +++-------------------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/services/user/internal/dao/client.go b/services/user/internal/dao/client.go
index d5b7211..3cf7ba8 100644
--- a/services/user/internal/dao/client.go
+++ b/services/user/internal/dao/client.go
@@ -8,4 +8,5 @@ type Client struct {
 	SubjectType   string `gorm:"column:subject_type" json:"subject_type"`
 	StoreStaff    uint8  `gorm:"column:store_staff" json:"store_staff"`
 	Status        uint8  `gorm:"column:status" json:"status"`
+	Type          uint8  `gorm:"column:type" json:"type"`
 }
diff --git a/services/user/internal/logic/authHelper.go b/services/user/internal/logic/authHelper.go
index 96a6175..e76fe68 100644
--- a/services/user/internal/logic/authHelper.go
+++ b/services/user/internal/logic/authHelper.go
@@ -216,11 +216,7 @@ func issueLoginToken(ctx context.Context, jwtAuth *config.JWTAuth, saleSvcName s
 	mobile := decryptMobile(row.Mobile)
 
 	var saleId int64
-	userType := dao.TypeUser
-	if client != nil {
-		userType = subjectTypeToUserType(client.SubjectType)
-	}
-	if userType == dao.TypeSale {
+	if client.Type == dao.TypeSale {
 		saleInfo, err := fetchSaleByUserId(ctx, saleSvcName, row.Id)
 		if err != nil {
 			return nil, err
diff --git a/services/user/internal/logic/response.go b/services/user/internal/logic/response.go
index 2068407..dd0c5b7 100644
--- a/services/user/internal/logic/response.go
+++ b/services/user/internal/logic/response.go
@@ -48,26 +48,8 @@ func decryptMobile(mobile string) string {
 	return plain
 }
 
-func subjectTypeToUserType(subjectType string) uint8 {
-	switch subjectType {
-	case dao.SubjectTypeSale:
-		return dao.TypeSale
-	case dao.SubjectTypeStore:
-		return dao.TypeStore
-	case dao.SubjectTypeUser:
-		return dao.TypeUser
-	default:
-		return dao.TypeUser
-	}
-}
-
 func toSession(info dao.UserRow, mobilePlain string, client *dao.Client, saleId int64) dao.UserLoginSession {
-	userType := dao.TypeUser
-	clientCode := utils.StringEmpty
-	if client != nil {
-		clientCode = client.Code
-		userType = subjectTypeToUserType(client.SubjectType)
-	}
+
 	return dao.UserLoginSession{
 		Id:         info.Id,
 		Name:       info.Name,
@@ -75,8 +57,8 @@ func toSession(info dao.UserRow, mobilePlain string, client *dao.Client, saleId
 		Mobile:     mobilePlain,
 		Gender:     info.Gender,
 		Birthday:   info.Birthday.DateString(),
-		Type:       userType,
-		ClientCode: clientCode,
+		Type:       client.Type,
+		ClientCode: client.Code,
 		SaleId:     saleId,
 	}
 }