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:
苏尹岚
2020-11-09 10:28:40 +08:00
parent 7600f6768f
commit 0e2b692adc
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,8 +378,22 @@ 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) if order.Flag&model.OrderFlagMaskFake == 0 {
s.notifyNewOrder(order) utils.CallFuncAsync(func() {
order = setFakeActualPayPrice(order)
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
//目前暂且认为AdjustCount > 0 就是调整单
if order.AdjustCount > 0 {
weixinmsg.NotifyAdjustOrder(order)
} else {
weixinmsg.NotifyNewOrder(order)
}
OrderProfitWarning(order)
smsmsg.NotifyNewOrder(order)
smsmsg.NotifyNewUserOrder(order)
push.NotifyNewOrder(order)
})
}
msghub.OnNewOrder(order) msghub.OnNewOrder(order)
} }
if order.Status >= model.OrderStatusNew { if order.Status >= model.OrderStatusNew {
@@ -1459,7 +1473,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)