From 563917bef545afa1d3bb26cfc73048b8a820f88a Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Mon, 6 Sep 2021 10:50:55 +0800 Subject: [PATCH] aa --- business/jxstore/cms/store.go | 4 ++-- business/jxstore/cms/user2.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index cd50bcd28..34c3d9484 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4063,7 +4063,7 @@ type GetBrandsResult struct { } func GetBrands(ctx *jxcontext.Context, name string, brandID int) (getBrandsResult []*GetBrandsResult, err error) { - brands, _ := dao.GetBrands(dao.GetDB(), name, brandID) + brands, _ := dao.GetBrands(dao.GetDB(), name, brandID, "") for _, v := range brands { balance, _ := partner.CurStoreAcctManager.GetBrandBalance(v.ID) result := &GetBrandsResult{ @@ -4138,7 +4138,7 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma return fmt.Errorf("请选择平台账号！") } if vendorID == model.VendorIDMTWM { - if brands, err := dao.GetBrands(db, "", storeDetail.BrandID); err == nil { + if brands, err := dao.GetBrands(db, "", storeDetail.BrandID, ""); err == nil { if len(brands) > 0 { if strings.Contains(brands[0].Name, "无品牌") { return fmt.Errorf("无品牌店铺不允许创建美团门店！") diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index 6e1cd21ef..6a30ce74a 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -1400,7 +1400,7 @@ func GetUserInfo(ctx *jxcontext.Context) (userInfo *UserInfo, err error) { if err = dao.GetRow(db, &userInfo, sql, sqlParams); err == nil && userInfo != nil { if brandUsers, _ := dao.GetBrandUser(db, 0, ctx.GetUserID()); len(brandUsers) > 0 { for _, v := range brandUsers { - brands, _ := dao.GetBrands(db, "", v.BrandID) + brands, _ := dao.GetBrands(db, "", v.BrandID, "") balance, _ := partner.CurStoreAcctManager.GetBrandBalance(v.BrandID) brandMap := &BrandMap{ BrandID: v.BrandID,