minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、系统列表优化，增加小程序ID展示和筛选；

Browse Source 
2、新增系统用户时，如果是店员则同步更新user表的店员姓名；
This commit is contained in:
chenlin 2025-02-05 16:44:34 +08:00
parent eb9a6e3a7d
commit 54eb867d40
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/admin/apis/system/sysuser.go
View File

@ -29,6 +29,7 @@ import (
// @Param nickName query string false "昵称" // @Param nickName query string false "昵称"
// @Param storeId query string false "门店id" // @Param storeId query string false "门店id"
// @Param shopper_code query string false "店员兑换码" // @Param shopper_code query string false "店员兑换码"
// @Param uid query string false "小程序ID"
// @Param is_export query string false "是否导出：1-导出" // @Param is_export query string false "是否导出：1-导出"
// @Success 200 {object} models.SysUserListResp // @Success 200 {object} models.SysUserListResp
// @Router /api/v1/sysUserList [get] // @Router /api/v1/sysUserList [get]
@ -48,14 +49,16 @@ func GetSysUserList(c *gin.Context) {
if index != "" { if index != "" {
pageIndex, err = tools.StringToInt(index) pageIndex, err = tools.StringToInt(index)
} }
data.Username = c.Request.FormValue("username") // 用户名称 data.Username = c.Request.FormValue("username") // 用户名称
data.Status = c.Request.FormValue("status") // 状态 data.Status = c.Request.FormValue("status") // 状态
data.Phone = c.Request.FormValue("phone") // 手机号 data.Phone = c.Request.FormValue("phone") // 手机号
strRoleId := c.Request.FormValue("roleId") // 用户角色 strRoleId := c.Request.FormValue("roleId") // 用户角色
data.NickName = c.Request.FormValue("nickName") // 用户昵称 data.NickName = c.Request.FormValue("nickName") // 用户昵称
strStoreId := c.Request.FormValue("storeId") // 门店id strStoreId := c.Request.FormValue("storeId") // 门店id
data.ShopperCode = c.Request.FormValue("shopper_code") // 店员兑换码 data.ShopperCode = c.Request.FormValue("shopper_code") // 店员兑换码
exportFlag := c.Request.FormValue("is_export") // 是否导出excel UidFlag, _ := tools.StringToInt(c.Request.FormValue("uid")) // 小程序ID
data.Uid = uint32(UidFlag)
exportFlag := c.Request.FormValue("is_export") // 是否导出excel
export := 0 export := 0
if exportFlag != "" { if exportFlag != "" {
export, _ = tools.StringToInt(exportFlag) export, _ = tools.StringToInt(exportFlag)
@ -301,7 +304,8 @@ func InsertSysUser(c *gin.Context) {
// 如果添加了小程序id，则需要更新user表的user_type字段为2-店员 // 如果添加了小程序id，则需要更新user表的user_type字段为2-店员
if req.Uid != 0 { if req.Uid != 0 {
err = models.UpdateUserType(begin, req.Uid, models.UserTypeShopAssistant, uint32(req.RoleId)) err = models.UpdateUserTypeAndShopperName(begin, req.Uid, models.UserTypeShopAssistant, uint32(req.RoleId),
req.NickName)
if err != nil { if err != nil {
begin.Rollback() begin.Rollback()
logger.Error("UpdateUserType err:", logger.Field("err", err)) logger.Error("UpdateUserType err:", logger.Field("err", err))

16
app/admin/models/sysuser.go
View File

@ -688,6 +688,22 @@ func UpdateUserType(begin *gorm.DB, uid, nType, roleId uint32) error {
return nil return nil
} }
// UpdateUserTypeAndShopperName 更新uid的user_type为2 和 店员名称
func UpdateUserTypeAndShopperName(begin *gorm.DB, uid, nType, roleId uint32, shopperName string) error {
// 更新库存表
err := begin.Table("user").Where("uid = ?", uid).
Updates(map[string]interface{}{
"user_type": nType,
"xcx_role_id": roleId,
"shop_assistant_name": shopperName,
}).Error
if err != nil {
return err
}
return nil
}
// GetUserEffectiveStore 获取店员当前的有效门店（邀请客户时使用） // GetUserEffectiveStore 获取店员当前的有效门店（邀请客户时使用）
func GetUserEffectiveStore(uid uint32) ([]StoreInfo, error) { func GetUserEffectiveStore(uid uint32) ([]StoreInfo, error) {
user := new(SysUser) user := new(SysUser)