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

- fixed a bug, savedOrderInfo.timer is nil.

Browse Source
This commit is contained in:
gazebo
2018-07-19 12:27:53 +08:00
parent 3098740dce
commit 308b5b2cef
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/scheduler/defsch/defsch.go
View File

@@ -86,7 +86,7 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus) (err erro
} }
s.resetTimer(status.Status, savedOrderInfo, gap) s.resetTimer(status.Status, savedOrderInfo, gap)
} else { } else {
savedOrderInfo.timer.Stop() s.stopTimer(savedOrderInfo)
s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status)) s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
} }
return err return err
@@ -114,7 +114,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
if findIt { if findIt {
switch bill.Status { switch bill.Status {
case model.WaybillStatusAccepted: case model.WaybillStatusAccepted:
savedOrderInfo.timer.Stop() // todo 这里应该另外启动一个TIMER s.stopTimer(savedOrderInfo) // todo 这里应该另外启动一个TIMER
s.cancelOtherWaybills(bill) s.cancelOtherWaybills(bill)
s.CurOrderManager.UpdateWaybillVendorID(bill) s.CurOrderManager.UpdateWaybillVendorID(bill)
@@ -245,10 +245,14 @@ func (s *DefScheduler) getLatestPickupTimeout(order *model.GoodsOrder, configTim
return jxutils.GetRealTimeout(beginTime, configTimeout) return jxutils.GetRealTimeout(beginTime, configTimeout)
} }
func (s *DefScheduler) resetTimer(status int, savedOrderInfo *WatchOrderInfo, gap time.Duration) { func (s *DefScheduler) stopTimer(savedOrderInfo *WatchOrderInfo) {
if savedOrderInfo.timer != nil { if savedOrderInfo.timer != nil {
savedOrderInfo.timer.Stop() savedOrderInfo.timer.Stop()
} }
}
func (s *DefScheduler) resetTimer(status int, savedOrderInfo *WatchOrderInfo, gap time.Duration) {
s.stopTimer(savedOrderInfo)
config := s.mergeOrderStatusConfig(status, s.GetPurchasePlatformFromVendorID(savedOrderInfo.order.VendorID).GetStatusActionConfig(status)) config := s.mergeOrderStatusConfig(status, s.GetPurchasePlatformFromVendorID(savedOrderInfo.order.VendorID).GetStatusActionConfig(status))
if config != nil && config.TimeoutAction != nil { if config != nil && config.TimeoutAction != nil {
var timeout time.Duration var timeout time.Duration