getUserInfoBug

handler/get_user_info.go

@@ -13,6 +13,8 @@ import (
 
 func WrapGetUserInfoHandler(ctx *gin.Context) {
 	handler := newGetUserInfoHandler(ctx)
+	userToken := ctx.Request.Header.Get("Authorization")
+	handler.req.Token = userToken
 	baseRun(handler)
 }
 

model/http_model/get_user_info.go

@@ -5,10 +5,15 @@ type GetUserInfoRequest struct {
 }
 
 type GetUserInfoData struct {
-	Role         string `json:"role"`           // 角色类型 1，超级管理员； 2，管理员；3，企业用户; 4. 企业子账号；5. 管理后台子账号
-	UserId       int64  `json:"user_id"`        // YG用户ID
-	EnterpriseId string `json:"enterprise_id"`  // 商家ID
-	SubAccountId int    `json:"sub_account_id"` // 子账号ID
+	Role                 string `json:"role"`                  // 角色类型 1，超级管理员； 2，管理员；3，企业用户; 4. 企业子账号；5. 管理后台子账号
+	UserId               int64  `json:"user_id"`               // YG用户ID
+	EnterpriseId         string `json:"enterprise_id"`         // 商家ID
+	SubAccountId         int    `json:"sub_account_id"`        // 子账号ID
+	JobName              string `json:"job_name"`              // 岗位名称
+	WorkshopPermission   string `json:"workshop_permission"`   // 工作台权限
+	TaskcenterPermission string `json:"taskcenter_permission"` // 任务中心权限
+	CooperatePermission  string `json:"cooperate_permission"`  // 推广合作权限
+	FinancialPermission  string `json:"financial_Permission"`  // 财务结算权限
 }
 
 func NewGetUserInfoRequest() *GetUserInfoRequest {

service/b_user_info.go

@@ -25,12 +25,26 @@ func (*bUserInfo) FindBUserInfoByToken(ctx context.Context, token string) (*http
 			}
 			if auth.Role == "3" {
 				fmt.Println("EnterpriseUser")
+				userInfo.JobName = "主账号无岗位名称"
+				userInfo.CooperatePermission = "1"
+				userInfo.WorkshopPermission = "1"
+				userInfo.FinancialPermission = "1"
+				userInfo.TaskcenterPermission = "1"
 			} else if auth.Role == "4" {
 				subaccountInfo, subaccountErr := db.FindSubAccountByPhone(ctx, auth.Phone)
 				if subaccountErr != nil {
 					return nil, subaccountErr
 				}
 				userInfo.SubAccountId = subaccountInfo.SubAccountId
+				jobInfo, jonErr := db.FindJobByJobId(ctx, subaccountInfo.JobId)
+				if jonErr != nil {
+					return nil, jonErr
+				}
+				userInfo.JobName = jobInfo.JobName
+				userInfo.CooperatePermission = jobInfo.CooperatePermission
+				userInfo.WorkshopPermission = jobInfo.WorkshopPermission
+				userInfo.FinancialPermission = jobInfo.FinancialPermission
+				userInfo.TaskcenterPermission = jobInfo.TaskcenterPermission
 			}
 			return userInfo, nil
 		} else {

service/product.go

@@ -194,7 +194,7 @@ func (*product) QueryKuaishouProduct(ctx context.Context, newKuaishouProduct htt
 	//fmt.Println(newAccessToken.AccessToken)
 
 	// 3. 查找对应的快手商品
-	kuaishouProduct, err := kuaishou.Queryselectiondetail(appKey, signSecret, "ChFvYXV0aC5hY2Nlc3NUb2tlbhJgyuXdI1ES18Mxftco8MmcN9EezgACCf3s69EWHp4pXfJaBjuNDBRDwF3-CIKJE27hoI2CgMKGb7sgR6oeIY89bPfckdKVEvQaP4DHtXNI3bDIM8CkGzp5HBV7Ic0LPLqtGhI4jxc1xH1K15kfx1GQn1SwLvsiIMtIBvogfWJzxNKXUge0HkvMGL7ogOdfpbd5sdUEPM_2KAUwAQ", newKuaishouProduct.ItemList)
+	kuaishouProduct, err := kuaishou.Queryselectiondetail(appKey, signSecret, "ChFvYXV0aC5hY2Nlc3NUb2tlbhJguunmqaSJl6KpNGd6LZBpzcomDJulOGcqpJmcDR_F7yhqAzVj9JY9twn-T3ebjSGkmQqo9D7tnlgHHsvX6tAla48KqQvyBDWFW1GxyOV_mNwys0AmFK1ykWFDrG1k-LEvGhL_b_zNSCZFGYoK2F52yMh0D74iIDGRpbkYe1faOtbvi-FUghbLHkTU8Y9JU2ga6XdHYxikKAUwAQ", newKuaishouProduct.ItemList)
 	if err != nil {
 		fmt.Println("快手错误信息: ", err)
 		return nil, err