This commit is contained in:
suyl
2021-08-30 15:24:15 +08:00
parent c5eb30a2a9
commit 49dd477045
5 changed files with 111 additions and 1 deletions

View File

@@ -5087,3 +5087,35 @@ func AuditStoreMap(ctx *jxcontext.Context, ID int, vendorOrgCode, vendorStoreID
func GetStoreMapAudit(ctx *jxcontext.Context, storeIDs, vendorIDs, auditStatuss []int, fromTime, toTime string, offset, pageSize int) (page *model.PagedInfo, err error) { func GetStoreMapAudit(ctx *jxcontext.Context, storeIDs, vendorIDs, auditStatuss []int, fromTime, toTime string, offset, pageSize int) (page *model.PagedInfo, err error) {
return dao.GetStoreMapAudit(dao.GetDB(), storeIDs, vendorIDs, auditStatuss, utils.Str2Time(fromTime), utils.Str2Time(toTime), offset, pageSize) return dao.GetStoreMapAudit(dao.GetDB(), storeIDs, vendorIDs, auditStatuss, utils.Str2Time(fromTime), utils.Str2Time(toTime), offset, pageSize)
} }
func GetBrandUser(ctx *jxcontext.Context, brandID int) (brandUsers []*model.BrandUser, err error) {
return dao.GetBrandUser(dao.GetDB(), brandID, "")
}
func UpdateBrandUser(ctx *jxcontext.Context, brandID int, userID string, isDel bool) (err error) {
var (
db = dao.GetDB()
)
brandUsers, err := dao.GetBrandUser(db, brandID, userID)
if err != nil {
return err
}
if !isDel {
if len(brandUsers) > 0 {
return fmt.Errorf("此用户已经绑定了该品牌!")
}
brandUser := &model.BrandUser{
BrandID: brandID,
UserID: userID,
}
dao.WrapAddIDCULDEntity(brandUser, ctx.GetUserName())
dao.CreateEntity(db, brandUser)
} else {
if len(brandUsers) == 0 {
return fmt.Errorf("此用户没有绑定该品牌!")
}
brandUsers[0].DeletedAt = time.Now()
dao.UpdateEntity(db, brandUsers[0], "DeletedAt")
}
return err
}

View File

@@ -1326,3 +1326,20 @@ func GetStoreMapAudit(db *DaoDB, storeIDs, vendorIDs, auditStatuss []int, fromTi
} }
return page, err return page, err
} }
func GetBrandUser(db *DaoDB, brandID int, userID string) (brandUsers []*model.BrandUser, err error) {
sql := `
SELECT * FROM brand_user WHERE deleted_at = ?
`
sqlParams := []interface{}{utils.DefaultTimeValue}
if brandID != 0 {
sql += " AND brand_id = ?"
sqlParams = append(sqlParams, brandID)
}
if userID != "" {
sql += " AND user_id = ?"
sqlParams = append(sqlParams, userID)
}
err = GetRows(db, &brandUsers, sql, sqlParams)
return brandUsers, err
}

View File

@@ -812,12 +812,25 @@ type BrandBill struct {
OrderID string `orm:"column(order_id)" json:"orderID"` //关联orderPay表的订单号 OrderID string `orm:"column(order_id)" json:"orderID"` //关联orderPay表的订单号
} }
func (*BrandBill) TableUnique() [][]string { func (*BrandBill) TableIndex() [][]string {
return [][]string{ return [][]string{
[]string{"BrandID", "CreatedAt"}, []string{"BrandID", "CreatedAt"},
} }
} }
type BrandUser struct {
ModelIDCULD
BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID
UserID string `orm:"column(user_id) json:"userID"`
}
func (*BrandUser) TableIndex() [][]string {
return [][]string{
[]string{"BrandID", "UserID"},
}
}
type BrandStore struct { type BrandStore struct {
ModelIDCULD ModelIDCULD

View File

@@ -1165,3 +1165,33 @@ func (c *StoreController) GetStoreMapAudit() {
return retVal, "", err return retVal, "", err
}) })
} }
// @Title 查询品牌用户
// @Description 查询品牌用户
// @Param token header string true "认证token"
// @Param brandID query int true "brandID"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetBrandUser [get]
func (c *StoreController) GetBrandUser() {
c.callGetBrandUser(func(params *tStoreGetBrandUserParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetBrandUser(params.Ctx, params.BrandID)
return retVal, "", err
})
}
// @Title 修改品牌用户
// @Description 修改品牌用户
// @Param token header string true "认证token"
// @Param brandID formData int true "brandID"
// @Param userID formData string true "userID"
// @Param isDel formData bool true "true是删除false是添加"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /UpdateBrandUser [post]
func (c *StoreController) UpdateBrandUser() {
c.callUpdateBrandUser(func(params *tStoreUpdateBrandUserParams) (retVal interface{}, errCode string, err error) {
err = cms.UpdateBrandUser(params.Ctx, params.BrandID, params.UserID, params.IsDel)
return retVal, "", err
})
}

View File

@@ -2160,6 +2160,24 @@ func init() {
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
web.ControllerComments{
Method: "GetBrandUser",
Router: `/GetBrandUser`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
web.ControllerComments{
Method: "UpdateBrandUser",
Router: `/UpdateBrandUser`,
AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
web.ControllerComments{ web.ControllerComments{
Method: "AddStoreCategoryMap", Method: "AddStoreCategoryMap",