From fabd7a03f164f886bb168014f9dc4a2933ac18e4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 12 Dec 2022 15:23:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 5b339b4b6..f8cc96d5e 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6034,15 +6034,16 @@ 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 { + 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)) } From 9e38c909f93d4514e276967034de3f2bd9797659 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 12 Dec 2022 15:25:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 1 - 1 file changed, 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f8cc96d5e..9338ad675 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 { From 8c5a8eb27ea2b29cbc7c11cfd2fb61618621a82b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 12 Dec 2022 16:05:29 +0800 Subject: [PATCH 3/3] fence map --- business/jxstore/cms/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 9338ad675..40316230b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6034,6 +6034,7 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error globals.SugarLogger.Debugf("京西平台没有配送范围的门店ID=%s", endStr) } 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 {