From f85cdad6c304b687fb6b89c931f3d3c4ebf9eb88 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 24 Oct 2022 22:04:36 +0800 Subject: [PATCH] 1 --- .../partner/purchase/tiktok_store/store.go | 65 ++++++++----------- .../purchase/tiktok_store/store_sku2_utils.go | 17 ++--- 2 files changed, 32 insertions(+), 50 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index dd3dbc6eb..4193c0386 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -318,57 +318,44 @@ func (p *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod //默认 运费模板只创建 固定运费模板 func CreateFreightTemplate(storeCode int) (int64, error) { - var ( - columns []freightTemplate_create_request.ColumnsItem - childrenItems []freightTemplate_create_request.ChildrenItem - children5s []freightTemplate_create_request.ChildrenItem_5 - provinceInfos []freightTemplate_create_request.ProvinceInfosItem - children4s []freightTemplate_create_request.ChildrenItem_4 - ) //获取本地门店信息 storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeCode, model.VendorIDDD, "") if err != nil { return 0, err } - childrenItem := freightTemplate_create_request.ChildrenItem{ - Id: 0, //获取不到街道id - } - childrenItems = append(childrenItems, childrenItem) - children5 := freightTemplate_create_request.ChildrenItem_5{ - Id: int64(storeDetail.DistrictCode), - Children: childrenItems, - } - children5s = append(children5s, children5) - children4 := freightTemplate_create_request.ChildrenItem_4{ - Id: int64(storeDetail.CityCode), - Children: children5s, - } - children4s = append(children4s, children4) - provinceInfo := freightTemplate_create_request.ProvinceInfosItem{ - Id: int64(storeDetail.ProvinceCode), - Children: children4s, - } - provinceInfos = append(provinceInfos, provinceInfo) - column := freightTemplate_create_request.ColumnsItem{ - FirstNum: 1, - FirstNumPrice: 0.01, - AddNum: 1, - AddNumPrice: 0.01, - IsOverFree: true, //是否包邮 - OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额 - ProvinceInfos: provinceInfos, - } - columns = append(columns, column) param := &freightTemplate_create_request.FreightTemplateCreateParam{ Template: &freightTemplate_create_request.Template{ TemplateName: "门店编码：" + utils.Int2Str(storeCode) + "的运费模板", ProductProvince: int64(storeDetail.ProvinceCode), ProductCity: int64(storeDetail.CityCode), - CalculateType: 2, //模板类型为1-固定运费、2-卖家包邮、3-货到付款 时，计价类型传 2-按数量 + CalculateType: 2, //计价方式-1.按重量 2.按数量 TransferType: 1, - RuleType: 2, //卖家包邮 + RuleType: 1, //卖家包邮 + FixedAmount: 500, //固定运费 单位：分 }, - Columns: columns, + Columns: []freightTemplate_create_request.ColumnsItem{ + { + RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode)[:2], utils.Int2Str(storeDetail.DistrictCode)[:2]), + IsOverFree: true, //是否包邮 + OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额 + ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{ + { + Id: int64(storeDetail.ProvinceCode), + 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}, + }, + }, + }, + }, + }}, + }, + }}, } resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param) if err != nil { diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 407b57cc7..6fce93ee6 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -75,20 +75,15 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[0:2]), ProductCity: int64(storeDetail.CityCode), CalculateType: 2, - TransferType: 1, // 快递方式-1.快递 目前仅支持1 - RuleType: 2, // 模板类型-0:阶梯计价 1:固定运费 2:卖家包邮 3:货到付款 + TransferType: 1, // 快递方式-1.快递 目前仅支持1 + RuleType: 1, // 模板类型-0:阶梯计价 1:固定运费 2:卖家包邮 3:货到付款 + FixedAmount: 500, //固定运费 单位：分 }, Columns: []freightTemplate_create_request.ColumnsItem{ { - //FirstWeight: 0.1, - //FirstWeightPrice: 0.0, - FirstNum: 1, - FirstNumPrice: 1, - AddNum: 1, - AddNumPrice: 0.01, - RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode)[:2], utils.Int2Str(storeDetail.DistrictCode)[:2]), - IsOverFree: true, - OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), + RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode)[:2], utils.Int2Str(storeDetail.DistrictCode)[:2]), + IsOverFree: true, + OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{ { Id: int64(storeDetail.ProvinceCode),