- update courier_name and courier_mobile on event >= model.WaybillStatusAccepted and < model.WaybillStatusEndBegin.

This commit is contained in:
gazebo
2018-08-20 15:30:59 +08:00
parent b69bac1182
commit b74a5e4379

View File

@@ -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