From 677dc093fb7a91b843ad64acac73cffb6d99e4fb Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 22 Oct 2019 20:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E5=8D=95=E7=BB=93=E6=9D=9F=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=BF=AB=E9=80=92?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/waybill.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index d795ac4f6..8ef0425a1 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -132,7 +132,7 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { } } addParams := orm.Params{} - if bill.Status >= model.WaybillStatusAccepted && bill.Status < model.WaybillStatusEndBegin { + if bill.Status >= model.WaybillStatusAccepted { if bill.Status == model.WaybillStatusAccepted { if bill.DesiredFee > 0 { addParams["desired_fee"] = bill.DesiredFee @@ -145,8 +145,9 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { addParams["courier_name"] = bill.CourierName addParams["courier_mobile"] = bill.CourierMobile } - } else if bill.Status >= model.WaybillStatusEndBegin { - addParams["waybill_finished_at"] = bill.StatusTime + if bill.Status >= model.WaybillStatusEndBegin { + addParams["waybill_finished_at"] = bill.StatusTime + } } duplicatedCount, err = w.addWaybillStatus(bill, db, addParams) if err != nil {