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

Merge remote-tracking branch 'origin/jdshop' into jdshop

Browse Source
This commit is contained in:
邹宗楠
2022-10-31 17:50:42 +08:00
parent 65d9055762 474fb33ef1
commit cd51c18c15
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1484,7 +1484,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
userName := ctx.GetUserName() userName := ctx.GetUserName()
storeMap.StoreID = storeID storeMap.StoreID = storeID
storeMap.VendorID = vendorID storeMap.VendorID = vendorID
globals.SugarLogger.Debugf("vendorID1111111111111111===============", vendorID) globals.SugarLogger.Debugf("vendorID1111111111111111===============%d", vendorID)
storeMap.VendorOrgCode = vendorOrgCode storeMap.VendorOrgCode = vendorOrgCode
storeMap.Status = model.StoreStatusOpened storeMap.Status = model.StoreStatusOpened
storeMap.DeliveryType = model.StoreDeliveryTypeByStore storeMap.DeliveryType = model.StoreDeliveryTypeByStore
@@ -1520,6 +1520,13 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
if storeDetail != nil { if storeDetail != nil {
return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID) return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID)
} }
if vendorID == model.VendorIDDD { //抖店绑定店铺时 检查并补充创建
globals.SugarLogger.Debugf("vendorID ==============%d", vendorID)
err2 := tiktok_store.CreateOrUpdateAll(vendorOrgCode, int64(storeMap.StoreID), utils.Str2Int64(storeMap.VendorStoreID))
if err2 != nil {
return nil, err2
}
}
} else if vendorID == model.VendorIDJX { } else if vendorID == model.VendorIDJX {
ReCalculateJxPriceLight(db, ctx, storeID) ReCalculateJxPriceLight(db, ctx, storeID)
} else if vendorID == model.VendorIDYB { } else if vendorID == model.VendorIDYB {
@@ -1546,12 +1553,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
err = ErrCanNotFindVendor err = ErrCanNotFindVendor
} }
} }
} else if vendorID == model.VendorIDDD { //抖店绑定店铺时 检查并补充创建
globals.SugarLogger.Debugf("vendorID ==============%d", vendorID)
err2 := tiktok_store.CreateOrUpdateAll(vendorOrgCode, int64(storeMap.StoreID), utils.Str2Int64(storeMap.VendorStoreID))
if err2 != nil {
return nil, err2
}
} }
storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "", true) storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "", true)