From c6fd8fce6649d679a29f4deca6afb206d9242cf8 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 3 Nov 2022 10:44:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86err?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/tiktok_store/warehouse.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 2ec9ccd37..67af05fdc 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -283,7 +283,8 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID") errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1)) } + endErr := errList.GetErrListAsOne() globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList)) - globals.SugarLogger.Debugf("errList===============%s", utils.Format4Output(errList, false)) - return errors.New(fmt.Sprintf("errList=%s,err=%v", utils.Format4Output(errList, false), err)) + globals.SugarLogger.Debugf("errList===============%s\n,endErr========%v", utils.Format4Output(errList, false), endErr) + return errors.New(fmt.Sprintf("endErr============%s", endErr)) } From 3e8dffb8e7f0f6093bf5ea17dc5cbb581ac3af5a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 3 Nov 2022 11:00:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86err?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 7 ++++--- business/partner/purchase/tiktok_store/store.go | 6 ++++-- business/partner/purchase/tiktok_store/warehouse.go | 6 +----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 1716ef11a..1af060974 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1794,9 +1794,10 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } } } - globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList)) - globals.SugarLogger.Debug("errList============", utils.Format4Output(errList, true)) - return num, errors.New(fmt.Sprintf("errList=%v,err=%v", utils.Format4Output(errList, true), err)) + errList.AddErr(err) + endErr := errList.GetErrListAsOne() + globals.SugarLogger.Info("endErr==============", endErr) + return num, endErr } func DeleteStore(ctx *jxcontext.Context, storeID int) (num int64, err error) { diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index bcfb3a95e..0e4a76503 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -253,9 +253,10 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "WarehouseID", "FenceID", "TradeLimitID") errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1)) } + endErr := errList.GetErrListAsOne() if utils.IsNil(errList) { globals.SugarLogger.Debug("绑定门店需进行的错误处理:%v", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true)))) - return "门店绑定成功，但需要根据提示进行处理", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true))) + return "门店绑定成功，但需要根据提示进行处理", errors.New(fmt.Sprintf("%s", endErr)) } else { globals.SugarLogger.Debug("the last step of") return "门店绑定成功", nil @@ -370,7 +371,8 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } } } - return errors.New(fmt.Sprintf("errList=%s,err=%v", utils.Format4Output(errList, true), err)) + endErr := errList.GetErrListAsOne() + return errors.New(fmt.Sprintf("endErr=%s", endErr)) } // UpdateStoreStatus shop/unsuspendStore 门店恢复营业 diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 67af05fdc..83e38e7cc 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -1,7 +1,6 @@ package tiktok_store import ( - "errors" "fmt" warehouse_bindFencesByStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindFencesByStore/request" warehouse_bindStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindStore/request" @@ -244,7 +243,6 @@ func GetFence(appOrgCode, outFenceID string) (warehouse_getFences_response.Fence //单独处理运费模板 func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) error { var ( - errStr []string errList = errlist.New() FreightTemplate = &model.FreightTemplate{} db *dao.DaoDB @@ -271,8 +269,6 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err } else { if err := UpdateFreightTemplate(vendorOrgCode, int(storeID)); err != nil { globals.SugarLogger.Debug("更新运费模板失败:", err) - errStr = append(errStr, fmt.Sprintf("%v", err)) - globals.SugarLogger.Debug("检查是否可行errStr=============", errStr) errList.AddErr(fmt.Errorf("更新运费模板失败:%v", err)) } } @@ -286,5 +282,5 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err endErr := errList.GetErrListAsOne() globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList)) globals.SugarLogger.Debugf("errList===============%s\n,endErr========%v", utils.Format4Output(errList, false), endErr) - return errors.New(fmt.Sprintf("endErr============%s", endErr)) + return endErr } From 8ddb222e33b1e86dddcfff5ccbac6564bb8a3257 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 3 Nov 2022 11:32:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86err?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 1 - business/jxstore/cms/sync_store_sku.go | 1 - .../partner/purchase/tiktok_store/store.go | 9 ++-- .../purchase/tiktok_store/warehouse.go | 42 ++++++++++--------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 1af060974..752d8d56d 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1786,7 +1786,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } } dao.Commit(db, txDB) - globals.SugarLogger.Debug("检查一下isStoreMapNeedSync(vendorID, valid)=============%s", isStoreMapNeedSync(vendorID, valid)) if isStoreMapNeedSync(vendorID, valid) { globals.SugarLogger.Debug("1.isStoreMapNeedSync(vendorID, valid)=================", isStoreMapNeedSync(vendorID, valid)) _, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index c816a1e28..dc4ff9099 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -189,7 +189,6 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla globals.SugarLogger.Debugf("SyncStoreCategories in SyncStoreSkuNew2 err on: %s", err) } case 1: - globals.SugarLogger.Debugf("同步商品分类,看看走不走: 门店地[%d],平台门店地[%s],商品id[%v]", storeID, vendorStoreID, skuIDs) err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError) } return result, err diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 0e4a76503..33db75433 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -131,7 +131,8 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(err) } } - return vendorStoreIDs, errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true))) + endErr := errList.GetErrListAsOne() + return vendorStoreIDs, errors.New(fmt.Sprintf("创建抖店平台店铺相关错误信息：%v", endErr)) } //电子围栏 仓库 运费模板 限售模板 更新与绑定 @@ -256,9 +257,8 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri endErr := errList.GetErrListAsOne() if utils.IsNil(errList) { globals.SugarLogger.Debug("绑定门店需进行的错误处理:%v", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true)))) - return "门店绑定成功，但需要根据提示进行处理", errors.New(fmt.Sprintf("%s", endErr)) + return "门店绑定成功，但需要根据提示进行处理", endErr } else { - globals.SugarLogger.Debug("the last step of") return "门店绑定成功", nil } } @@ -372,7 +372,7 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } } endErr := errList.GetErrListAsOne() - return errors.New(fmt.Sprintf("endErr=%s", endErr)) + return errors.New(fmt.Sprintf("更新抖店平台店铺信息，相关处理错误：%v", endErr)) } // UpdateStoreStatus shop/unsuspendStore 门店恢复营业 @@ -463,7 +463,6 @@ func CreateFreightTemplate(storeCode int) (int64, error) { if err != nil { return 0, err } - return resp.TemplateId, nil } diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 83e38e7cc..64439354b 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -19,6 +19,12 @@ import ( "strings" ) +const ( + //京西平台的电子围栏形状 + LocalShapeCircular = 3 //圆 + LocalShapePolygon = 2 //普通多边形 +) + // /warehouse/create 创建单个区域仓 func CreateWarehouse(appOrgCode, outWarehouseID string) (warehouseID int64, err error) { tempName := "京西菜市(" + outWarehouseID + ")的区域仓" @@ -98,6 +104,7 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e db *dao.DaoDB localStore *LocalStore vertex []warehouse_createFence_request.VerticesItem + param = &warehouse_createFence_request.WarehouseCreateFenceParam{} ) sqlParam := []interface{}{ model.VendorIDDD, @@ -112,14 +119,8 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e return "", fmt.Errorf("storeID必填") } if err = dao.GetRow(db, &localStore, sqlStr, sqlParam...); err == nil { - param := &warehouse_createFence_request.WarehouseCreateFenceParam{ - FenceInfo: &warehouse_createFence_request.FenceInfo{ - OutFenceId: utils.Int64ToStr(storeID), //绑定基于此id - Shape: int32(localStore.DeliveryRangeType), - }, - } globals.SugarLogger.Debug("localStore.DeliveryRangeType==============", localStore.DeliveryRangeType) - if localStore.DeliveryRangeType == tiktok_api.ShapeCircular { + if localStore.DeliveryRangeType == LocalShapeCircular { circular := &warehouse_createFence_request.Circular{ Center: &warehouse_createFence_request.Center{ Longitude: utils.Int2Float64(localStore.Lng), @@ -128,7 +129,8 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e Radius: utils.Str2Float64(localStore.DeliveryRange), } param.FenceInfo.Circular = circular - } else if localStore.DeliveryRangeType == tiktok_api.ShapePolygon { + param.FenceInfo.Shape = tiktok_api.ShapeCircular + } else if localStore.DeliveryRangeType == LocalShapePolygon { tempStr := strings.Split(localStore.DeliveryRange, ";") for v := len(tempStr) - 1; v >= 0; v-- { s2 := strings.Split(tempStr[v], ",") @@ -139,7 +141,9 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e vertex = append(vertex, vertices) } param.FenceInfo.Polygon.Vertices = vertex + param.FenceInfo.Shape = tiktok_api.ShapePolygon } + param.FenceInfo.OutFenceId = utils.Int64ToStr(storeID) //绑定基于此id resp, err := getAPI(appOrgCode, 0, "").CreateFence(param) if err != nil { return "", err @@ -168,7 +172,7 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error { var ( db *dao.DaoDB localStore *LocalStore - verticeses []warehouse_setFence_request.VerticesItem + vertex []warehouse_setFence_request.VerticesItem ) sqlParam := []interface{}{ model.VendorIDDD, @@ -205,9 +209,9 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error { Longitude: utils.Str2Float64(s2[0]), Latitude: utils.Str2Float64(s2[1]), } - verticeses = append(verticeses, vertices) + vertex = append(vertex, vertices) } - param.FenceInfo.Polygon.Vertices = verticeses + param.FenceInfo.Polygon.Vertices = vertex } if err := getAPI(appOrgCode, 0, "").SetFence(param); err != nil { return err @@ -254,7 +258,6 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err)) } if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误 - globals.SugarLogger.Debug("我在创建绑定运费模板这里=========================") if freightTemplateID, err := CreateFreightTemplate(int(storeID)); err != nil || freightTemplateID == 0 || utils.IsNil(freightTemplateID) { globals.SugarLogger.Debug("创建运费模板失败:", err) errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err)) @@ -272,15 +275,14 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err errList.AddErr(fmt.Errorf("更新运费模板失败:%v", err)) } } - if err = dao.CreateEntity(db, FreightTemplate); err != nil { - globals.SugarLogger.Debug("db update storeID,vendorStoreID defeat on :", err) - errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) - } else { - _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID") - errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1)) + err1 := dao.CreateEntity(db, FreightTemplate) + if err1 != nil { + _, err2 := dao.UpdateEntity(db, FreightTemplate, "TemplateID") + if err2 != nil { + errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1)) + } } endErr := errList.GetErrListAsOne() - globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList)) - globals.SugarLogger.Debugf("errList===============%s\n,endErr========%v", utils.Format4Output(errList, false), endErr) + globals.SugarLogger.Debugf("errList===============%s", endErr) return endErr }