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