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

绑定银豹排除分账号

Browse Source
This commit is contained in:
苏尹岚
2020-03-25 09:28:33 +08:00
parent 86b622f266
commit 6395ac1b1e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1110,7 +1110,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
storeMap.Status = model.StoreStatusOpened storeMap.Status = model.StoreStatusOpened
storeMap.DeliveryType = model.StoreDeliveryTypeByStore storeMap.DeliveryType = model.StoreDeliveryTypeByStore
storeMap.SyncStatus = 0 storeMap.SyncStatus = 0
if vendorID != model.VendorIDJX { if vendorID != model.VendorIDJX && vendorID != model.VendorIDYB {
if storeMap.VendorOrgCode == "" { if storeMap.VendorOrgCode == "" {
return nil, fmt.Errorf("必须指定平台分账号信息") return nil, fmt.Errorf("必须指定平台分账号信息")
} }
@@ -1127,7 +1127,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
} else { } else {
err = ErrCanNotFindVendor err = ErrCanNotFindVendor
} }
} else { } else if vendorID == model.VendorIDJX {
ReCalculateJxPriceLight(db, ctx, storeID) ReCalculateJxPriceLight(db, ctx, storeID)
} }
if err == nil { if err == nil {
@@ -1250,7 +1250,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
} }
} }
if vendorID != model.VendorIDJX { if vendorID != model.VendorIDJX && vendorID != model.VendorIDYB {
if vendorStoreID := utils.Interface2String(valid["vendorStoreID"]); vendorStoreID != "" { if vendorStoreID := utils.Interface2String(valid["vendorStoreID"]); vendorStoreID != "" {
vendorStoreInfo, err2 := storeHandler.ReadStore(ctx, storeMap.VendorOrgCode, vendorStoreID) vendorStoreInfo, err2 := storeHandler.ReadStore(ctx, storeMap.VendorOrgCode, vendorStoreID)
if err = err2; err == nil { if err = err2; err == nil {