From 1e7a7352fea54ca86d8ea2e84b51a7da1cda8630 Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 12 Jul 2024 19:44:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=8F=82?= =?UTF-8?q?=EF=BC=9B=202.=E5=BA=97=E5=91=98=E7=BB=A9=E6=95=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=9B=203.=E5=BA=97=E5=91=98?= =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=94=A8=E6=88=B7=E7=94=9F=E6=88=90=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=97=B6=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=BA=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=BB=AD=E8=B4=B9=E7=B1=BB=E5=9E=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/account.go | 1 + controller/cb_goods_stock.go | 31 ++++++++++++++++++++++++++----- controller/game_card.go | 16 ++++++++++++---- model/user.go | 1 + 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/controller/account.go b/controller/account.go index a0bd271..d3036f9 100644 --- a/controller/account.go +++ b/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 diff --git a/controller/cb_goods_stock.go b/controller/cb_goods_stock.go index 98355d4..34ae904 100644 --- a/controller/cb_goods_stock.go +++ b/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) diff --git a/controller/game_card.go b/controller/game_card.go index 0bcfa25..be125b1 100644 --- a/controller/game_card.go +++ b/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). diff --git a/model/user.go b/model/user.go index f2f6b1d..beca40c 100644 --- a/model/user.go +++ b/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:"-"` // 会员类型