From 8cd1072b3c9cf4973e629fadaf0cc5238702ca61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 25 Oct 2022 10:06:52 +0800
Subject: [PATCH] 1

---
 .../purchase/tiktok_store/store_sku2_utils.go      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go
index 731b31539..a5363fdf8 100644
--- a/business/partner/purchase/tiktok_store/store_sku2_utils.go
+++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go
@@ -13,6 +13,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/globals"
 	"math/rand"
 	"strings"
 )
@@ -66,12 +67,14 @@ func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) {
 func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao.StoreDetail) (int64, error) {
 	// 没有模板是查询线上模板
 	freightId, _ := api.GetStoreBindTemp(utils.Str2Int64(vendorStoreID))
+	globals.SugarLogger.Debugf("freightId =err %d", freightId)
 	if freightId == 0 {
 		// 创建门店运费模板
+		productProvince := utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[0:2])
 		tempDetail := &freightTemplate_create_request.FreightTemplateCreateParam{
 			Template: &freightTemplate_create_request.Template{
 				TemplateName:    storeDetail.Name + "_" + utils.Int64ToStr(rand.Int63n(int64(storeDetail.ID))) + "_系统模板",
-				ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[0:2]),
+				ProductProvince: productProvince,
 				ProductCity:     int64(storeDetail.CityCode),
 				CalculateType:   2,
 				TransferType:    1,   // 快递方式-1.快递 目前仅支持1
@@ -80,12 +83,12 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao
 			},
 			Columns: []freightTemplate_create_request.ColumnsItem{
 				{
-					RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":nil}}}`, utils.Int2Str(storeDetail.ProvinceCode)[0:2], utils.Int2Str(storeDetail.CityCode), utils.Int2Str(storeDetail.DistrictCode)),
+					RuleAddress: fmt.Sprintf(`{"%d":{"%s":{"%s":nil}}}`, productProvince, utils.Int2Str(storeDetail.CityCode), utils.Int2Str(storeDetail.DistrictCode)),
 					IsOverFree:  true,
 					OverAmount:  int64(storeDetail.DeliveryFeeDeductionSill),
 					ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{
 						{
-							Id: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[0:2]),
+							Id: productProvince,
 							Children: []freightTemplate_create_request.ChildrenItem_4{
 								{
 									Id: int64(storeDetail.CityCode),
@@ -102,6 +105,8 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao
 			},
 		}
 		temp, err := api.FreightTemplateCreate(tempDetail)
+		globals.SugarLogger.Debugf("FreightTemplateCreate =err %s", utils.Format4Output(temp, false))
+		globals.SugarLogger.Debugf("FreightTemplateCreate =err %s", err)
 		if err != nil {
 			return 0, err
 		}
@@ -111,11 +116,12 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao
 			StoreId:   utils.Str2Int64(vendorStoreID),
 			FreightId: temp.TemplateId,
 		}); err != nil {
+			globals.SugarLogger.Debugf("BindFreightTemplate =err %s", err)
 			return 0, err
 		}
 		freightId = temp.TemplateId
 	}
-
+	globals.SugarLogger.Debugf("freightId =last %d", freightId)
 	return freightId, nil
 }