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

1

Browse Source
This commit is contained in:
richboo111
2023-08-16 14:24:47 +08:00
parent 8b777c6866
commit faa6b2eef8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxcallback/orderman/waybill.go
View File

@@ -156,6 +156,11 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
if bill.ActualFee > 0 { if bill.ActualFee > 0 {
addParams["actual_fee"] = bill.ActualFee addParams["actual_fee"] = bill.ActualFee
} }
//单独增加顺丰派送取消运单修改配送费逻辑
if bill.Status == model.WaybillStatusCanceled && bill.WaybillVendorID == model.VendorIDSFPS {
addParams["desired_fee"] = bill.DesiredFee
addParams["actual_fee"] = bill.ActualFee
}
} }
if bill.CourierMobile != "" { if bill.CourierMobile != "" {
addParams["courier_name"] = bill.CourierName addParams["courier_name"] = bill.CourierName

1
business/partner/delivery/sfps/waybill.go
View File

@@ -218,6 +218,7 @@ func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
bill.Status = model.WaybillStatusCanceled bill.Status = model.WaybillStatusCanceled
bill.Remark = cancelReason bill.Remark = cancelReason
bill.DesiredFee = money //取消成功才赋值违约金 bill.DesiredFee = money //取消成功才赋值违约金
bill.ActualFee = money
globals.SugarLogger.Debugf("CancelWaybill bill=%s", utils.Format4Output(bill, false)) globals.SugarLogger.Debugf("CancelWaybill bill=%s", utils.Format4Output(bill, false))
partner.CurOrderManager.OnWaybillStatusChanged(bill) partner.CurOrderManager.OnWaybillStatusChanged(bill)