This commit is contained in:
邹宗楠
2023-08-23 16:43:03 +08:00
parent 03c735fb6c
commit ef6b8b19fe

View File

@@ -149,14 +149,14 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
} }
addParams := orm.Params{} addParams := orm.Params{}
if bill.Status >= model.WaybillStatusAccepted { if bill.Status >= model.WaybillStatusAccepted {
if bill.Status == model.WaybillStatusAccepted { //if bill.Status == model.WaybillStatusAccepted {等于10的时候没有运费
if bill.DesiredFee > 0 { if bill.DesiredFee > 0 {
addParams["desired_fee"] = bill.DesiredFee addParams["desired_fee"] = bill.DesiredFee
} }
if bill.ActualFee > 0 { if bill.ActualFee > 0 {
addParams["actual_fee"] = bill.ActualFee addParams["actual_fee"] = bill.ActualFee
} }
} //}
//单独增加顺丰派送取消运单修改配送费逻辑 //单独增加顺丰派送取消运单修改配送费逻辑
if (bill.WaybillVendorID == model.VendorIDSFPS || bill.WaybillVendorID == model.VendorIDMTWM) && bill.Status == model.WaybillStatusCanceled { if (bill.WaybillVendorID == model.VendorIDSFPS || bill.WaybillVendorID == model.VendorIDMTWM) && bill.Status == model.WaybillStatusCanceled {
addParams["desired_fee"] = bill.DesiredFee addParams["desired_fee"] = bill.DesiredFee