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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2022-12-12 16:17:10 +08:00
parent b1e461506c 8c5a8eb27e
commit e6bcefa2c4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6014,7 +6014,6 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error
endStr = "" endStr = ""
db = dao.GetDB() db = dao.GetDB()
errList = errlist.New() errList = errlist.New()
ctx *jxcontext.Context
FreightTemplate = &model.FreightTemplate{} FreightTemplate = &model.FreightTemplate{}
) )
for k, v := range relInfo { for k, v := range relInfo {
@@ -6034,15 +6033,17 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error
endStr = tStr1 + "," + tStr2 endStr = tStr1 + "," + tStr2
globals.SugarLogger.Debugf("京西平台没有配送范围的门店ID=%s", endStr) globals.SugarLogger.Debugf("京西平台没有配送范围的门店ID=%s", endStr)
} }
if bindFence, err := GetDDScope(ctx, utils.Str2Int(i.StoreID), i.VendorStoreID); err == nil && utils.IsNil(bindFence) != true { if bindFence, err := tiktok_store.GetWarehouseByStore(k, utils.Str2Int64(i.StoreID)); err == nil && len(bindFence) > 0 {
tempFenceID = bindFence[0].OutFenceId globals.SugarLogger.Debugf("%s", i.VendorStoreID)
tempFenceID = bindFence[i.VendorStoreID][0].OutFenceIds[0]
globals.SugarLogger.Debugf("tempFenceID================%s", tempFenceID)
if err1 := tiktok_store.UpdateFenceByStore(k, tempFenceID, utils.Str2Int(i.VendorStoreID)); err1 != nil { if err1 := tiktok_store.UpdateFenceByStore(k, tempFenceID, utils.Str2Int(i.VendorStoreID)); err1 != nil {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)更新电子围栏失败:%v", i.VendorStoreID, i.StoreID, err1)) errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)更新电子围栏失败:%v", i.VendorStoreID, i.StoreID, err1))
} }
} else { } else {
if fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID); err != nil { if fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID); err != nil {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err)) errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
} else if utils.IsNil(fenceID) { } else if len(fenceID) > 0 {
if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{fenceID}); err != nil { if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{fenceID}); err != nil {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err)) errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
} }