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

- fk

Browse Source
This commit is contained in:
gazebo
2019-04-09 15:18:46 +08:00
parent 3900e71265
commit 6ccf2d984f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,8 +153,8 @@ func init() {
} }
} }
if isAcceptIt { if isAcceptIt {
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
weixinmsg.NotifyNewOrder(order) weixinmsg.NotifyNewOrder(order)
}) })
msghub.OnNewOrder(order) msghub.OnNewOrder(order)
@@ -230,8 +230,8 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
if order.Status >= model.OrderStatusNew { if order.Status >= model.OrderStatusNew {
s.resetTimer(savedOrderInfo, nil, isPending) s.resetTimer(savedOrderInfo, nil, isPending)
if !isPending && order.Status >= model.OrderStatusAccepted { // 有订单消息错序，先收到接单消息，再收到新订单消息，导致接单TIMER不动作，这里补一下 if !isPending && order.Status >= model.OrderStatusAccepted { // 有订单消息错序，先收到接单消息，再收到新订单消息，导致接单TIMER不动作，这里补一下
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
weixinmsg.NotifyNewOrder(order) weixinmsg.NotifyNewOrder(order)
}) })
msghub.OnNewOrder(order) msghub.OnNewOrder(order)

4
business/partner/printer/feie/feie.go
View File

@@ -116,8 +116,10 @@ func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, id1, id2, msg string)
} }
func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, printerKey string) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, printerKey string) (printerStatus *partner.PrinterStatus, err error) {
if printerStatus.PrinterStatus, err = api.FeieAPI.QueryPrinterStatus(printerSN); err == nil { tmpStatus, err := api.FeieAPI.QueryPrinterStatus(printerSN)
if err == nil {
printerStatus = &partner.PrinterStatus{ printerStatus = &partner.PrinterStatus{
PrinterStatus: tmpStatus,
PrintResult: partner.PrintResultSuccess, PrintResult: partner.PrintResultSuccess,
} }
printerStatus.Printed, printerStatus.Waiting, err = api.FeieAPI.QueryOrderInfoByDate(printerSN, time.Now()) printerStatus.Printed, printerStatus.Waiting, err = api.FeieAPI.QueryOrderInfoByDate(printerSN, time.Now())