diff --git a/app/admin/apis/basic/commodity.go b/app/admin/apis/basic/commodity.go index ad6cc32..72c8bb1 100644 --- a/app/admin/apis/basic/commodity.go +++ b/app/admin/apis/basic/commodity.go @@ -319,6 +319,8 @@ func CommodityEdit(c *gin.Context) { return } + // todo 同步更新库存表和库存商品表的"指导零售价"和"最低零售价" + app.OK(c, commodity, "") return } diff --git a/app/admin/apis/usermanage/user.go b/app/admin/apis/usermanage/user.go index 7b734b2..3feef71 100644 --- a/app/admin/apis/usermanage/user.go +++ b/app/admin/apis/usermanage/user.go @@ -20,18 +20,18 @@ func UserList(c *gin.Context) { req := struct { Page int `json:"pageIndex"` PageSize int `json:"pageSize"` - Tel string `json:"tel"` // 电话 - Uid int `json:"uid"` // 用户id - CooperativeBusinessId int `json:"cooperative_business_id"` - MemberLevel int `json:"memberLevel"` - StoreId int `json:"store_id"` // 门店id - UserType int `json:"user_type"` // 用户类型 用户类型 1-普通用户 2-店员 - StartTime string `json:"startTime"` // 开始时间 - EndTime string `json:"endTime"` // 结束时间 - NameKey string `json:"nameKey"` // 昵称搜索 - SortField string `json:"sort_field"` //排序字段 - SortType string `json:"sort_type"` //排序类型 - Filter bool `json:"filter"` //是否过滤无滞纳金已标记用户 + Tel string `json:"tel"` // 电话 + Uid int `json:"uid"` // 用户id + CooperativeBusinessId int `json:"cooperative_business_id"` // 合作商id + MemberLevel int `json:"memberLevel"` // 会员等级 + StoreId int `json:"store_id"` // 门店id + UserType int `json:"user_type"` // 用户类型 用户类型 1-普通用户 2-店员 + StartTime string `json:"startTime"` // 开始时间 + EndTime string `json:"endTime"` // 结束时间 + NameKey string `json:"nameKey"` // 昵称搜索 + SortField string `json:"sort_field"` // 排序字段 + SortType string `json:"sort_type"` // 排序类型 + Filter bool `json:"filter"` // 是否过滤无滞纳金已标记用户 }{ Page: 1, PageSize: 10, @@ -101,6 +101,61 @@ func UserList(c *gin.Context) { app.OK(c, ret, "") } +// NewUserList 所有用户 +// @Summary 所有用户 +// @Tags 会员管理 +// @Produce json +// @Accept json +// @Param request body models.NewUserListReq true "所有用户模型" +// @Success 200 {object} models.U +// @Router /api/v1/user_info/list [post] +func NewUserList(c *gin.Context) { + var req = new(models.NewUserListReq) + if c.ShouldBindJSON(&req) != nil { + logger.Errorf("para err") + app.Error(c, http.StatusBadRequest, errors.New("para err"), "参数错误") + return + } + + fmt.Printf("req: %+v \n", req) + userList, _, count, err := models.GetNewUserList(req) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + app.Error(c, http.StatusInternalServerError, err, "查询失败") + return + } + + var uids []uint32 + for _, u := range userList { + if u.MemberExpireDays > 0 { + uids = append(uids, u.Uid) + } + } + //未归还卡带 + cards, err := models.GetUserExpiredCards(uids) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + app.Error(c, http.StatusInternalServerError, err, "查询失败") + return + } + for i, u := range userList { + c, ok := cards[u.Uid] + if ok { + userList[i].OrderCards = c + //滞纳金 一个卡带一天2块钱 + userList[i].ForfeitPenalty = len(c) * 200 * int(userList[i].MemberExpireDays) + } + } + + ret := map[string]interface{}{ + "count": count, + "list": userList, + "pageIndex": req.PageIndex, + "total_page": req.PageSize, + } + app.OK(c, ret, "") +} + func CommonProblemList(c *gin.Context) { commonProblem := &models.CommonProblem{} list, err := commonProblem.List() diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index 8073356..eed24a2 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -427,6 +427,9 @@ func (m *ErpOrderListReq) List() (*ErpOrderListResp, error) { if m.RetailType != "" { qs = qs.Where("retail_type=?", m.RetailType) } + if m.Uid != 0 { + qs = qs.Where("uid=?", m.Uid) + } if m.Tel != "" { qs = qs.Where("tel=?", m.Tel) } @@ -2600,21 +2603,55 @@ func checkOrderData(req *ErpOrderCreateReq, sysUser *SysUser) (*ErpOrder, error) VmCount: req.VmAmount, } - commodityMap := make(map[uint32]ErpCommodity) + commodityMap := make(map[uint32]ErpStockCommodity) + imeiCommodityMap := make(map[string]ErpStockCommodity) if req.RetailType == RetailTypeSale { // 零售订单，查商品表信息 - commodityIds := make([]uint32, 0, len(req.ErpOrderCommodities)) + commodityIds := make([]uint32, 0, len(req.ErpOrderCommodities)) // 非串码商品的商品id列表 + imeiList := make([]string, 0, len(req.ErpOrderCommodities)) // 串码商品的串码列表 for i, _ := range req.ErpOrderCommodities { - commodityIds = append(commodityIds, req.ErpOrderCommodities[i].ErpCommodityId) - } - var commodities []ErpCommodity - err := orm.Eloquent.Table("erp_commodity").Where("id IN (?)", commodityIds).Find(&commodities).Error - if err != nil { - logger.Error("commodities err:", logger.Field("err", err)) - return nil, errors.New("操作失败:" + err.Error()) + if req.ErpOrderCommodities[i].IMEIType == 1 { // 非串码商品 + commodityIds = append(commodityIds, req.ErpOrderCommodities[i].ErpCommodityId) + } else { // 串码商品 + imeiList = append(imeiList, req.ErpOrderCommodities[i].IMEI) + } } - for i, _ := range commodities { - commodityMap[commodities[i].ID] = commodities[i] + // 商品的相关价格以库存表为准，商品表的价格除了最低零售价，其他只是参考 + // 串码商品直接查询；非串码商品查询库存时间最久的商品 + var commodities []ErpStockCommodity + if len(imeiList) != 0 { + err := orm.Eloquent.Table("erp_stock_commodity").Where("imei IN (?)", imeiList). + Find(&commodities).Error + if err != nil { + logger.Error("get commodities err:", logger.Field("err", err)) + return nil, errors.New("操作失败:" + err.Error()) + } + + for i, _ := range commodities { // 串码 + imeiCommodityMap[commodities[i].IMEI] = commodities[i] + } + } + + if len(commodityIds) != 0 { + commodities = nil + err = orm.Eloquent.Table("erp_stock_commodity").Where("erp_commodity_id IN (?)", commodityIds). + Find(&commodities).Error + if err != nil { + logger.Error("get commodities err:", logger.Field("err", err)) + return nil, errors.New("操作失败:" + err.Error()) + } + + for i, _ := range commodities { // 非串码 + v, ok := commodityMap[req.ErpOrderCommodities[i].ErpCommodityId] + if !ok { // 没有则直接添加 + commodityMap[commodities[i].ErpCommodityId] = commodities[i] + } else { + // 已有则比较非串码的入库时间，添加入库时间最早的商品 + if commodities[i].FirstStockTime.Before(v.FirstStockTime) { + commodityMap[commodities[i].ErpCommodityId] = commodities[i] + } + } + } } // 更新用户信息表，添加首次零售订单时间 @@ -2684,27 +2721,36 @@ func checkOrderData(req *ErpOrderCreateReq, sysUser *SysUser) (*ErpOrder, error) erpOrder.TotalStaffProfit += StaffProfit } else if req.RetailType == RetailTypeSale { // 零售订单 - v, ok := commodityMap[req.ErpOrderCommodities[i].ErpCommodityId] - if ok { - // 零售订单需校验商品是否有库存 - if !CommodityIsHaveStock(req.ErpOrderCommodities[i], req.StoreId) { - logger.Error("商品" + "[" + v.Name + "]库存不足, 门店:" + req.StoreName) - return nil, errors.New("商品" + "[" + v.Name + "]库存不足") + var v ErpStockCommodity + var ok bool + if req.ErpOrderCommodities[i].IMEIType == 1 { // 非串码商品 + v, ok = commodityMap[req.ErpOrderCommodities[i].ErpCommodityId] + if !ok { + return nil, errors.New("遍历商品信息报错") + } + } else { // 串码商品 + v, ok = imeiCommodityMap[req.ErpOrderCommodities[i].IMEI] + if !ok { + return nil, errors.New("遍历商品信息报错") } - - req.ErpOrderCommodities[i].ID = 0 - req.ErpOrderCommodities[i].ErpCommodityId = v.ID // 商品id - req.ErpOrderCommodities[i].ErpCommodityName = v.Name // 商品名称 - req.ErpOrderCommodities[i].ErpCategoryId = v.ErpCategoryId // 分类id - req.ErpOrderCommodities[i].ErpCategoryName = v.ErpCategoryName // 分类名称 - req.ErpOrderCommodities[i].RetailPrice = v.RetailPrice // 指导零售价 - req.ErpOrderCommodities[i].MemberDiscount = v.MemberDiscount // 会员优惠 - req.ErpOrderCommodities[i].StaffCostPrice = v.StaffCostPrice // 员工成本价加价 - req.ErpOrderCommodities[i].WholesalePrice = v.WholesalePrice // 指导采购价 - } else { - return nil, errors.New("遍历商品信息报错") } + // 零售订单需校验商品是否有库存 + if !CommodityIsHaveStock(req.ErpOrderCommodities[i], req.StoreId) { + logger.Error("商品" + "[" + v.ErpCommodityName + "]库存不足, 门店:" + req.StoreName) + return nil, errors.New("商品" + "[" + v.ErpCommodityName + "]库存不足") + } + + req.ErpOrderCommodities[i].ID = 0 + req.ErpOrderCommodities[i].ErpCommodityId = v.ID // 商品id + req.ErpOrderCommodities[i].ErpCommodityName = v.ErpCommodityName // 商品名称 + req.ErpOrderCommodities[i].ErpCategoryId = v.ErpCategoryId // 分类id + req.ErpOrderCommodities[i].ErpCategoryName = v.ErpCategoryName // 分类名称 + req.ErpOrderCommodities[i].RetailPrice = v.RetailPrice // 指导零售价 + req.ErpOrderCommodities[i].MemberDiscount = v.MemberDiscount // 会员优惠 + req.ErpOrderCommodities[i].StaffCostPrice = v.StaffCostPrice // 员工成本价加价 + req.ErpOrderCommodities[i].WholesalePrice = v.WholesalePrice // 指导采购价 + if req.ErpOrderCommodities[i].PresentType == 2 && v.MinRetailPrice != 0 { // 赠送类型商品进行校验，最低零售价为0才能赠送 logger.Error("PresentType is 2, MinRetailPrice no equal 0") return nil, errors.New("赠送商品最低零售价不为0，不符合赠送条件，请检查") diff --git a/app/admin/models/user.go b/app/admin/models/user.go index e1de520..eb1a21e 100644 --- a/app/admin/models/user.go +++ b/app/admin/models/user.go @@ -28,7 +28,7 @@ type UserInfo struct { Uid uint32 `json:"uid" gorm:"column:uid;unique_index"` // MemberLevel uint32 `json:"memberLevel"` // 会员等级 1-会员 MemberExpire time.Time `json:"memberExpire"` // 会员到期时间 - OpenMemberTime time.Time `json:"open_member_time"` // 开通会员 + OpenMemberTime time.Time `json:"open_member_time"` // 开通会员时间 Bond uint32 `json:"bond"` // 保证金 WxName string `json:"wxName"` // 昵称 WxAvatar string `json:"wxAvatar"` // 头像 @@ -55,11 +55,12 @@ type UserInfo struct { Version uint32 `json:"-"` // MemberStatus uint8 `json:"member_status" gorm:"-"` // InviteTime time.Time `json:"invite_time"` // + OpenMemberLevel uint32 `json:"open_member_level"` // 开通会员级别：2-黄金会员 4-白金会员 5-黑金会员 ShopAssistantName string `json:"shop_assistant_name"` // 店员名称 RenewalTime time.Time `json:"renewal_time"` // RenewalMemberLevel uint32 `json:"renewal_member_level"` // Mark int8 `json:"mark"` // 标记 - FirstRetailOrder time.Time `json:"first_retail_order"` // + FirstRetailOrder time.Time `json:"first_retail_order"` // 首次零售开单时间 MemberLevelString string `json:"member_level_string" gorm:"-"` // 会员类型 Store *Store `json:"store" gorm:"-"` // OrderCards []OrderCard `json:"order_cards" gorm:"foreignKey:uid;references:uid"` // @@ -214,6 +215,167 @@ type OperationLog struct { type U struct { UserInfo MemberExpireDays uint32 `json:"member_expire_days"` //会员过期天数 + OrderCount int `json:"order_count"` // 消费次数 + OrderAmount int `json:"order_amount"` // 消费金额 +} + +type NewUserListReq struct { + PageIndex int `json:"pageIndex"` // 页码 + PageSize int `json:"pageSize"` // 页面条数 + Uid int `json:"uid"` // 用户id + Tel string `json:"tel"` // 手机号 + StoreId int `json:"store_id"` // 门店id + OpenMemberLevel int `json:"open_member_level"` // 首次开通租卡会员等级 + MemberLevel int `json:"memberLevel"` // 当前会员等级 + CreateStartTime string `json:"create_startTime"` // 注册小程序-开始时间 + CreateEndTime string `json:"create_endTime"` // 注册小程序-结束时间 + OrderStartTime string `json:"order_startTime"` // 首次零售开单-开始时间 + OrderEndTime string `json:"order_endTime"` // 首次零售开单-结束时间 + OpenStartTime string `json:"open_startTime"` // 首次开通租卡会员-开始时间 + OpenEndTime string `json:"open_endTime"` // 首次开通租卡会员-结束时间 + Filter bool `json:"filter"` // 是否过滤无滞纳金已标记用户 +} + +func GetNewUserList(req *NewUserListReq) ([]U, uint32, uint32, error) { + var ( + users = make([]U, 0) + totalPage uint32 + ) + + req.PageIndex -= 1 + if req.PageIndex < 0 { + req.PageIndex = 0 + } + + if req.PageSize == 0 { + req.PageSize = 10 + } + + sortFiled := "id" + sortType := "DESC" + + qs := orm.Eloquent.Model(&UserInfo{}).Debug() + + if req.Tel != "" { + qs = qs.Where("tel", req.Tel) + } + if req.Uid != 0 { + qs = qs.Where("uid", req.Uid) + } + if req.OpenMemberLevel != 0 { + qs = qs.Where("open_member_level", req.OpenMemberLevel) + } + if req.MemberLevel != 0 { + qs = qs.Where("member_level", req.MemberLevel) + } + if req.StoreId != 0 { + qs = qs.Where("store_id", req.StoreId) + } + + if req.CreateStartTime != "" { + parse, err := time.Parse(DateTimeFormat, req.CreateStartTime) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return users, 0, 0, err + } + qs = qs.Where("created_at > ?", parse) + } + if req.CreateEndTime != "" { + parse, err := time.Parse(DateTimeFormat, req.CreateEndTime) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return users, 0, 0, err + } + qs = qs.Where("created_at < ?", parse) + } + + if req.OrderStartTime != "" { + parse, err := time.Parse(DateTimeFormat, req.OrderStartTime) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return users, 0, 0, err + } + qs = qs.Where("first_retail_order > ?", parse) + } + if req.OrderEndTime != "" { + parse, err := time.Parse(DateTimeFormat, req.OrderEndTime) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return users, 0, 0, err + } + qs = qs.Where("first_retail_order < ?", parse) + } + + if req.OpenStartTime != "" { + parse, err := time.Parse(DateTimeFormat, req.OpenStartTime) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return users, 0, 0, err + } + qs = qs.Where("open_member_time > ?", parse) + } + if req.OpenEndTime != "" { + parse, err := time.Parse(DateTimeFormat, req.OpenEndTime) + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return users, 0, 0, err + } + qs = qs.Where("open_member_time < ?", parse) + } + + var count int64 + err := qs.Count(&count).Error + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return users, 0, 0, err + } + + currentTime := time.Now() + + // 子查询，查询消费次数和消费金额 + subQuery := fmt.Sprintf(` + SELECT uid, COUNT(*) as order_count, SUM(amount) as order_amount + FROM fund_record + WHERE fund_type NOT IN ('deposit_refund', 'express_fee_refund', 'member_expire_delay', 'recycle_card') + GROUP BY uid + HAVING COUNT(uid) > 0 + `) + + // 查询用户数据，过期天数，消费次数，消费金额 + qs = qs.Select("user.*, COALESCE(fr.order_count, 0) as order_count, COALESCE(fr.order_amount, 0) as "+ + "order_amount, CASE WHEN (user.member_level IN (2, 4, 5) AND user.member_expire < ?) "+ + "THEN DATEDIFF(?, user.member_expire) ELSE 0 END AS member_expire_days", currentTime, currentTime). + Joins(fmt.Sprintf("LEFT JOIN (%s) fr ON user.uid = fr.uid", subQuery)) + + if req.Filter { + qs = orm.Eloquent.Table("(?) as a", qs) + qs = qs.Select("a.*"). + Joins("inner join order_card as oc on a.uid=oc.uid"). + Where("pay_status = ? AND card_status IN (?)", 2, []int{1, 2, 3}). + Group("oc.uid"). + Having("count(oc.uid) > 0") + + qs = qs.Where("member_expire_days > 0").Where("mark = ?", UNMARK) + + err = qs.Find(&users).Error + if err != nil && err != RecordNotFound { + logger.Errorf("err:", logger.Field("err", err)) + return nil, 0, 0, err + } + + count = int64(len(users)) + users = nil + } + + err = qs.Order(fmt.Sprintf("%s %s", sortFiled, sortType)).Offset(req.PageIndex * req.PageSize).Limit(req.PageSize).Find(&users).Error + if err != nil && err != RecordNotFound { + logger.Errorf("err:", logger.Field("err", err)) + return nil, 0, 0, err + } + + totalPage = uint32(int(count)/req.PageSize + 1) + + return users, totalPage, uint32(count), nil } func GetUserList(page, pageSize, uid, memberLevel, storeId, userType, cooperativeBusinessId int, tel, startTime, endTime, nameKey, sortFiled, sortType string, filter bool) ([]U, uint32, uint32, error) { diff --git a/app/admin/router/usermanage.go b/app/admin/router/usermanage.go index 16fefc9..ac8a0a8 100644 --- a/app/admin/router/usermanage.go +++ b/app/admin/router/usermanage.go @@ -11,7 +11,7 @@ import ( func registerUserManageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { userInfo := v1.Group("/user_info").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - userInfo.POST("/list", usermanage.UserList) + userInfo.POST("/list", usermanage.NewUserList) userInfo.POST("/invite_derive", usermanage.ExportDataUser) userInfo.POST("/mark", usermanage.MarkUser) userInfo.POST("/tel", usermanage.TelList) diff --git a/docs/docs.go b/docs/docs.go index 809e6d0..4751fef 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -3908,6 +3908,39 @@ const docTemplate = `{ } } }, + "/api/v1/user_info/list": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员管理" + ], + "summary": "所有用户", + "parameters": [ + { + "description": "所有用户模型", + "name": "request", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/models.NewUserListReq" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/models.U" + } + } + } + } + }, "/api/v1/user_info/tel": { "post": { "consumes": [ @@ -6480,6 +6513,91 @@ const docTemplate = `{ } } }, + "models.GameCard": { + "type": "object", + "properties": { + "coverImg": { + "description": "封面", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "detailImg": { + "description": "详情图片", + "type": "string" + }, + "detailInfo": { + "description": "详情描述", + "type": "string" + }, + "estimate_vm": { + "description": "预计积分", + "type": "integer" + }, + "gameTime": { + "description": "游戏时间", + "type": "integer" + }, + "gameTypeId": { + "description": "游戏类型id", + "type": "integer" + }, + "goodsGalleryUrl": { + "description": "轮播图", + "type": "string" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "likes": { + "description": "点赞", + "type": "integer" + }, + "name": { + "description": "名称", + "type": "string" + }, + "newProducts": { + "description": "新品: 1-新品 2-非新品", + "type": "integer" + }, + "orderCount": { + "description": "订单数", + "type": "integer" + }, + "playability": { + "description": "耐玩度", + "type": "integer" + }, + "playfulness": { + "description": "好玩度", + "type": "integer" + }, + "price": { + "description": "价格", + "type": "integer" + }, + "real_price": { + "description": "真实价格", + "type": "integer" + }, + "status": { + "description": "状态: 1-上架 2-下架", + "type": "integer" + }, + "video_link": { + "description": "链接", + "type": "string" + }, + "viewCount": { + "description": "查看人数", + "type": "integer" + } + } + }, "models.InsertSysUserReq": { "type": "object", "properties": { @@ -6767,6 +6885,387 @@ const docTemplate = `{ } } }, + "models.NewUserListReq": { + "type": "object", + "properties": { + "create_endTime": { + "description": "注册小程序-结束时间", + "type": "string" + }, + "create_startTime": { + "description": "注册小程序-开始时间", + "type": "string" + }, + "filter": { + "description": "是否过滤无滞纳金已标记用户", + "type": "boolean" + }, + "memberLevel": { + "description": "当前会员等级", + "type": "integer" + }, + "open_endTime": { + "description": "首次开通租卡会员-结束时间", + "type": "string" + }, + "open_member_level": { + "description": "首次开通租卡会员等级", + "type": "integer" + }, + "open_startTime": { + "description": "首次开通租卡会员-开始时间", + "type": "string" + }, + "order_endTime": { + "description": "首次零售开单-结束时间", + "type": "string" + }, + "order_startTime": { + "description": "首次零售开单-开始时间", + "type": "string" + }, + "pageIndex": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "页面条数", + "type": "integer" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "tel": { + "description": "手机号", + "type": "string" + }, + "uid": { + "description": "用户id", + "type": "integer" + } + } + }, + "models.Order": { + "type": "object", + "properties": { + "card_status": { + "description": "1-待取货中 2-游玩中 3-归还中 4-已完成 5-已取消", + "type": "integer" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "count": { + "description": "数量", + "type": "integer" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deliver_shopper_code": { + "description": "发货店员码", + "type": "string" + }, + "delivery_time": { + "description": "发货时间", + "type": "string" + }, + "delivery_type": { + "description": "取货类型 1-门店自取 2-快递", + "type": "integer" + }, + "express_company": { + "description": "物流公司", + "type": "string" + }, + "express_company_no": { + "description": "物流公司编号", + "type": "string" + }, + "express_duration": { + "description": "物流时长", + "type": "integer" + }, + "express_no": { + "description": "物流单号", + "type": "string" + }, + "game_card_goods_id": { + "description": "游戏卡id", + "type": "integer" + }, + "game_card_id": { + "description": "游戏id", + "type": "integer" + }, + "game_card_serial_number": { + "description": "游戏卡编号", + "type": "string" + }, + "game_card_serial_numbers": { + "type": "array", + "items": { + "type": "string" + } + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "order_cards": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OrderCard" + } + }, + "order_sn": { + "description": "订单编号", + "type": "string" + }, + "pay_price": { + "description": "实际付款金额(包含运费)", + "type": "integer" + }, + "pay_status": { + "description": "支付状态 1-未支付 2-已支付", + "type": "integer" + }, + "pay_time": { + "description": "支付时间", + "type": "string" + }, + "phone_ext": { + "type": "string" + }, + "pickup_code": { + "description": "取货码", + "type": "string" + }, + "postage": { + "description": "邮费", + "type": "integer" + }, + "receipt_time": { + "description": "收货时间 签收时间", + "type": "string" + }, + "revert_express_company": { + "description": "归还物流公司", + "type": "string" + }, + "revert_express_company_no": { + "description": "归还物流公司编号", + "type": "string" + }, + "revert_express_duration": { + "description": "归还物流时长", + "type": "integer" + }, + "revert_express_no": { + "description": "归还物流单号", + "type": "string" + }, + "revert_shopper_code": { + "type": "string" + }, + "revert_store_id": { + "description": "归还门店id", + "type": "integer" + }, + "revert_time": { + "description": "归还时间", + "type": "string" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "uid": { + "type": "integer" + }, + "user": { + "$ref": "#/definitions/models.UserInfo" + }, + "user_address_id": { + "description": "地址id", + "type": "integer" + } + } + }, + "models.OrderCard": { + "type": "object", + "properties": { + "card_status": { + "description": "1-待取货中 2-游玩中 3-归还中 4-已完成 5-已取消", + "type": "integer" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "cover_img": { + "description": "封面", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deliver_shopper": { + "description": "发货店员", + "allOf": [ + { + "$ref": "#/definitions/models.ShopperPromotionCode" + } + ] + }, + "deliver_shopper_code": { + "description": "发货店员码", + "type": "string" + }, + "delivery_time": { + "description": "发货时间", + "type": "string" + }, + "delivery_type": { + "description": "取货类型 1-门店自取 2-快递", + "type": "integer" + }, + "express_company": { + "description": "物流公司", + "type": "string" + }, + "express_company_no": { + "description": "物流公司编号", + "type": "string" + }, + "express_no": { + "description": "物流单号", + "type": "string" + }, + "game_card": { + "description": "卡带信息", + "allOf": [ + { + "$ref": "#/definitions/models.GameCard" + } + ] + }, + "game_card_goods_id": { + "description": "游戏卡id", + "type": "integer" + }, + "game_card_id": { + "description": "游戏id", + "type": "integer" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "issue_type": { + "description": "问题类型: 1-问题反馈 2-正常", + "type": "integer" + }, + "name": { + "description": "名称", + "type": "string" + }, + "order": { + "description": "订单", + "allOf": [ + { + "$ref": "#/definitions/models.Order" + } + ] + }, + "order_id": { + "type": "integer" + }, + "pay_status": { + "description": "支付状态 1-未支付 2-已支付", + "type": "integer" + }, + "postage": { + "description": "邮费", + "type": "integer" + }, + "price": { + "description": "价格", + "type": "integer" + }, + "receipt_time": { + "description": "收货时间 签收时间", + "type": "string" + }, + "revert_express_company": { + "description": "归还物流公司", + "type": "string" + }, + "revert_express_company_no": { + "description": "归还物流公司编号", + "type": "string" + }, + "revert_express_duration": { + "description": "归还物流时长", + "type": "integer" + }, + "revert_express_no": { + "description": "归还物流单号", + "type": "string" + }, + "revert_shopper": { + "description": "收货店员", + "allOf": [ + { + "$ref": "#/definitions/models.ShopperPromotionCode" + } + ] + }, + "revert_shopper_code": { + "description": "收货识别码", + "type": "string" + }, + "revert_store": { + "description": "归还门店", + "allOf": [ + { + "$ref": "#/definitions/models.Store" + } + ] + }, + "revert_store_id": { + "description": "归还门店id", + "type": "integer" + }, + "revert_time": { + "description": "归还时间", + "type": "string" + }, + "serial_number": { + "description": "编号", + "type": "string" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "uid": { + "type": "integer" + } + } + }, "models.OrderListReq": { "type": "object", "properties": { @@ -7074,6 +7573,34 @@ const docTemplate = `{ } } }, + "models.ShopperPromotionCode": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "state": { + "type": "integer" + }, + "store_id": { + "type": "integer" + }, + "uid": { + "type": "integer" + }, + "user": { + "$ref": "#/definitions/models.UserInfo" + } + } + }, "models.Store": { "type": "object", "properties": { @@ -7919,6 +8446,336 @@ const docTemplate = `{ } } }, + "models.U": { + "type": "object", + "properties": { + "appOpenID": { + "type": "string" + }, + "bond": { + "description": "保证金", + "type": "integer" + }, + "city": { + "description": "城市", + "type": "string" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "country": { + "description": "市", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deposit": { + "description": "押金", + "type": "integer" + }, + "first_retail_order": { + "description": "首次零售开单时间", + "type": "string" + }, + "forfeit_penalty": { + "description": "滞纳金", + "type": "integer" + }, + "gender": { + "description": "性别", + "type": "integer" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "in_black": { + "description": "是否在黑名单", + "type": "boolean" + }, + "invite_code_url": { + "description": "分享二维码", + "type": "string" + }, + "invite_time": { + "type": "string" + }, + "last_login_at": { + "description": "最近登录时间", + "type": "string" + }, + "mark": { + "description": "标记", + "type": "integer" + }, + "memberExpire": { + "description": "会员到期时间", + "type": "string" + }, + "memberLevel": { + "description": "会员等级 1-会员", + "type": "integer" + }, + "member_expire_days": { + "description": "会员过期天数", + "type": "integer" + }, + "member_level_string": { + "description": "会员类型", + "type": "string" + }, + "member_open_time": { + "type": "string" + }, + "member_status": { + "type": "integer" + }, + "open_member_channel": { + "description": "开通会员渠道: -门店推广 -用户邀请 -兑换码", + "type": "string" + }, + "open_member_level": { + "description": "开通会员级别：2-黄金会员 4-白金会员 5-黑金会员", + "type": "integer" + }, + "open_member_time": { + "description": "开通会员", + "type": "string" + }, + "order_amount": { + "description": "消费金额", + "type": "integer" + }, + "order_cards": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OrderCard" + } + }, + "order_count": { + "description": "消费次数", + "type": "integer" + }, + "province": { + "description": "省", + "type": "string" + }, + "renewal_member_level": { + "type": "integer" + }, + "renewal_time": { + "type": "string" + }, + "shop_assistant_name": { + "description": "店员名称", + "type": "string" + }, + "store": { + "$ref": "#/definitions/models.Store" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "tel": { + "description": "电话", + "type": "string" + }, + "uid": { + "type": "integer" + }, + "user_type": { + "description": "用户类型 1-普通用户 2-店员", + "type": "integer" + }, + "wxAvatar": { + "description": "头像", + "type": "string" + }, + "wxName": { + "description": "昵称", + "type": "string" + }, + "wxOpenID": { + "description": "微信openid", + "type": "string" + }, + "wxUnionID": { + "description": "微信unionId", + "type": "string" + }, + "xcx_role_id": { + "description": "角色id", + "type": "integer" + } + } + }, + "models.UserInfo": { + "type": "object", + "properties": { + "appOpenID": { + "type": "string" + }, + "bond": { + "description": "保证金", + "type": "integer" + }, + "city": { + "description": "城市", + "type": "string" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "country": { + "description": "市", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deposit": { + "description": "押金", + "type": "integer" + }, + "first_retail_order": { + "description": "首次零售开单时间", + "type": "string" + }, + "forfeit_penalty": { + "description": "滞纳金", + "type": "integer" + }, + "gender": { + "description": "性别", + "type": "integer" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "in_black": { + "description": "是否在黑名单", + "type": "boolean" + }, + "invite_code_url": { + "description": "分享二维码", + "type": "string" + }, + "invite_time": { + "type": "string" + }, + "last_login_at": { + "description": "最近登录时间", + "type": "string" + }, + "mark": { + "description": "标记", + "type": "integer" + }, + "memberExpire": { + "description": "会员到期时间", + "type": "string" + }, + "memberLevel": { + "description": "会员等级 1-会员", + "type": "integer" + }, + "member_level_string": { + "description": "会员类型", + "type": "string" + }, + "member_open_time": { + "type": "string" + }, + "member_status": { + "type": "integer" + }, + "open_member_channel": { + "description": "开通会员渠道: -门店推广 -用户邀请 -兑换码", + "type": "string" + }, + "open_member_level": { + "description": "开通会员级别：2-黄金会员 4-白金会员 5-黑金会员", + "type": "integer" + }, + "open_member_time": { + "description": "开通会员", + "type": "string" + }, + "order_cards": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OrderCard" + } + }, + "province": { + "description": "省", + "type": "string" + }, + "renewal_member_level": { + "type": "integer" + }, + "renewal_time": { + "type": "string" + }, + "shop_assistant_name": { + "description": "店员名称", + "type": "string" + }, + "store": { + "$ref": "#/definitions/models.Store" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "tel": { + "description": "电话", + "type": "string" + }, + "uid": { + "type": "integer" + }, + "user_type": { + "description": "用户类型 1-普通用户 2-店员", + "type": "integer" + }, + "wxAvatar": { + "description": "头像", + "type": "string" + }, + "wxName": { + "description": "昵称", + "type": "string" + }, + "wxOpenID": { + "description": "微信openid", + "type": "string" + }, + "wxUnionID": { + "description": "微信unionId", + "type": "string" + }, + "xcx_role_id": { + "description": "角色id", + "type": "integer" + } + } + }, "tools.Params": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index 4843f40..771ed45 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -3897,6 +3897,39 @@ } } }, + "/api/v1/user_info/list": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员管理" + ], + "summary": "所有用户", + "parameters": [ + { + "description": "所有用户模型", + "name": "request", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/models.NewUserListReq" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/models.U" + } + } + } + } + }, "/api/v1/user_info/tel": { "post": { "consumes": [ @@ -6469,6 +6502,91 @@ } } }, + "models.GameCard": { + "type": "object", + "properties": { + "coverImg": { + "description": "封面", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "detailImg": { + "description": "详情图片", + "type": "string" + }, + "detailInfo": { + "description": "详情描述", + "type": "string" + }, + "estimate_vm": { + "description": "预计积分", + "type": "integer" + }, + "gameTime": { + "description": "游戏时间", + "type": "integer" + }, + "gameTypeId": { + "description": "游戏类型id", + "type": "integer" + }, + "goodsGalleryUrl": { + "description": "轮播图", + "type": "string" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "likes": { + "description": "点赞", + "type": "integer" + }, + "name": { + "description": "名称", + "type": "string" + }, + "newProducts": { + "description": "新品: 1-新品 2-非新品", + "type": "integer" + }, + "orderCount": { + "description": "订单数", + "type": "integer" + }, + "playability": { + "description": "耐玩度", + "type": "integer" + }, + "playfulness": { + "description": "好玩度", + "type": "integer" + }, + "price": { + "description": "价格", + "type": "integer" + }, + "real_price": { + "description": "真实价格", + "type": "integer" + }, + "status": { + "description": "状态: 1-上架 2-下架", + "type": "integer" + }, + "video_link": { + "description": "链接", + "type": "string" + }, + "viewCount": { + "description": "查看人数", + "type": "integer" + } + } + }, "models.InsertSysUserReq": { "type": "object", "properties": { @@ -6756,6 +6874,387 @@ } } }, + "models.NewUserListReq": { + "type": "object", + "properties": { + "create_endTime": { + "description": "注册小程序-结束时间", + "type": "string" + }, + "create_startTime": { + "description": "注册小程序-开始时间", + "type": "string" + }, + "filter": { + "description": "是否过滤无滞纳金已标记用户", + "type": "boolean" + }, + "memberLevel": { + "description": "当前会员等级", + "type": "integer" + }, + "open_endTime": { + "description": "首次开通租卡会员-结束时间", + "type": "string" + }, + "open_member_level": { + "description": "首次开通租卡会员等级", + "type": "integer" + }, + "open_startTime": { + "description": "首次开通租卡会员-开始时间", + "type": "string" + }, + "order_endTime": { + "description": "首次零售开单-结束时间", + "type": "string" + }, + "order_startTime": { + "description": "首次零售开单-开始时间", + "type": "string" + }, + "pageIndex": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "页面条数", + "type": "integer" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "tel": { + "description": "手机号", + "type": "string" + }, + "uid": { + "description": "用户id", + "type": "integer" + } + } + }, + "models.Order": { + "type": "object", + "properties": { + "card_status": { + "description": "1-待取货中 2-游玩中 3-归还中 4-已完成 5-已取消", + "type": "integer" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "count": { + "description": "数量", + "type": "integer" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deliver_shopper_code": { + "description": "发货店员码", + "type": "string" + }, + "delivery_time": { + "description": "发货时间", + "type": "string" + }, + "delivery_type": { + "description": "取货类型 1-门店自取 2-快递", + "type": "integer" + }, + "express_company": { + "description": "物流公司", + "type": "string" + }, + "express_company_no": { + "description": "物流公司编号", + "type": "string" + }, + "express_duration": { + "description": "物流时长", + "type": "integer" + }, + "express_no": { + "description": "物流单号", + "type": "string" + }, + "game_card_goods_id": { + "description": "游戏卡id", + "type": "integer" + }, + "game_card_id": { + "description": "游戏id", + "type": "integer" + }, + "game_card_serial_number": { + "description": "游戏卡编号", + "type": "string" + }, + "game_card_serial_numbers": { + "type": "array", + "items": { + "type": "string" + } + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "order_cards": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OrderCard" + } + }, + "order_sn": { + "description": "订单编号", + "type": "string" + }, + "pay_price": { + "description": "实际付款金额(包含运费)", + "type": "integer" + }, + "pay_status": { + "description": "支付状态 1-未支付 2-已支付", + "type": "integer" + }, + "pay_time": { + "description": "支付时间", + "type": "string" + }, + "phone_ext": { + "type": "string" + }, + "pickup_code": { + "description": "取货码", + "type": "string" + }, + "postage": { + "description": "邮费", + "type": "integer" + }, + "receipt_time": { + "description": "收货时间 签收时间", + "type": "string" + }, + "revert_express_company": { + "description": "归还物流公司", + "type": "string" + }, + "revert_express_company_no": { + "description": "归还物流公司编号", + "type": "string" + }, + "revert_express_duration": { + "description": "归还物流时长", + "type": "integer" + }, + "revert_express_no": { + "description": "归还物流单号", + "type": "string" + }, + "revert_shopper_code": { + "type": "string" + }, + "revert_store_id": { + "description": "归还门店id", + "type": "integer" + }, + "revert_time": { + "description": "归还时间", + "type": "string" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "uid": { + "type": "integer" + }, + "user": { + "$ref": "#/definitions/models.UserInfo" + }, + "user_address_id": { + "description": "地址id", + "type": "integer" + } + } + }, + "models.OrderCard": { + "type": "object", + "properties": { + "card_status": { + "description": "1-待取货中 2-游玩中 3-归还中 4-已完成 5-已取消", + "type": "integer" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "cover_img": { + "description": "封面", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deliver_shopper": { + "description": "发货店员", + "allOf": [ + { + "$ref": "#/definitions/models.ShopperPromotionCode" + } + ] + }, + "deliver_shopper_code": { + "description": "发货店员码", + "type": "string" + }, + "delivery_time": { + "description": "发货时间", + "type": "string" + }, + "delivery_type": { + "description": "取货类型 1-门店自取 2-快递", + "type": "integer" + }, + "express_company": { + "description": "物流公司", + "type": "string" + }, + "express_company_no": { + "description": "物流公司编号", + "type": "string" + }, + "express_no": { + "description": "物流单号", + "type": "string" + }, + "game_card": { + "description": "卡带信息", + "allOf": [ + { + "$ref": "#/definitions/models.GameCard" + } + ] + }, + "game_card_goods_id": { + "description": "游戏卡id", + "type": "integer" + }, + "game_card_id": { + "description": "游戏id", + "type": "integer" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "issue_type": { + "description": "问题类型: 1-问题反馈 2-正常", + "type": "integer" + }, + "name": { + "description": "名称", + "type": "string" + }, + "order": { + "description": "订单", + "allOf": [ + { + "$ref": "#/definitions/models.Order" + } + ] + }, + "order_id": { + "type": "integer" + }, + "pay_status": { + "description": "支付状态 1-未支付 2-已支付", + "type": "integer" + }, + "postage": { + "description": "邮费", + "type": "integer" + }, + "price": { + "description": "价格", + "type": "integer" + }, + "receipt_time": { + "description": "收货时间 签收时间", + "type": "string" + }, + "revert_express_company": { + "description": "归还物流公司", + "type": "string" + }, + "revert_express_company_no": { + "description": "归还物流公司编号", + "type": "string" + }, + "revert_express_duration": { + "description": "归还物流时长", + "type": "integer" + }, + "revert_express_no": { + "description": "归还物流单号", + "type": "string" + }, + "revert_shopper": { + "description": "收货店员", + "allOf": [ + { + "$ref": "#/definitions/models.ShopperPromotionCode" + } + ] + }, + "revert_shopper_code": { + "description": "收货识别码", + "type": "string" + }, + "revert_store": { + "description": "归还门店", + "allOf": [ + { + "$ref": "#/definitions/models.Store" + } + ] + }, + "revert_store_id": { + "description": "归还门店id", + "type": "integer" + }, + "revert_time": { + "description": "归还时间", + "type": "string" + }, + "serial_number": { + "description": "编号", + "type": "string" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "uid": { + "type": "integer" + } + } + }, "models.OrderListReq": { "type": "object", "properties": { @@ -7063,6 +7562,34 @@ } } }, + "models.ShopperPromotionCode": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "state": { + "type": "integer" + }, + "store_id": { + "type": "integer" + }, + "uid": { + "type": "integer" + }, + "user": { + "$ref": "#/definitions/models.UserInfo" + } + } + }, "models.Store": { "type": "object", "properties": { @@ -7908,6 +8435,336 @@ } } }, + "models.U": { + "type": "object", + "properties": { + "appOpenID": { + "type": "string" + }, + "bond": { + "description": "保证金", + "type": "integer" + }, + "city": { + "description": "城市", + "type": "string" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "country": { + "description": "市", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deposit": { + "description": "押金", + "type": "integer" + }, + "first_retail_order": { + "description": "首次零售开单时间", + "type": "string" + }, + "forfeit_penalty": { + "description": "滞纳金", + "type": "integer" + }, + "gender": { + "description": "性别", + "type": "integer" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "in_black": { + "description": "是否在黑名单", + "type": "boolean" + }, + "invite_code_url": { + "description": "分享二维码", + "type": "string" + }, + "invite_time": { + "type": "string" + }, + "last_login_at": { + "description": "最近登录时间", + "type": "string" + }, + "mark": { + "description": "标记", + "type": "integer" + }, + "memberExpire": { + "description": "会员到期时间", + "type": "string" + }, + "memberLevel": { + "description": "会员等级 1-会员", + "type": "integer" + }, + "member_expire_days": { + "description": "会员过期天数", + "type": "integer" + }, + "member_level_string": { + "description": "会员类型", + "type": "string" + }, + "member_open_time": { + "type": "string" + }, + "member_status": { + "type": "integer" + }, + "open_member_channel": { + "description": "开通会员渠道: -门店推广 -用户邀请 -兑换码", + "type": "string" + }, + "open_member_level": { + "description": "开通会员级别：2-黄金会员 4-白金会员 5-黑金会员", + "type": "integer" + }, + "open_member_time": { + "description": "开通会员", + "type": "string" + }, + "order_amount": { + "description": "消费金额", + "type": "integer" + }, + "order_cards": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OrderCard" + } + }, + "order_count": { + "description": "消费次数", + "type": "integer" + }, + "province": { + "description": "省", + "type": "string" + }, + "renewal_member_level": { + "type": "integer" + }, + "renewal_time": { + "type": "string" + }, + "shop_assistant_name": { + "description": "店员名称", + "type": "string" + }, + "store": { + "$ref": "#/definitions/models.Store" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "tel": { + "description": "电话", + "type": "string" + }, + "uid": { + "type": "integer" + }, + "user_type": { + "description": "用户类型 1-普通用户 2-店员", + "type": "integer" + }, + "wxAvatar": { + "description": "头像", + "type": "string" + }, + "wxName": { + "description": "昵称", + "type": "string" + }, + "wxOpenID": { + "description": "微信openid", + "type": "string" + }, + "wxUnionID": { + "description": "微信unionId", + "type": "string" + }, + "xcx_role_id": { + "description": "角色id", + "type": "integer" + } + } + }, + "models.UserInfo": { + "type": "object", + "properties": { + "appOpenID": { + "type": "string" + }, + "bond": { + "description": "保证金", + "type": "integer" + }, + "city": { + "description": "城市", + "type": "string" + }, + "cooperative_business_id": { + "description": "合作商id", + "type": "integer" + }, + "cooperative_name": { + "description": "合作商名称", + "type": "string" + }, + "country": { + "description": "市", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "deposit": { + "description": "押金", + "type": "integer" + }, + "first_retail_order": { + "description": "首次零售开单时间", + "type": "string" + }, + "forfeit_penalty": { + "description": "滞纳金", + "type": "integer" + }, + "gender": { + "description": "性别", + "type": "integer" + }, + "id": { + "description": "数据库记录编号", + "type": "integer" + }, + "in_black": { + "description": "是否在黑名单", + "type": "boolean" + }, + "invite_code_url": { + "description": "分享二维码", + "type": "string" + }, + "invite_time": { + "type": "string" + }, + "last_login_at": { + "description": "最近登录时间", + "type": "string" + }, + "mark": { + "description": "标记", + "type": "integer" + }, + "memberExpire": { + "description": "会员到期时间", + "type": "string" + }, + "memberLevel": { + "description": "会员等级 1-会员", + "type": "integer" + }, + "member_level_string": { + "description": "会员类型", + "type": "string" + }, + "member_open_time": { + "type": "string" + }, + "member_status": { + "type": "integer" + }, + "open_member_channel": { + "description": "开通会员渠道: -门店推广 -用户邀请 -兑换码", + "type": "string" + }, + "open_member_level": { + "description": "开通会员级别：2-黄金会员 4-白金会员 5-黑金会员", + "type": "integer" + }, + "open_member_time": { + "description": "开通会员", + "type": "string" + }, + "order_cards": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OrderCard" + } + }, + "province": { + "description": "省", + "type": "string" + }, + "renewal_member_level": { + "type": "integer" + }, + "renewal_time": { + "type": "string" + }, + "shop_assistant_name": { + "description": "店员名称", + "type": "string" + }, + "store": { + "$ref": "#/definitions/models.Store" + }, + "store_id": { + "description": "门店id", + "type": "integer" + }, + "tel": { + "description": "电话", + "type": "string" + }, + "uid": { + "type": "integer" + }, + "user_type": { + "description": "用户类型 1-普通用户 2-店员", + "type": "integer" + }, + "wxAvatar": { + "description": "头像", + "type": "string" + }, + "wxName": { + "description": "昵称", + "type": "string" + }, + "wxOpenID": { + "description": "微信openid", + "type": "string" + }, + "wxUnionID": { + "description": "微信unionId", + "type": "string" + }, + "xcx_role_id": { + "description": "角色id", + "type": "integer" + } + } + }, "tools.Params": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 4db92ef..287a4cc 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1808,6 +1808,69 @@ definitions: description: 每页展示条数 type: integer type: object + models.GameCard: + properties: + coverImg: + description: 封面 + type: string + createdAt: + description: 创建时间 + type: string + detailImg: + description: 详情图片 + type: string + detailInfo: + description: 详情描述 + type: string + estimate_vm: + description: 预计积分 + type: integer + gameTime: + description: 游戏时间 + type: integer + gameTypeId: + description: 游戏类型id + type: integer + goodsGalleryUrl: + description: 轮播图 + type: string + id: + description: 数据库记录编号 + type: integer + likes: + description: 点赞 + type: integer + name: + description: 名称 + type: string + newProducts: + description: '新品: 1-新品 2-非新品' + type: integer + orderCount: + description: 订单数 + type: integer + playability: + description: 耐玩度 + type: integer + playfulness: + description: 好玩度 + type: integer + price: + description: 价格 + type: integer + real_price: + description: 真实价格 + type: integer + status: + description: '状态: 1-上架 2-下架' + type: integer + video_link: + description: 链接 + type: string + viewCount: + description: 查看人数 + type: integer + type: object models.InsertSysUserReq: properties: account_type: @@ -2013,6 +2076,277 @@ definitions: visible: type: string type: object + models.NewUserListReq: + properties: + create_endTime: + description: 注册小程序-结束时间 + type: string + create_startTime: + description: 注册小程序-开始时间 + type: string + filter: + description: 是否过滤无滞纳金已标记用户 + type: boolean + memberLevel: + description: 当前会员等级 + type: integer + open_endTime: + description: 首次开通租卡会员-结束时间 + type: string + open_member_level: + description: 首次开通租卡会员等级 + type: integer + open_startTime: + description: 首次开通租卡会员-开始时间 + type: string + order_endTime: + description: 首次零售开单-结束时间 + type: string + order_startTime: + description: 首次零售开单-开始时间 + type: string + pageIndex: + description: 页码 + type: integer + pageSize: + description: 页面条数 + type: integer + store_id: + description: 门店id + type: integer + tel: + description: 手机号 + type: string + uid: + description: 用户id + type: integer + type: object + models.Order: + properties: + card_status: + description: 1-待取货中 2-游玩中 3-归还中 4-已完成 5-已取消 + type: integer + cooperative_business_id: + description: 合作商id + type: integer + cooperative_name: + description: 合作商名称 + type: string + count: + description: 数量 + type: integer + createdAt: + description: 创建时间 + type: string + deliver_shopper_code: + description: 发货店员码 + type: string + delivery_time: + description: 发货时间 + type: string + delivery_type: + description: 取货类型 1-门店自取 2-快递 + type: integer + express_company: + description: 物流公司 + type: string + express_company_no: + description: 物流公司编号 + type: string + express_duration: + description: 物流时长 + type: integer + express_no: + description: 物流单号 + type: string + game_card_goods_id: + description: 游戏卡id + type: integer + game_card_id: + description: 游戏id + type: integer + game_card_serial_number: + description: 游戏卡编号 + type: string + game_card_serial_numbers: + items: + type: string + type: array + id: + description: 数据库记录编号 + type: integer + order_cards: + items: + $ref: '#/definitions/models.OrderCard' + type: array + order_sn: + description: 订单编号 + type: string + pay_price: + description: 实际付款金额(包含运费) + type: integer + pay_status: + description: 支付状态 1-未支付 2-已支付 + type: integer + pay_time: + description: 支付时间 + type: string + phone_ext: + type: string + pickup_code: + description: 取货码 + type: string + postage: + description: 邮费 + type: integer + receipt_time: + description: 收货时间 签收时间 + type: string + revert_express_company: + description: 归还物流公司 + type: string + revert_express_company_no: + description: 归还物流公司编号 + type: string + revert_express_duration: + description: 归还物流时长 + type: integer + revert_express_no: + description: 归还物流单号 + type: string + revert_shopper_code: + type: string + revert_store_id: + description: 归还门店id + type: integer + revert_time: + description: 归还时间 + type: string + store_id: + description: 门店id + type: integer + uid: + type: integer + user: + $ref: '#/definitions/models.UserInfo' + user_address_id: + description: 地址id + type: integer + type: object + models.OrderCard: + properties: + card_status: + description: 1-待取货中 2-游玩中 3-归还中 4-已完成 5-已取消 + type: integer + cooperative_business_id: + description: 合作商id + type: integer + cooperative_name: + description: 合作商名称 + type: string + cover_img: + description: 封面 + type: string + createdAt: + description: 创建时间 + type: string + deliver_shopper: + allOf: + - $ref: '#/definitions/models.ShopperPromotionCode' + description: 发货店员 + deliver_shopper_code: + description: 发货店员码 + type: string + delivery_time: + description: 发货时间 + type: string + delivery_type: + description: 取货类型 1-门店自取 2-快递 + type: integer + express_company: + description: 物流公司 + type: string + express_company_no: + description: 物流公司编号 + type: string + express_no: + description: 物流单号 + type: string + game_card: + allOf: + - $ref: '#/definitions/models.GameCard' + description: 卡带信息 + game_card_goods_id: + description: 游戏卡id + type: integer + game_card_id: + description: 游戏id + type: integer + id: + description: 数据库记录编号 + type: integer + issue_type: + description: '问题类型: 1-问题反馈 2-正常' + type: integer + name: + description: 名称 + type: string + order: + allOf: + - $ref: '#/definitions/models.Order' + description: 订单 + order_id: + type: integer + pay_status: + description: 支付状态 1-未支付 2-已支付 + type: integer + postage: + description: 邮费 + type: integer + price: + description: 价格 + type: integer + receipt_time: + description: 收货时间 签收时间 + type: string + revert_express_company: + description: 归还物流公司 + type: string + revert_express_company_no: + description: 归还物流公司编号 + type: string + revert_express_duration: + description: 归还物流时长 + type: integer + revert_express_no: + description: 归还物流单号 + type: string + revert_shopper: + allOf: + - $ref: '#/definitions/models.ShopperPromotionCode' + description: 收货店员 + revert_shopper_code: + description: 收货识别码 + type: string + revert_store: + allOf: + - $ref: '#/definitions/models.Store' + description: 归还门店 + revert_store_id: + description: 归还门店id + type: integer + revert_time: + description: 归还时间 + type: string + serial_number: + description: 编号 + type: string + store_id: + description: 门店id + type: integer + uid: + type: integer + type: object models.OrderListReq: properties: card_status: @@ -2236,6 +2570,25 @@ definitions: description: 门店名称 type: string type: object + models.ShopperPromotionCode: + properties: + code: + type: string + createdAt: + description: 创建时间 + type: string + id: + description: 数据库记录编号 + type: integer + state: + type: integer + store_id: + type: integer + uid: + type: integer + user: + $ref: '#/definitions/models.UserInfo' + type: object models.Store: properties: address: @@ -2847,6 +3200,247 @@ definitions: required: - phone_num type: object + models.U: + properties: + appOpenID: + type: string + bond: + description: 保证金 + type: integer + city: + description: 城市 + type: string + cooperative_business_id: + description: 合作商id + type: integer + cooperative_name: + description: 合作商名称 + type: string + country: + description: 市 + type: string + createdAt: + description: 创建时间 + type: string + deposit: + description: 押金 + type: integer + first_retail_order: + description: 首次零售开单时间 + type: string + forfeit_penalty: + description: 滞纳金 + type: integer + gender: + description: 性别 + type: integer + id: + description: 数据库记录编号 + type: integer + in_black: + description: 是否在黑名单 + type: boolean + invite_code_url: + description: 分享二维码 + type: string + invite_time: + type: string + last_login_at: + description: 最近登录时间 + type: string + mark: + description: 标记 + type: integer + member_expire_days: + description: 会员过期天数 + type: integer + member_level_string: + description: 会员类型 + type: string + member_open_time: + type: string + member_status: + type: integer + memberExpire: + description: 会员到期时间 + type: string + memberLevel: + description: 会员等级 1-会员 + type: integer + open_member_channel: + description: '开通会员渠道: -门店推广 -用户邀请 -兑换码' + type: string + open_member_level: + description: 开通会员级别：2-黄金会员 4-白金会员 5-黑金会员 + type: integer + open_member_time: + description: 开通会员 + type: string + order_amount: + description: 消费金额 + type: integer + order_cards: + items: + $ref: '#/definitions/models.OrderCard' + type: array + order_count: + description: 消费次数 + type: integer + province: + description: 省 + type: string + renewal_member_level: + type: integer + renewal_time: + type: string + shop_assistant_name: + description: 店员名称 + type: string + store: + $ref: '#/definitions/models.Store' + store_id: + description: 门店id + type: integer + tel: + description: 电话 + type: string + uid: + type: integer + user_type: + description: 用户类型 1-普通用户 2-店员 + type: integer + wxAvatar: + description: 头像 + type: string + wxName: + description: 昵称 + type: string + wxOpenID: + description: 微信openid + type: string + wxUnionID: + description: 微信unionId + type: string + xcx_role_id: + description: 角色id + type: integer + type: object + models.UserInfo: + properties: + appOpenID: + type: string + bond: + description: 保证金 + type: integer + city: + description: 城市 + type: string + cooperative_business_id: + description: 合作商id + type: integer + cooperative_name: + description: 合作商名称 + type: string + country: + description: 市 + type: string + createdAt: + description: 创建时间 + type: string + deposit: + description: 押金 + type: integer + first_retail_order: + description: 首次零售开单时间 + type: string + forfeit_penalty: + description: 滞纳金 + type: integer + gender: + description: 性别 + type: integer + id: + description: 数据库记录编号 + type: integer + in_black: + description: 是否在黑名单 + type: boolean + invite_code_url: + description: 分享二维码 + type: string + invite_time: + type: string + last_login_at: + description: 最近登录时间 + type: string + mark: + description: 标记 + type: integer + member_level_string: + description: 会员类型 + type: string + member_open_time: + type: string + member_status: + type: integer + memberExpire: + description: 会员到期时间 + type: string + memberLevel: + description: 会员等级 1-会员 + type: integer + open_member_channel: + description: '开通会员渠道: -门店推广 -用户邀请 -兑换码' + type: string + open_member_level: + description: 开通会员级别：2-黄金会员 4-白金会员 5-黑金会员 + type: integer + open_member_time: + description: 开通会员 + type: string + order_cards: + items: + $ref: '#/definitions/models.OrderCard' + type: array + province: + description: 省 + type: string + renewal_member_level: + type: integer + renewal_time: + type: string + shop_assistant_name: + description: 店员名称 + type: string + store: + $ref: '#/definitions/models.Store' + store_id: + description: 门店id + type: integer + tel: + description: 电话 + type: string + uid: + type: integer + user_type: + description: 用户类型 1-普通用户 2-店员 + type: integer + wxAvatar: + description: 头像 + type: string + wxName: + description: 昵称 + type: string + wxOpenID: + description: 微信openid + type: string + wxUnionID: + description: 微信unionId + type: string + xcx_role_id: + description: 角色id + type: integer + type: object tools.Params: properties: treeCode: @@ -5487,6 +6081,27 @@ paths: summary: 修改头像 tags: - system/用户 + /api/v1/user_info/list: + post: + consumes: + - application/json + parameters: + - description: 所有用户模型 + in: body + name: request + required: true + schema: + $ref: '#/definitions/models.NewUserListReq' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/models.U' + summary: 所有用户 + tags: + - 会员管理 /api/v1/user_info/tel: post: consumes: