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