包邮规则修改
This commit is contained in:
@@ -415,8 +415,8 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
|
||||
}
|
||||
param := &freightTemplate_create_request.FreightTemplateCreateParam{
|
||||
Template: &freightTemplate_create_request.Template{
|
||||
TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")的运费模板",
|
||||
ProductProvince: int64(storeDetail.ProvinceCode),
|
||||
TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")",
|
||||
ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]),
|
||||
ProductCity: int64(storeDetail.CityCode),
|
||||
CalculateType: 2, //计价方式-1.按重量 2.按数量
|
||||
TransferType: 1,
|
||||
@@ -427,10 +427,9 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
|
||||
if int64(storeDetail.DeliveryFeeDeductionSill) != 0 {
|
||||
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, //是否包邮
|
||||
IsLimited: false,
|
||||
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
|
||||
IsOverFree: true, //是否包邮
|
||||
IsLimited: false,
|
||||
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
|
||||
ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{
|
||||
{
|
||||
Id: int64(storeDetail.ProvinceCode),
|
||||
@@ -450,6 +449,9 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
|
||||
},
|
||||
}}
|
||||
param.Columns = columns
|
||||
param.Template.TemplateName += "满减包邮模板"
|
||||
} else {
|
||||
param.Template.TemplateName += "固定运费模板"
|
||||
}
|
||||
resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param)
|
||||
if err != nil {
|
||||
@@ -463,7 +465,7 @@ func UpdateFreightTemplate(storeCode int) error {
|
||||
globals.SugarLogger.Debugf("进入UpdateFreightTemplate")
|
||||
var (
|
||||
columns []freightTemplate_update_request.ColumnsItem
|
||||
param *freightTemplate_update_request.FreightTemplateUpdateParam
|
||||
//param *freightTemplate_update_request.FreightTemplateUpdateParam
|
||||
)
|
||||
//获取本地门店信息
|
||||
storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeCode, model.VendorIDDD, "")
|
||||
@@ -488,18 +490,17 @@ func UpdateFreightTemplate(storeCode int) error {
|
||||
RuleType: 1, //固定运费
|
||||
FixedAmount: 500, //固定运费 单位:分
|
||||
}
|
||||
if int64(storeDetail.DeliveryFeeDeductionSill) != 0 {
|
||||
if int64(storeDetail.DeliveryFeeDeductionSill) != 0 { //包邮规则不支持全量四级地址
|
||||
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, //是否包邮
|
||||
IsDefault: 0,
|
||||
IsLimited: false,
|
||||
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
|
||||
IsOverFree: true, //是否包邮
|
||||
IsDefault: 0,
|
||||
IsLimited: false,
|
||||
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
|
||||
}}
|
||||
globals.SugarLogger.Debugf("columns[0].OverAmount===========%d", columns[0].OverAmount)
|
||||
}
|
||||
param = &freightTemplate_update_request.FreightTemplateUpdateParam{
|
||||
param := &freightTemplate_update_request.FreightTemplateUpdateParam{
|
||||
Template: Template,
|
||||
Columns: columns,
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ const (
|
||||
|
||||
// /warehouse/create 创建单个区域仓
|
||||
func CreateWarehouse(appOrgCode, outWarehouseID string) (warehouseID int64, err error) {
|
||||
tempName := "京西菜市(" + outWarehouseID + ")的区域仓"
|
||||
tempName := "京西菜市(" + outWarehouseID + ") 的区域仓"
|
||||
req := &warehouse_create_request.WarehouseCreateParam{
|
||||
OutWarehouseId: outWarehouseID,
|
||||
Name: tempName,
|
||||
@@ -247,7 +247,7 @@ func GetFence(appOrgCode, outFenceID string) (warehouse_getFences_response.Fence
|
||||
return resp.Fences[0], nil
|
||||
}
|
||||
|
||||
//单独处理运费模板
|
||||
//特殊处理
|
||||
func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeductionFee, minPrice int64) error {
|
||||
var (
|
||||
errList = errlist.New()
|
||||
|
||||
Reference in New Issue
Block a user