- add new order status OrderStatusWait4Pay
- handle weimob wsc order status OrderStatusWait4Pay
This commit is contained in:
@@ -280,9 +280,11 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
|
||||
} else {
|
||||
savedOrderInfo.SetOrder(order) // 调整单或消息错序都可能进到这里来
|
||||
}
|
||||
s.resetTimer(savedOrderInfo, nil, isPending)
|
||||
if !isPending {
|
||||
weixinmsg.NotifyNewOrder(order)
|
||||
if order.Status >= model.OrderStatusNew {
|
||||
s.resetTimer(savedOrderInfo, nil, isPending)
|
||||
if !isPending {
|
||||
weixinmsg.NotifyNewOrder(order)
|
||||
}
|
||||
}
|
||||
return err
|
||||
}
|
||||
@@ -292,6 +294,11 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus, isPending
|
||||
if status.LockStatus != model.OrderStatusUnknown || status.Status > model.OrderStatusUnknown {
|
||||
globals.SugarLogger.Debugf("OnOrderStatusChanged orderID:%s %s, status:%v", status.VendorOrderID, model.OrderStatusName[status.Status], status)
|
||||
savedOrderInfo := s.loadSavedOrderFromMap(status, true)
|
||||
if status.Status == model.OrderStatusNew {
|
||||
if !isPending {
|
||||
weixinmsg.NotifyNewOrder(savedOrderInfo.order)
|
||||
}
|
||||
}
|
||||
s.updateOrderByStatus(savedOrderInfo.order, status)
|
||||
if status.LockStatus == model.OrderStatusUnknown && status.Status > model.OrderStatusUnknown { // 只处理状态转换,一般消息不处理
|
||||
s.resetTimer(savedOrderInfo, nil, isPending)
|
||||
|
||||
Reference in New Issue
Block a user