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

- 修复打印，发送新订单消息触发位置的错误

Browse Source
This commit is contained in:
gazebo
2019-04-02 09:15:57 +08:00
parent 73e16b2e57
commit 7d813f12b6
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/orderman/order.go
View File

@@ -69,7 +69,6 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus strin
isDuplicated, err := addOrderOrWaybillStatus(status, db) isDuplicated, err := addOrderOrWaybillStatus(status, db)
if err == nil && !isDuplicated { if err == nil && !isDuplicated {
if isDuplicated, err = c.SaveOrder(order, false, db); err == nil && !isDuplicated { if isDuplicated, err = c.SaveOrder(order, false, db); err == nil && !isDuplicated {
msghub.OnNewOrder(order)
err = scheduler.CurrentScheduler.OnOrderNew(order, false) err = scheduler.CurrentScheduler.OnOrderNew(order, false)
} }
} }

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

@@ -8,6 +8,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
"git.rosy.net.cn/jx-callback/business/msghub"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
@@ -150,12 +151,13 @@ func init() {
err = err2 err = err2
} }
} }
if isAcceptIt { }
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) if isAcceptIt {
utils.CallFuncAsync(func() { netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
weixinmsg.NotifyNewOrder(order) utils.CallFuncAsync(func() {
}) weixinmsg.NotifyNewOrder(order)
} })
msghub.OnNewOrder(order)
} }
return err return err
}) })