From b74a5e43794b4c2c289a198173c2a70955421aaa Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 20 Aug 2018 15:30:59 +0800 Subject: [PATCH] - update courier_name and courier_mobile on event >= model.WaybillStatusAccepted and < model.WaybillStatusEndBegin. --- business/jxcallback/orderman/waybill.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index 618757907..3269df500 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -69,13 +69,15 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { if bill.Status == model.WaybillStatusNew { isDuplicated, err = w.onWaybillNew(bill, db) } else { - var addParams orm.Params - if bill.Status == model.WaybillStatusAccepted { - addParams = orm.Params{ - "courier_name": bill.CourierName, - "courier_mobile": bill.CourierMobile, - "desired_fee": bill.DesiredFee, + addParams := orm.Params{} + if bill.Status >= model.WaybillStatusAccepted && bill.Status < model.WaybillStatusEndBegin { + if bill.Status == model.WaybillStatusAccepted { + addParams["desired_fee"] = bill.DesiredFee } + addParams["courier_name"] = bill.CourierName + addParams["courier_mobile"] = bill.CourierMobile + } else if bill.Status >= model.WaybillStatusEndBegin { + addParams["waybill_finished_at"] = bill.StatusTime } isDuplicated, err = w.addWaybillStatus(bill, db, addParams) } @@ -97,9 +99,6 @@ func (w *OrderManager) addWaybillStatus(bill *model.Waybill, db orm.Ormer, addPa "vendor_status": bill.VendorStatus, "status_time": bill.StatusTime, }, addParams) - if bill.Status >= model.WaybillStatusEndBegin { - params["waybill_finished_at"] = bill.StatusTime - } utils.CallFuncLogError(func() error { _, err = db.QueryTable("waybill").Filter("vendor_waybill_id", bill.VendorWaybillID).Filter("waybill_vendor_id", bill.WaybillVendorID).Update(params) return err