From 04f25fa593b467b6015c761459066934297ac056 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 17:21:00 +0800 Subject: [PATCH 1/8] data test --- business/jxstore/cms/store.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 0159eb744..64fb281b8 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6028,13 +6028,22 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error for _, i := range v { globals.SugarLogger.Debugf("preTest i.StoreID========%s,i.VendorStoreID=========%s", i.StoreID, i.VendorStoreID) 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 { - tempVendorStoreID := utils.Str2Int64(i.VendorStoreID) + } else if strings.Contains(fmt.Sprint(err), fmt.Sprintf("创建电子围栏失败:该电子围栏已经存在，请使用修改接口")) { + 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)) } + } else { + 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 := dao.CreateEntity(db, FreightTemplate); err != nil { From 459571706e4ef5e2e00533337e505af48b0b3807 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 17:42:00 +0800 Subject: [PATCH 2/8] data test --- business/jxstore/cms/store.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 64fb281b8..a51139fa0 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6033,6 +6033,9 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error 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.Sprintf("创建电子围栏失败:该电子围栏已经存在，请使用修改接口")) { + 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)) } @@ -6040,10 +6043,6 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{fenceID}); err != nil { errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err)) } - } else { - 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 := dao.CreateEntity(db, FreightTemplate); err != nil { From 1708c2f7d11635429cb3ab988ca9908a2607084a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 17:45:05 +0800 Subject: [PATCH 3/8] data test --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index a51139fa0..63a59f409 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6032,7 +6032,7 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error //暂时逻辑直接使用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.Sprintf("创建电子围栏失败:该电子围栏已经存在，请使用修改接口")) { + } else if strings.Contains(fmt.Sprint(err), fmt.Sprintf("该电子围栏已经存在，请使用修改接口")) { 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)) } From 58a68a8914d1f118c25f4fe88ea918306bdb91e8 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 17:48:54 +0800 Subject: [PATCH 4/8] data test --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 63a59f409..1f5487981 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6032,7 +6032,7 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error //暂时逻辑直接使用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.Sprintf("该电子围栏已经存在，请使用修改接口")) { + } 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)) } From 016a8ceb7abb8a32c585486ba1696b18cad8c9d9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 18:07:05 +0800 Subject: [PATCH 5/8] 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 { From 09c9c3c86a2cd0854192f49e2a80ec1dc08c13c4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 18:11:38 +0800 Subject: [PATCH 6/8] data test --- business/jxstore/cms/store.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index d021638b0..4093a375b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6028,23 +6028,18 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error globals.SugarLogger.Debugf("v[0].VendorStoreID============%s v[0].StoreID============%s", v[0].VendorStoreID, v[0].StoreID) for _, i := range v { globals.SugarLogger.Debugf("preTest i.StoreID========%s,i.VendorStoreID=========%s", i.StoreID, i.VendorStoreID) + tempFenceID = i.StoreID tempStoreID := utils.Str2Int64(i.StoreID) tempVendorStoreID := utils.Str2Int64(i.VendorStoreID) //暂时逻辑直接使用storeID - //(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 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)) } + } 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)) From 8b97d8b3b1bccf084dc8f73f32949b5da5713ddd Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 18:20:10 +0800 Subject: [PATCH 7/8] data test --- business/jxstore/cms/store.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 4093a375b..eb3a1d6e1 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6018,25 +6018,24 @@ 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 + db = dao.GetDB() + errList = errlist.New() FreightTemplate = &model.FreightTemplate{} ) - errList := errlist.New() - globals.SugarLogger.Debugf("进入AssistCreateFence") for k, v := range relInfo { - globals.SugarLogger.Debugf("v[0].VendorStoreID============%s v[0].StoreID============%s", v[0].VendorStoreID, v[0].StoreID) for _, i := range v { - globals.SugarLogger.Debugf("preTest i.StoreID========%s,i.VendorStoreID=========%s", i.StoreID, i.VendorStoreID) - tempFenceID = i.StoreID 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 ifBindFence, err := tiktok_store.GetFence(k, i.StoreID); err == nil && len(ifBindFence.OutFenceId) != 0 { + tempFenceID = i.StoreID + } + if fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID); err != nil || strings.Contains(fmt.Sprint(err), fmt.Sprint("该电子围栏已经存在，请使用修改接口")) { + if err1 := tiktok_store.UpdateFenceByStore(k, i.StoreID, utils.Str2Int(i.VendorStoreID)); err1 != nil { + errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)更新电子围栏失败:%v", i.VendorStoreID, i.StoreID, err1)) + } else { + errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err)) } } else if utils.IsNil(fenceID) { tempFenceID = fenceID From c444e9a47a6ca4da9d3e0a8700bb00ce4de0164f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 22 Nov 2022 18:22:45 +0800 Subject: [PATCH 8/8] update fence --- business/partner/purchase/tiktok_store/warehouse.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 646b8fbc8..88494331c 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -175,9 +175,7 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error { localStore *LocalStore vertex []warehouse_setFence_request.VerticesItem ) - sqlParam := []interface{}{ - model.VendorIDDD, - } + sqlParam := []interface{}{} sqlStr := `SELECT t.lng,t.lat,t.delivery_range_type,t.delivery_range FROM store t` if storeID != 0 { sqlStr += " WHERE t.id = ? "