liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-09-06 10:50:55 +08:00
parent 46f705278f
commit 563917bef5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/store.go
View File

@@ -4063,7 +4063,7 @@ type GetBrandsResult struct {
} }
func GetBrands(ctx *jxcontext.Context, name string, brandID int) (getBrandsResult []*GetBrandsResult, err error) { 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 { for _, v := range brands {
balance, _ := partner.CurStoreAcctManager.GetBrandBalance(v.ID) balance, _ := partner.CurStoreAcctManager.GetBrandBalance(v.ID)
result := &GetBrandsResult{ result := &GetBrandsResult{
@@ -4138,7 +4138,7 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma
return fmt.Errorf("请选择平台账号！") return fmt.Errorf("请选择平台账号！")
} }
if vendorID == model.VendorIDMTWM { 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 len(brands) > 0 {
if strings.Contains(brands[0].Name, "无品牌") { if strings.Contains(brands[0].Name, "无品牌") {
return fmt.Errorf("无品牌店铺不允许创建美团门店！") return fmt.Errorf("无品牌店铺不允许创建美团门店！")

2
business/jxstore/cms/user2.go
View File

@@ -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 err = dao.GetRow(db, &userInfo, sql, sqlParams); err == nil && userInfo != nil {
if brandUsers, _ := dao.GetBrandUser(db, 0, ctx.GetUserID()); len(brandUsers) > 0 { if brandUsers, _ := dao.GetBrandUser(db, 0, ctx.GetUserID()); len(brandUsers) > 0 {
for _, v := range brandUsers { for _, v := range brandUsers {
brands, _ := dao.GetBrands(db, "", v.BrandID) brands, _ := dao.GetBrands(db, "", v.BrandID, "")
balance, _ := partner.CurStoreAcctManager.GetBrandBalance(v.BrandID) balance, _ := partner.CurStoreAcctManager.GetBrandBalance(v.BrandID)
brandMap := &BrandMap{ brandMap := &BrandMap{
BrandID: v.BrandID, BrandID: v.BrandID,