Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/partner/purchase/tiktok_store/store.go

@@ -494,6 +494,7 @@ func CreateFreightTemplate(storeCode, deliveryFeeDeductionSill int) (int64, erro
 		//},
 		//}
 	}
+	globals.SugarLogger.Debugf("CreateFreightTemplate 直辖市code====%d", param.Template.ProductCity)
 	if deliveryFeeDeductionSill != 0 {
 		param.Template.TemplateName += "满减包邮模板"
 		param.Columns = []freightTemplate_create_request.ColumnsItem{{
@@ -600,6 +601,7 @@ func CreateBindFreeShipTemplate(vendorOrgCode string, storeID int, shipFee int64
 	} else {
 		param.Template.ProductCity = int64(storeDetail.CityCode)
 	}
+	globals.SugarLogger.Debugf("CreateBindFreeShipTemplate 直辖市code=%d", param.Template.ProductCity)
 	if resp, err := getAPI(vendorOrgCode, 0, "").FreightTemplateCreate(param); err != nil {
 		return errors.New(fmt.Sprintf("平台门店(%s) 京西门店(%d) 创建包邮模板失败:%v,根据提示处理", storeDetail.VendorStoreID, storeID, err))
 	} else {

business/partner/purchase/tiktok_store/store_sku2_utils.go

@@ -4,6 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
+	"time"
+	"unicode"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request"
@@ -28,10 +32,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/putils"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
-	"math/rand"
-	"strings"
-	"time"
-	"unicode"
 )
 
 type MainSku struct {
@@ -821,44 +821,29 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao
 		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))),
+				TemplateName:    utils.Int2Str(storeDetail.ID) + "的",
 				ProductProvince: productProvince,
-				ProductCity:     int64(storeDetail.CityCode),
 				CalculateType:   2,
 				TransferType:    1,   // 快递方式-1.快递 目前仅支持1
 				RuleType:        1,   // 模板类型-0:阶梯计价 1:固定运费 2:卖家包邮 3:货到付款
 				FixedAmount:     500, //固定运费 单位：分
 			},
 		}
-		Columns := []freightTemplate_create_request.ColumnsItem{
-			{
-				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: productProvince,
-						Children: []freightTemplate_create_request.ChildrenItem_4{
-							{
-								Id: int64(storeDetail.CityCode),
-								Children: []freightTemplate_create_request.ChildrenItem_5{
-									{
-										Id:       int64(storeDetail.DistrictCode),
-										Children: nil,
-									},
-								},
-							},
-						}},
-				},
-			},
-		}
-		// 固定运费模板
-		if storeDetail.DeliveryFeeDeductionSill == 0 {
-			tempDetail.Template.TemplateName += "固定运费模板"
+		//直辖市特殊处理
+		if flag, code := HandleMunicipality(storeDetail.CityName); flag {
+			tempDetail.Template.ProductCity = code
 		} else {
-			// 满减运费模板
+			tempDetail.Template.ProductCity = int64(storeDetail.CityCode)
+		}
+		if storeDetail.DeliveryFeeDeductionSill == 0 { // 固定运费模板
+			tempDetail.Template.TemplateName += "固定运费模板"
+		} else { // 满减运费模板
 			tempDetail.Template.TemplateName += "满减运费模板"
-			tempDetail.Columns = Columns // 满减
+			tempDetail.Columns = []freightTemplate_create_request.ColumnsItem{{
+				IsOverFree: true, //是否包邮
+				IsLimited:  false,
+				OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
+			}}
 		}
 		temp, err := api.FreightTemplateCreate(tempDetail)
 		if err != nil {