liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

包邮规则修改

Browse Source
This commit is contained in:
richboo111
2022-11-04 16:42:37 +08:00
parent 5784ecda50
commit aef0c2c20d
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
business/partner/purchase/tiktok_store/store.go
View File

@@ -415,8 +415,8 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
} }
param := &freightTemplate_create_request.FreightTemplateCreateParam{ param := &freightTemplate_create_request.FreightTemplateCreateParam{
Template: &freightTemplate_create_request.Template{ Template: &freightTemplate_create_request.Template{
TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")的运费模板", TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")",
ProductProvince: int64(storeDetail.ProvinceCode), ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]),
ProductCity: int64(storeDetail.CityCode), ProductCity: int64(storeDetail.CityCode),
CalculateType: 2, //计价方式-1.按重量 2.按数量 CalculateType: 2, //计价方式-1.按重量 2.按数量
TransferType: 1, TransferType: 1,
@@ -427,7 +427,6 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
if int64(storeDetail.DeliveryFeeDeductionSill) != 0 { if int64(storeDetail.DeliveryFeeDeductionSill) != 0 {
columns := []freightTemplate_create_request.ColumnsItem{ columns := []freightTemplate_create_request.ColumnsItem{
{ {
RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode), utils.Int2Str(storeDetail.DistrictCode)),
IsOverFree: true, //是否包邮 IsOverFree: true, //是否包邮
IsLimited: false, IsLimited: false,
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额 OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
@@ -450,6 +449,9 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
}, },
}} }}
param.Columns = columns param.Columns = columns
param.Template.TemplateName += "满减包邮模板"
} else {
param.Template.TemplateName += "固定运费模板"
} }
resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param) resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param)
if err != nil { if err != nil {
@@ -463,7 +465,7 @@ func UpdateFreightTemplate(storeCode int) error {
globals.SugarLogger.Debugf("进入UpdateFreightTemplate") globals.SugarLogger.Debugf("进入UpdateFreightTemplate")
var ( var (
columns []freightTemplate_update_request.ColumnsItem columns []freightTemplate_update_request.ColumnsItem
param *freightTemplate_update_request.FreightTemplateUpdateParam //param *freightTemplate_update_request.FreightTemplateUpdateParam
) )
//获取本地门店信息 //获取本地门店信息
storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeCode, model.VendorIDDD, "") storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeCode, model.VendorIDDD, "")
@@ -488,10 +490,9 @@ func UpdateFreightTemplate(storeCode int) error {
RuleType: 1, //固定运费 RuleType: 1, //固定运费
FixedAmount: 500, //固定运费 单位：分 FixedAmount: 500, //固定运费 单位：分
} }
if int64(storeDetail.DeliveryFeeDeductionSill) != 0 { if int64(storeDetail.DeliveryFeeDeductionSill) != 0 { //包邮规则不支持全量四级地址
columns = []freightTemplate_update_request.ColumnsItem{ columns = []freightTemplate_update_request.ColumnsItem{
{ {
RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode), utils.Int2Str(storeDetail.DistrictCode)),
IsOverFree: true, //是否包邮 IsOverFree: true, //是否包邮
IsDefault: 0, IsDefault: 0,
IsLimited: false, IsLimited: false,
@@ -499,7 +500,7 @@ func UpdateFreightTemplate(storeCode int) error {
}} }}
globals.SugarLogger.Debugf("columns[0].OverAmount===========%d", columns[0].OverAmount) globals.SugarLogger.Debugf("columns[0].OverAmount===========%d", columns[0].OverAmount)
} }
param = &freightTemplate_update_request.FreightTemplateUpdateParam{ param := &freightTemplate_update_request.FreightTemplateUpdateParam{
Template: Template, Template: Template,
Columns: columns, Columns: columns,
} }

2
business/partner/purchase/tiktok_store/warehouse.go
View File

@@ -247,7 +247,7 @@ func GetFence(appOrgCode, outFenceID string) (warehouse_getFences_response.Fence
return resp.Fences[0], nil return resp.Fences[0], nil
} }
//单独处理运费模板 //特殊处理
func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeductionFee, minPrice int64) error { func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeductionFee, minPrice int64) error {
var ( var (
errList = errlist.New() errList = errlist.New()