From 60277b42d45e048bbd8e18b00672fe2c640229e1 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Mon, 12 Jul 2021 16:25:32 +0800 Subject: [PATCH] aa --- business/model/user.go | 195 +++---------------------------------- globals/beegodb/beegodb.go | 1 + 2 files changed, 14 insertions(+), 182 deletions(-) diff --git a/business/model/user.go b/business/model/user.go index 2e8601b82..c3424e165 100644 --- a/business/model/user.go +++ b/business/model/user.go @@ -93,134 +93,6 @@ func (user *User) GetAvatar() string { return user.Avatar } -type UserCityManager struct { - ModelIDCULD - - UserID string `orm:"size(48);column(user_id)" json:"userID"` // 内部唯一标识 - CityCode int `json:"cityCode"` -} - -func (*UserCityManager) TableUnique() [][]string { - return [][]string{ - []string{"UserID", "CityCode"}, - } -} - -type UserPayment struct { - ModelIDCULD - UserID string `orm:"size(48);column(user_id)" json:"userID"` // 内部唯一标识 - Type int8 // -} - -type UserDeliveryAddress struct { - ModelIDCULD - - UserID string `orm:"size(48);column(user_id)" json:"userID"` // 内部唯一标识 - - Tag string `orm:"size(32)" json:"tag"` - ConsigneeName string `orm:"size(32)" json:"consigneeName"` - ConsigneeMobile string `orm:"size(32)" json:"consigneeMobile"` - Address string `orm:"size(255)" json:"address"` // 地址(区县以下，门牌号以上的地址信息) - DetailAddress string `orm:"size(255)" json:"detailAddress"` // 门牌号 - Lng float64 `orm:"digits(10);decimals(6)" json:"lng"` - Lat float64 `orm:"digits(10);decimals(6)" json:"lat"` - - AutoAddress string `orm:"size(255)" json:"autoAddress"` // 这个是通过坐标自动获取的结构化的地址 - CityCode int `orm:"default(0);null" json:"cityCode"` // 根据坐标获得 - DistrictCode int `orm:"default(0);null" json:"districtCode"` // 根据坐标获得 - - Remark string `orm:"type(text)" json:"remark"` - IsDefault int8 `json:"isDefault"` - Type int `json:"type"` //1为寄件人，2为取件人（收货人） -} - -func (*UserDeliveryAddress) TableUnique() [][]string { - return [][]string{ - // []string{"UserID", "ConsigneeMobile", "DeletedAt"}, - } -} - -type UserCartItem struct { - ID int64 `orm:"column(id)" json:"-"` - CreatedAt time.Time `orm:"auto_now_add;type(datetime)" json:"createdAt"` - UpdatedAt time.Time `orm:"auto_now;type(datetime)" json:"-"` - LastOperator string `orm:"size(32)" json:"-"` // 最后操作员 - - UserID string `orm:"size(48);column(user_id)" json:"userID"` - StoreID int `orm:"column(store_id)" json:"storeID"` - SkuID int `orm:"column(sku_id)" json:"skuID"` - ActID int `orm:"column(act_id)" json:"actID"` - - Count int `json:"count"` - Price int `json:"price"` - IsChecked int8 `json:"isChecked"` -} - -func (*UserCartItem) TableUnique() [][]string { - return [][]string{ - []string{"UserID", "StoreID", "SkuID", "ActID"}, - } -} - -type UserOrderSms struct { - ID int64 `orm:"column(id)" json:"-"` - CreatedAt time.Time `orm:"auto_now_add;type(datetime)" json:"createdAt"` - UpdatedAt time.Time `orm:"auto_now;type(datetime)" json:"-"` - LastOperator string `orm:"size(32)" json:"-"` // 最后操作员 - - Mobile string `orm:"size(32)" json:"mobile"` - Name string `orm:"size(32)" json:"name"` - VendorUserID string `orm:"column(vendor_user_id)" json:"vendorUserID"` - SMSMark int `orm:"column(sms_mark)" json:"smsMark"` - TotalCount int `json:"totalCount"` -} - -func (*UserOrderSms) TableUnique() [][]string { - return [][]string{ - []string{"Mobile"}, - } -} - -type UserMember struct { - ModelIDCULD - - UserID string `orm:"size(48);column(user_id)" json:"userID"` //内部唯一标识 - MemberType int `json:"memberType"` //会员类型， 1为折扣卡 - MemberTypeID int `orm:"column(member_type_id)" json:"memberTypeID"` //会员类型ID，折扣卡的话代表几档 - EndAt time.Time `json:"endAt"` //会员过期时间 -} - -func (v *UserMember) TableIndex() [][]string { - return [][]string{ - []string{"UserID"}, - } -} - -type Role struct { - ModelIDCULD - - Name string `json:"name"` //角色名 -} - -func (*Role) TableUnique() [][]string { - return [][]string{ - []string{"Name", "DeletedAt"}, - } -} - -type UserRole struct { - ModelIDCULD - - UserID string `orm:"column(user_id)" json:"userID"` //用户ID - RoleID int `orm:"column(role_id)" json:"roleID"` //角色ID -} - -func (*UserRole) TableUnique() [][]string { - return [][]string{ - []string{"UserID", "RoleID", "DeletedAt"}, - } -} - type Menu struct { ModelIDCULD @@ -231,6 +103,7 @@ type Menu struct { ParentID int `orm:"column(parent_id)" json:"parentID"` //父功能ID Color string `json:"color"` //颜色 Content string `orm:"type(text)" json:"content"` //菜单内容 + MenuType string `json:"menuType"` //如果值为api，则是api接口菜单 } func (*Menu) TableUnique() [][]string { @@ -239,64 +112,22 @@ func (*Menu) TableUnique() [][]string { } } -type RoleMenu struct { +type MenuDetail struct { ModelIDCULD - RoleID int `orm:"column(role_id)" json:"roleID"` //角色ID - MenuID int `orm:"column(menu_id)" json:"menuID"` //功能ID + MenuID int `orm:"column(menu_id)" json:"menuID"` //菜单ID + Name string `json:"name"` //接口名 + Content string `orm:"type(text)" json:"content"` //接口描述 + URL string `orm:"column(url)" json:"url"` //请求路径 + Method string `json:"method"` //请求方式：get post + PublicParam string `json:"publicParam"` //公共参数 + PrivateParam string `json:"privateParam"` //私有参数 + ReturnParam string `json:"returnParam"` //返回参数 + ReturnEx string `json:"returnEX"` //返回实例 } -func (*RoleMenu) TableUnique() [][]string { +func (*MenuDetail) TableUnique() [][]string { return [][]string{ - []string{"MenuID", "RoleID", "DeletedAt"}, - } -} - -type GetUserResult struct { - User - AcceptOrderCount int `json:"acceptOrderCount"` - FinishedOrderCount int `json:"finishedOrderCount"` -} - -type UserSearch struct { - ModelIDCUL - - UserID string `orm:"column(user_id)" json:"userID"` //用户ID - Keyword string `json:"keyword"` //搜索关键字 - Count int `json:"count"` //搜索次数 -} - -func (v *UserSearch) TableIndex() [][]string { - return [][]string{ - []string{"UserID"}, - []string{"Keyword"}, - } -} - -type UserUnionBind struct { - ModelIDCULD - - UserID string `orm:"column(user_id)" json:"userID"` //用户ID - VendorID int `orm:"column(vendor_id)" json:"vendorID"` //平台ID - UnionID string `orm:"column(union_id)" json:"unionID"` //推广位ID，美团为userID，淘宝暂时是固定的京西推广位ID，pdd为此推广位ID -} - -func (v *UserUnionBind) TableUnique() [][]string { - return [][]string{ - []string{"UserID", "VendorID", "UnionID"}, - } -} - -type UserUnionBindImg struct { - ModelIDCULD - - UnionID string `orm:"column(union_id)" json:"unionID"` //推广位ID，美团为userID，淘宝暂时是固定的京西推广位ID，pdd为此推广位ID - ActID string `orm:"column(act_id)" json:"actID"` //对应的活动ID - UnionImg string `json:"unionImg"` //该用户对应平台的处理后的小程序二维码图，目前就美团用，避免二次上传 -} - -func (v *UserUnionBindImg) TableIndex() [][]string { - return [][]string{ - []string{"UnionID"}, + []string{"MenuID"}, } } diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 84c65e589..006b97677 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -17,6 +17,7 @@ func Init() { orm.RegisterModel(&model.User{}) orm.RegisterModel(&model.Place{}) orm.RegisterModel(&model.Menu{}) + orm.RegisterModel(&model.MenuDetail{}) // create table orm.RunSyncdb("default", false, true) }