- 将飞鹅的一些信息转化得更易懂

platformapi/feieapi/feieapi.go

@@ -24,9 +24,22 @@ const (
 )
 
 const (
-	PrinterStatusOffline        = "离线。"
-	PrinterStatusOnlineOK       = "在线，工作状态正常。"
-	PrinterStatusOnlineAbnormal = "在线，工作状态不正常。"
+	PrinterStatusStrOffline        = "离线。"
+	PrinterStatusStrOnlineOK       = "在线，工作状态正常。"
+	PrinterStatusStrOnlineAbnormal = "在线，工作状态不正常。"
+
+	PrinterStatusUnknown        = 0
+	PrinterStatusOffline        = 1
+	PrinterStatusOnlineOK       = 2
+	PrinterStatusOnlineAbnormal = 3
+)
+
+var (
+	printStatusMap = map[string]int{
+		PrinterStatusStrOffline:        PrinterStatusOffline,
+		PrinterStatusStrOnlineOK:       PrinterStatusOnlineOK,
+		PrinterStatusStrOnlineAbnormal: PrinterStatusOnlineAbnormal,
+	}
 )
 
 const (
@@ -238,23 +251,24 @@ func (a *API) QueryOrderState(orderID string) (isFinished bool, err error) {
 	return false, err
 }
 
-func (a *API) QueryOrderInfoByDate(sn string, date time.Time) (data map[string]interface{}, err error) {
+func (a *API) QueryOrderInfoByDate(sn string, date time.Time) (printed, waiting int, err error) {
 	result, err := a.AccessAPI("Open_queryOrderInfoByDate", map[string]interface{}{
 		"sn":   sn,
 		"date": utils.Time2DateStr(date),
 	})
 	if err == nil {
-		return result.(map[string]interface{}), nil
+		resultMap := result.(map[string]interface{})
+		return int(utils.Interface2Int64WithDefault(resultMap["print"], 0)), int(utils.Interface2Int64WithDefault(resultMap["waiting"], 0)), nil
 	}
-	return nil, err
+	return 0, 0, err
 }
 
-func (a *API) QueryPrinterStatus(sn string) (status string, err error) {
+func (a *API) QueryPrinterStatus(sn string) (status int, err error) {
 	result, err := a.AccessAPI("Open_queryPrinterStatus", map[string]interface{}{
 		"sn": sn,
 	})
 	if err == nil {
-		return result.(string), nil
+		return printStatusMap[result.(string)], nil
 	}
-	return "", err
+	return PrinterStatusUnknown, err
 }

platformapi/feieapi/feieapi_test.go

@@ -59,11 +59,11 @@ func TestPrinterDelList(t *testing.T) {
 }
 
 func TestQueryOrderInfoByDate(t *testing.T) {
-	data, err := api.QueryOrderInfoByDate("218510310", time.Now())
+	printed, waiting, err := api.QueryOrderInfoByDate("218510310", time.Now())
 	if err != nil {
 		t.Fatalf("QueryOrderInfoByDate return error:%v", err)
 	}
-	baseapi.SugarLogger.Debug(utils.Format4Output(data, false))
+	baseapi.SugarLogger.Debugf("print:%d, waiting:%d", printed, waiting)
 }
 
 func TestDelPrinterSqs(t *testing.T) {
@@ -80,3 +80,11 @@ func TestQueryPrinterStatus(t *testing.T) {
 	}
 	baseapi.SugarLogger.Debug(status)
 }
+
+func TestQueryOrderState(t *testing.T) {
+	status, err := api.QueryOrderState("218510310")
+	if err != nil {
+		t.Fatalf("QueryOrderState return error:%v", err)
+	}
+	baseapi.SugarLogger.Debug(status)
+}