From 016a8ceb7abb8a32c585486ba1696b18cad8c9d9 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Tue, 22 Nov 2022 18:07:05 +0800
Subject: [PATCH] data test

---
 business/jxstore/cms/store.go | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 1f5487981..d021638b0 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -6019,6 +6019,7 @@ func GetVendorOrgCode(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID i
 func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error) {
 	var (
 		db              = dao.GetDB()
+		tempFenceID     string
 		FreightTemplate = &model.FreightTemplate{}
 	)
 	errList := errlist.New()
@@ -6030,20 +6031,24 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error
 			tempStoreID := utils.Str2Int64(i.StoreID)
 			tempVendorStoreID := utils.Str2Int64(i.VendorStoreID)
 			//暂时逻辑直接使用storeID
-			if fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID); err != nil {
-				errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s) 创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
-			} else if strings.Contains(fmt.Sprint(err), fmt.Sprint("该电子围栏已经存在，请使用修改接口")) {
-				if err := tiktok_store.UpdateFenceByStore(k, i.StoreID, utils.Str2Int(i.VendorStoreID)); err != nil {
-					errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)更新电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
-				}
-				if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{i.StoreID}); err != nil {
-					errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
-				}
-			} else if err == nil && utils.IsNil(fenceID) {
-				if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{fenceID}); err != nil {
-					errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
+			//(1)先判断是否存在
+			if ifBindFence, err := tiktok_store.GetFence(k, i.StoreID); err == nil && utils.IsNil(ifBindFence.OutFenceId) {
+				tempFenceID = i.StoreID
+			} else {
+				fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID)
+				if err != nil {
+					errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s) 创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
+				} else if strings.Contains(fmt.Sprint(err), fmt.Sprint("该电子围栏已经存在，请使用修改接口")) {
+					if err := tiktok_store.UpdateFenceByStore(k, i.StoreID, utils.Str2Int(i.VendorStoreID)); err != nil {
+						errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)更新电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
+					}
+				} else if utils.IsNil(fenceID) {
+					tempFenceID = fenceID
 				}
 			}
+			if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{tempFenceID}); err != nil {
+				errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
+			}
 		}
 		if err := dao.CreateEntity(db, FreightTemplate); err != nil {
 			if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID"); err1 != nil {