From 700f635e23f4701017fbf8f79eef0393f217b2c7 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 8 Nov 2022 13:46:06 +0800 Subject: [PATCH 1/2] str --- business/partner/purchase/tiktok_store/warehouse.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 6cd93548f..3e32a4ac4 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -28,10 +28,10 @@ const ( ) // /warehouse/create 创建单个区域仓 -func CreateWarehouse(appOrgCode string, storeID int64) (warehouseID int64, err error) { +func CreateWarehouse(appOrgCode string, storeID int64) (warehouseID string, err error) { storeDetail, err := dao.GetStoreDetail(dao.GetDB(), int(storeID), 0, "") if err != nil { - return 0, fmt.Errorf("获取门店本地信息失败:%v", err) + return "", fmt.Errorf("获取门店本地信息失败:%v", err) } param := &warehouse_create_request.WarehouseCreateParam{ OutWarehouseId: utils.Int64ToStr(storeID), //本地storeID绑定 @@ -49,9 +49,9 @@ func CreateWarehouse(appOrgCode string, storeID int64) (warehouseID int64, err e } resp, err := getAPI(appOrgCode, 0, "").CreateWarehouse(param) if err != nil { - return 0, fmt.Errorf("创建单个区域仓失败:%v", err) + return "", fmt.Errorf("创建单个区域仓失败:%v", err) } - return resp.Data, nil + return resp.WarehouseId, nil } // /warehouse/createBatch 批量创建区域仓 @@ -146,7 +146,7 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e tempStr := strings.Split(localStore.DeliveryRange, ";") for v := len(tempStr) - 1; v >= 0; v-- { s2 := strings.Split(tempStr[v], ",") - globals.SugarLogger.Debugf("len==%d\n,2[0]==%s\n", len(s2), s2[0]) + globals.SugarLogger.Debugf("len==%d\n,s2[0]==%s\n,s2==%s", len(s2), s2[0], s2) tLng, err1 := strconv.ParseFloat(s2[0], 64) tLat, err2 := strconv.ParseFloat(s2[1], 64) if err1 != nil || err2 != nil { From e89f09e6c4d36955c3a8c17d04d87e12d3c0bc3d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 8 Nov 2022 13:48:37 +0800 Subject: [PATCH 2/2] str --- business/partner/purchase/tiktok_store/store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 756baa2c4..e44eb27df 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -175,15 +175,15 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID, deliveryFee //if len(bindWarehouseAndFence) == 0 || utils.IsNil(bindWarehouseAndFence) { //未绑定仓库以及电子围栏 //(1)创建仓库 warehouseID, err := CreateWarehouse(vendorOrgCode, storeID) - if err != nil || warehouseID == 0 || utils.IsNil(warehouseID) { + if err != nil || len(warehouseID) == 0 || utils.IsNil(warehouseID) { globals.SugarLogger.Debugf("门店(%d) 创建仓库失败:%v", storeID, err) errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err)) } else { //绑定 if err = BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID - globals.SugarLogger.Debugf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err) - errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err)) + globals.SugarLogger.Debugf("门店(%d) 绑定仓库:%s 失败:%v", storeID, warehouseID, err) + errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%s 失败:%v", storeID, warehouseID, err)) } else { - FreightTemplate.WarehouseID = warehouseID + FreightTemplate.WarehouseID = utils.Str2Int64(warehouseID) } } //(2)创建电子围栏