From 73e16b2e5734963fbee0cd9d488ff5a336892269 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 1 Apr 2019 23:42:21 +0800 Subject: [PATCH] - json for PrinterStatus --- business/jxutils/netprinter/netprinter.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index 88bb3cc35..1fd8ccde3 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -17,15 +17,15 @@ import ( ) type PrinterStatus struct { - PrintResult int // 0：成功，1：没有配置网络打印机 + PrintResult int `json:"printResult"` // 0：成功，1：没有配置网络打印机 // PrinterStatusUnknown = 0 // PrinterStatusOffline = 1 // PrinterStatusOnlineOK = 2 // PrinterStatusOnlineAbnormal = 3 - PrinterStatus int - Printed int // 已经打印的单数 - Waiting int // 等待打印的单数，超过1一般不太正常 + PrinterStatus int `json:"printerStatus"` + Printed int `json:"printed"` // 已经打印的单数 + Waiting int `json:"waiting"` // 等待打印的单数，超过1一般不太正常 } const ( @@ -151,8 +151,10 @@ func GetNetPrinterStatus(ctx *jxcontext.Context, storeID int) (printResult *Prin } func getNetPrinterStatus(ctx *jxcontext.Context, sn string) (printResult *PrinterStatus, err error) { - printResult = &PrinterStatus{} - if printResult.PrintResult, err = api.FeieAPI.QueryPrinterStatus(sn); err == nil { + printResult = &PrinterStatus{ + PrintResult: PrintResultSuccess, + } + if printResult.PrinterStatus, err = api.FeieAPI.QueryPrinterStatus(sn); err == nil { printResult.Printed, printResult.Waiting, err = api.FeieAPI.QueryOrderInfoByDate(sn, time.Now()) } return printResult, nil