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

- add updateBillsInfo to avoid possible warning

Browse Source
This commit is contained in:
gazebo
2019-02-19 09:43:20 +08:00
parent 6d83e6fa84
commit 9b9cade4ab
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -321,6 +321,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.resetTimer(savedOrderInfo, bill, isPending) s.resetTimer(savedOrderInfo, bill, isPending)
} }
} else { } else {
s.updateBillsInfo(savedOrderInfo, bill)
switch bill.Status { switch bill.Status {
case model.WaybillStatusAccepted: case model.WaybillStatusAccepted:
s.resetTimer(savedOrderInfo, bill, isPending) s.resetTimer(savedOrderInfo, bill, isPending)
@@ -792,6 +793,18 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa
} }
} }
func (s *DefScheduler) updateBillsInfo(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) {
if savedOrderInfo != nil {
if savedBill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]; savedBill != nil {
if savedBill.Status > bill.Status {
bill.Status = savedBill.Status
} else if bill.Status > savedBill.Status {
savedBill.Status = bill.Status
}
}
}
}
func (s *DefScheduler) autoPickupGood(order *model.GoodsOrder) (err error) { func (s *DefScheduler) autoPickupGood(order *model.GoodsOrder) (err error) {
err = s.PickupGoods(order, "") err = s.PickupGoods(order, "")
if err == scheduler.ErrOrderStatusAlreadySatisfyCurOperation { if err == scheduler.ErrOrderStatusAlreadySatisfyCurOperation {