1.获取用户数据接口增加出参；

2.店员绩效接口调整；
3.店员邀请用户生成记录时，默认为自动续费类型；

controller/account.go

@@ -541,6 +541,7 @@ func UserData(c *gin.Context) {
 			logger.Error(err)
 		}
 		m.RoleKey = roleInfo.RoleKey
+		m.RoleName = roleInfo.RoleName
 	}
 
 	ret := m

controller/cb_goods_stock.go

@@ -449,6 +449,10 @@ func CooperativeGameCardGoodsList(c *gin.Context) {
 	return
 }
 
+const (
+	ShopManagerKey = "store-manager"
+)
+
 func AssistantMemberPromotionList(c *gin.Context) {
 	req := model.AssistantMemberPromotionReq{}
 	if c.ShouldBindJSON(&req) != nil {
@@ -466,16 +470,33 @@ func AssistantMemberPromotionList(c *gin.Context) {
 	req.AssistantUid = uc.Uid
 
 	req.Assistant = model.GetUserByUid(uc.Uid)
-	if req.Assistant.XcxRoleId != 2 {
-		logger.Error("xcx role err:")
-		RespJson(c, status.NoAuth, nil)
-		return
-	}
 	if req.Assistant.UserType != 2 {
 		logger.Error("not assistant")
 		RespJson(c, status.InternalServerError, nil)
 		return
 	}
+
+	var sysUser model.SysUser
+	if err := model.NewSysUserQuerySet(model.DB).UidEq(uc.Uid).One(&sysUser); err != nil && err != model.RecordNotFound {
+		logger.Error(err)
+		RespJson(c, status.Unauthorized, nil)
+		return
+	}
+	req.Assistant.RoleId = uint32(sysUser.RoleId)
+	if req.Assistant.RoleId != 0 {
+		var roleInfo model.SysRole
+		err := model.NewSysRoleQuerySet(model.DB).IDEq(req.Assistant.RoleId).Find(&roleInfo)
+		if err != nil {
+			logger.Error(err)
+		}
+		req.Assistant.RoleKey = roleInfo.RoleKey
+	}
+	if req.Assistant.RoleKey != ShopManagerKey {
+		logger.Error("xcx role err:", req.Assistant.RoleKey)
+		RespJson(c, status.NoAuth, nil)
+		return
+	}
+
 	list, totalPage, err := req.List()
 	if err != nil {
 		logger.Error("list err:", err)

controller/game_card.go

@@ -568,7 +568,9 @@ func PushWXPayNotice(c *gin.Context) {
 						qs := model.NewUserInviteQuerySet(model.DB).IDEq(invite.ID).GetUpdater()
 						if isShopAssistantCode {
 							qs = qs.SetInviteForm(1)
-							invite.RenewHide = 0
+							invite.RenewHide = 0 // 干预
+						} else {
+							invite.RenewHide = 1 // 自动
 						}
 						qs = qs.SetMemberOpenTime(newTime).SetMemberLevel(record.MemberLevel)
 						_, err = qs.SetMemberType(2).SetMemberStatus(2).
@@ -953,7 +955,9 @@ func PushWXPayNotice(c *gin.Context) {
 					qs := model.NewUserInviteQuerySet(model.DB).IDEq(invite.ID).GetUpdater()
 					if isShopAssistantCode {
 						qs = qs.SetInviteForm(1)
-						invite.RenewHide = 0
+						invite.RenewHide = 0 // 干预
+					} else {
+						invite.RenewHide = 1 // 自动
 					}
 					qs = qs.SetMemberOpenTime(newTime).SetMemberLevel(record.MemberLevel)
 					_, err = qs.SetMemberType(record.MemberLevel).SetMemberStatus(2).
@@ -1588,7 +1592,9 @@ func HmPushWXPayNotice(c *gin.Context) {
 
 						if isShopAssistantCode {
 							qs = qs.SetInviteForm(1)
-							invite.RenewHide = 0
+							invite.RenewHide = 0 // 干预
+						} else {
+							invite.RenewHide = 1 // 自动
 						}
 						qs = qs.SetMemberOpenTime(newTime).SetMemberLevel(record.MemberLevel)
 						_, err = qs.SetMemberType(2).SetMemberStatus(2).
@@ -1980,7 +1986,9 @@ func HmPushWXPayNotice(c *gin.Context) {
 					qs := model.NewUserInviteQuerySet(model.DB).IDEq(invite.ID).GetUpdater()
 					if isShopAssistantCode {
 						qs = qs.SetInviteForm(1)
-						invite.RenewHide = 0
+						invite.RenewHide = 0 // 干预
+					} else {
+						invite.RenewHide = 1 // 自动
 					}
 					qs = qs.SetMemberOpenTime(newTime).SetMemberLevel(record.MemberLevel)
 					_, err = qs.SetMemberType(record.MemberLevel).SetMemberStatus(2).

model/user.go

@@ -59,6 +59,7 @@ type User struct {
 	StoreList             []StoreInfo `gorm:"-" json:"store_list"`                  // 有效门店列表
 	RoleId                uint32      `json:"role_id" gorm:"-"`                     // 角色id
 	RoleKey               string      `json:"role_key" gorm:"-"`                    // 角色代码
+	RoleName              string      `json:"role_name" gorm:"-"`                   // 角色名称
 	//RenewalTime           time.Time `json:"renewal_time"`
 	//RenewalMemberLevel    uint32    `json:"renewal_member_level"`
 	//MemberLevelString string    `json:"member_level_string" gorm:"-"` // 会员类型