1.优惠券列表接口调整；
2.用户信息接口（/api/v1/user/data）出参增加字段role_key，配合处理临时店员功能；
This commit is contained in:
parent
99a798923e
commit
1a83ce356a
|
|
@ -533,6 +533,16 @@ func UserData(c *gin.Context) {
|
|||
}
|
||||
m.StoreList = sysUser.StoreList
|
||||
m.RoleId = uint32(sysUser.RoleId)
|
||||
|
||||
if m.RoleId != 0 {
|
||||
var roleInfo model.SysRole
|
||||
err = model.NewSysRoleQuerySet(model.DB).IDEq(m.RoleId).Find(&roleInfo)
|
||||
if err != nil {
|
||||
logger.Error(err)
|
||||
}
|
||||
m.RoleKey = roleInfo.RoleKey
|
||||
}
|
||||
|
||||
ret := m
|
||||
RespOK(c, ret)
|
||||
return
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@ func MemberRenewalUserCouponList(c *gin.Context) {
|
|||
|
||||
list := make([]model.UserCoupon, 0, len(coupons))
|
||||
for i, _ := range coupons {
|
||||
if !user.IsMember() && coupons[i].ActivityType == 1 {
|
||||
if user.OpenMemberTime.IsZero() && coupons[i].ActivityType == 1 {
|
||||
continue
|
||||
}
|
||||
if user.MemberGenre == 201 || user.MemberGenre == 202 {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1277,21 +1277,21 @@ func AddMemberPromotion() {
|
|||
}
|
||||
|
||||
func TestXcxRoleAdd(t *testing.T) {
|
||||
InitTestDB()
|
||||
role := &XcxRole{
|
||||
RoleName: "店长",
|
||||
RoleKey: "shop_manager",
|
||||
RoleSort: 2,
|
||||
Status: "normal",
|
||||
Flag: "",
|
||||
CreateBy: "",
|
||||
UpdateBy: "",
|
||||
Remark: "",
|
||||
}
|
||||
err := DBDev.Create(role).Error
|
||||
if err != nil {
|
||||
logger.Error("err:")
|
||||
}
|
||||
//InitTestDB()
|
||||
//role := &XcxRole{
|
||||
// RoleName: "店长",
|
||||
// RoleKey: "shop_manager",
|
||||
// RoleSort: 2,
|
||||
// Status: "normal",
|
||||
// Flag: "",
|
||||
// CreateBy: "",
|
||||
// UpdateBy: "",
|
||||
// Remark: "",
|
||||
//}
|
||||
//err := DBDev.Create(role).Error
|
||||
//if err != nil {
|
||||
// logger.Error("err:")
|
||||
//}
|
||||
// assistant
|
||||
//shop_manager 长
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ type User struct {
|
|||
DepositType uint32 `json:"deposit_type"` // 押金类型: 3-未充值
|
||||
StoreList []StoreInfo `gorm:"-" json:"store_list"` // 有效门店列表
|
||||
RoleId uint32 `json:"role_id" gorm:"-"` // 角色id
|
||||
RoleKey string `json:"role_key" gorm:"-"` // 角色代码
|
||||
//RenewalTime time.Time `json:"renewal_time"`
|
||||
//RenewalMemberLevel uint32 `json:"renewal_member_level"`
|
||||
//MemberLevelString string `json:"member_level_string" gorm:"-"` // 会员类型
|
||||
|
|
@ -221,24 +222,44 @@ type UserMemberExpireDelay struct {
|
|||
IsPay uint32 `json:"is_pay"` // 1-已支付
|
||||
}
|
||||
|
||||
// gen:qs
|
||||
type XcxRole struct {
|
||||
// gen:gs
|
||||
type SysRole struct {
|
||||
Model
|
||||
RoleId uint32 `json:"role_id" gorm:"unique_index,not null"`
|
||||
RoleName string `json:"role_name" gorm:"size:255;"` // 角色名称
|
||||
RoleKey string `json:"role_key" gorm:"size:255;"` // 角色代码
|
||||
RoleSort int `json:"role_sort" gorm:""` // 角色排序
|
||||
Status string `json:"status" gorm:"size:255;"` // 状态:1-停用 2-正常
|
||||
Flag string `json:"flag" gorm:"size:255;"` //
|
||||
CreateBy string `json:"create_by" gorm:"size:255;"` //
|
||||
UpdateBy string `json:"update_by" gorm:"size:255;"` //
|
||||
Remark string `json:"remark" gorm:"size:255;"` // 备注
|
||||
RoleId int `json:"roleId" gorm:"primary_key;AUTO_INCREMENT"` // 角色编码
|
||||
RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称
|
||||
Status string `json:"status" gorm:"size:4;"` //
|
||||
RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码
|
||||
RoleSort int `json:"roleSort" gorm:""` //角色排序
|
||||
Flag string `json:"flag" gorm:"size:128;"` //
|
||||
CreateBy string `json:"createBy" gorm:"size:128;"` //
|
||||
UpdateBy string `json:"updateBy" gorm:"size:128;"` //
|
||||
Remark string `json:"remark" gorm:"size:255;"` //备注
|
||||
Admin bool `json:"admin" gorm:"size:4;"`
|
||||
DataScope string `json:"dataScope" gorm:"size:128;"`
|
||||
|
||||
Params string `json:"params" gorm:"-"`
|
||||
MenuIds []int `json:"menuIds" gorm:"-"`
|
||||
DeptIds []int `json:"deptIds" gorm:"-"`
|
||||
}
|
||||
|
||||
//// gen:qs
|
||||
//type XcxRole struct {
|
||||
// Model
|
||||
// RoleId uint32 `json:"role_id" gorm:"unique_index,not null"`
|
||||
// RoleName string `json:"role_name" gorm:"size:255;"` // 角色名称
|
||||
// RoleKey string `json:"role_key" gorm:"size:255;"` // 角色代码
|
||||
// RoleSort int `json:"role_sort" gorm:""` // 角色排序
|
||||
// Status string `json:"status" gorm:"size:255;"` // 状态:1-停用 2-正常
|
||||
// Flag string `json:"flag" gorm:"size:255;"` //
|
||||
// CreateBy string `json:"create_by" gorm:"size:255;"` //
|
||||
// UpdateBy string `json:"update_by" gorm:"size:255;"` //
|
||||
// Remark string `json:"remark" gorm:"size:255;"` // 备注
|
||||
//
|
||||
// Params string `json:"params" gorm:"-"`
|
||||
// MenuIds []int `json:"menuIds" gorm:"-"`
|
||||
// DeptIds []int `json:"deptIds" gorm:"-"`
|
||||
//}
|
||||
|
||||
// gen:qs
|
||||
// ShopperPromotionCode 店员优惠码
|
||||
type ShopperPromotionCode struct {
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
},
|
||||
"db": {
|
||||
"driver": "mysql",
|
||||
"host": "39.108.188.218",
|
||||
"host": "112.33.14.191",
|
||||
"port": 3306,
|
||||
"user": "mh_new_pro",
|
||||
"password": "YnzexdTfBHMSGZki",
|
||||
"db_name": "mh_new_pro"
|
||||
"user": "mh_dev",
|
||||
"password": "d9qy46ONI0ZTF9eH",
|
||||
"db_name": "mh_dev"
|
||||
},
|
||||
"wx": {
|
||||
"app_id": "wx806c079463b5b56c",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user