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

Merge remote-tracking branch 'origin/mark' into lcw

Browse Source
This commit is contained in:
renyutian
2019-04-09 15:19:28 +08:00
parent 1bc96f808a 6ccf2d984f
commit 4e567f1687
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,9 +116,11 @@ 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) {
if printerStatus.PrinterStatus, err = api.FeieAPI.QueryPrinterStatus(printerSN); err == nil {
tmpStatus, err := api.FeieAPI.QueryPrinterStatus(printerSN)
if err == nil {
printerStatus = &partner.PrinterStatus{
PrintResult: partner.PrintResultSuccess,
PrinterStatus: tmpStatus,
PrintResult: partner.PrintResultSuccess,
}
printerStatus.Printed, printerStatus.Waiting, err = api.FeieAPI.QueryOrderInfoByDate(printerSN, time.Now())
}