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

ebai

Browse Source
This commit is contained in:
suyl
2020-11-07 12:42:22 +08:00
parent 9c36dc1417
commit 70977349be
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,9 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
savedOrderInfo.SetOrder(order) savedOrderInfo.SetOrder(order)
if order.Status == model.OrderStatusWaitAccepted { if order.Status == model.OrderStatusWaitAccepted {
s.resetTimer(savedOrderInfo, nil, isPending) s.resetTimer(savedOrderInfo, nil, isPending)
push.NotifyNewOrder(order) // push.NotifyNewOrder(order)
s.notifyNewOrder(order)
msghub.OnNewOrder(order)
} }
if order.Status >= model.OrderStatusNew { if order.Status >= model.OrderStatusNew {
s.resetTimer(savedOrderInfo, nil, isPending) s.resetTimer(savedOrderInfo, nil, isPending)
@@ -1457,7 +1459,7 @@ func setFakeActualPayPrice(order *model.GoodsOrder) (newOrder *model.GoodsOrder)
} }
func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) { func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
if order.Flag&model.OrderFlagMaskFake == 0 { if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
order = setFakeActualPayPrice(order) order = setFakeActualPayPrice(order)
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
@@ -1472,9 +1474,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
smsmsg.NotifyNewOrder(order) smsmsg.NotifyNewOrder(order)
smsmsg.NotifyNewUserOrder(order) smsmsg.NotifyNewUserOrder(order)
} }
if order.VendorID != model.VendorIDEBAI {
push.NotifyNewOrder(order) push.NotifyNewOrder(order)
}
}) })
} }
} }