1

business/partner/purchase/tiktok_store/store_sku2_utils.go

@@ -80,25 +80,6 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao
 				RuleType:        1,   // 模板类型-0:阶梯计价 1:固定运费 2:卖家包邮 3:货到付款
 				FixedAmount:     500, //固定运费 单位：分
 			},
-<<<<<<< HEAD
-			Columns: []freightTemplate_create_request.ColumnsItem{
-				{
-					RuleAddress: fmt.Sprintf(`{"%d":{"%s":{"%s":[0]}}}`, productProvince, utils.Int2Str(storeDetail.CityCode), utils.Int2Str(storeDetail.DistrictCode)),
-					IsOverFree:  true,
-					IsLimited:   false,
-					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,
-										},
-=======
 		}
 		Columns := []freightTemplate_create_request.ColumnsItem{
 			{
@@ -115,7 +96,6 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao
 									{
 										Id:       int64(storeDetail.DistrictCode),
 										Children: nil,
->>>>>>> f78ca1769e15338c0b7dd4474d40b3d3be8d2a3e
 									},
 								},
 							},