diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 24982324b..0cb809187 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -423,13 +423,20 @@ func CreateFreightTemplate(storeCode int) (int64, error) { Template: &freightTemplate_create_request.Template{ TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")_", ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]), - ProductCity: int64(storeDetail.CityCode), CalculateType: 2, //计价方式-1.按重量 2.按数量 TransferType: 1, RuleType: 1, //固定运费&卖家包邮 FixedAmount: 500, //固定运费 单位:分 }, } + //直辖市特殊处理 + flag := false + if storeDetail.CityName == tiktok_api.MunicipalityBeiJin || storeDetail.CityName == tiktok_api.MunicipalityShangHai || storeDetail.CityName == tiktok_api.MunicipalityTianJin || storeDetail.CityName == tiktok_api.MunicipalityChongQing { + flag = true + param.Template.ProductCity = int64(storeDetail.ProvinceCode) + } else { + param.Template.ProductCity = int64(storeDetail.CityCode) + } if int64(storeDetail.DeliveryFeeDeductionSill) != 0 { param.Template.TemplateName += "满减包邮模板" columns := []freightTemplate_create_request.ColumnsItem{ @@ -437,30 +444,50 @@ func CreateFreightTemplate(storeCode int) (int64, error) { IsOverFree: true, //是否包邮 IsLimited: false, OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额 - ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{ - { - Id: int64(storeDetail.ProvinceCode), - Children: []freightTemplate_create_request.ChildrenItem_4{ - { - Id: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]), - Children: []freightTemplate_create_request.ChildrenItem_5{ - { - Id: int64(storeDetail.DistrictCode), - Children: []freightTemplate_create_request.ChildrenItem{ - {Id: 0}, - }, + }} + param.Columns = columns + if flag { + param.Columns[0].ProvinceInfos = []freightTemplate_create_request.ProvinceInfosItem{ + { + Id: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]), + Children: []freightTemplate_create_request.ChildrenItem_4{ + { + Id: int64(storeDetail.ProvinceCode), + Children: []freightTemplate_create_request.ChildrenItem_5{ + { + Id: int64(storeDetail.DistrictCode), + Children: []freightTemplate_create_request.ChildrenItem{ + {Id: 0}, }, }, }, - }}, - }, - }} - param.Columns = columns + }, + }}, + } + } else { + param.Columns[0].ProvinceInfos = []freightTemplate_create_request.ProvinceInfosItem{ + { + Id: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]), + Children: []freightTemplate_create_request.ChildrenItem_4{ + { + Id: int64(storeDetail.CityCode), + Children: []freightTemplate_create_request.ChildrenItem_5{ + { + Id: int64(storeDetail.DistrictCode), + Children: []freightTemplate_create_request.ChildrenItem{ + {Id: 0}, + }, + }, + }, + }, + }}, + } + } } else { param.Columns = nil param.Template.TemplateName += "固定运费模板" } - globals.SugarLogger.Debugf("storeDetail.ProvinceCode==%d,storeDetail.CityCode==%d,storeDetail.DistrictCode==%d", utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]), storeDetail.CityCode, storeDetail.DistrictCode) + globals.SugarLogger.Debugf(" param.Template.ProductCity==%d,param.Template.ProductProvince==%d", param.Template.ProductCity, param.Template.ProductProvince) resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param) if err != nil { return 0, err @@ -485,14 +512,18 @@ func UpdateFreightTemplate(storeCode int) error { Template: &freightTemplate_update_request.Template{ Id: bindTemplate, TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")_", - ProductProvince: int64(storeDetail.ProvinceCode), - ProductCity: int64(storeDetail.CityCode), + ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]), CalculateType: 2, //计价方式-1.按重量 2.按数量 TransferType: 1, RuleType: 1, //固定运费 FixedAmount: 500, //固定运费 单位:分 }, } + if storeDetail.CityName == tiktok_api.MunicipalityBeiJin || storeDetail.CityName == tiktok_api.MunicipalityShangHai || storeDetail.CityName == tiktok_api.MunicipalityTianJin || storeDetail.CityName == tiktok_api.MunicipalityChongQing { + param.Template.ProductCity = int64(storeDetail.ProvinceCode) + } else { + param.Template.ProductCity = int64(storeDetail.CityCode) + } if int64(storeDetail.DeliveryFeeDeductionSill) != 0 { param.Template.TemplateName += "满减包邮模板" columns := []freightTemplate_update_request.ColumnsItem{