From 00e0106e9b4f1839bd62c5258a7625e81e03d4f3 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 2 Aug 2019 14:29:48 +0800
Subject: [PATCH] + cms.printerStatusName

---
 business/jxstore/cms/cms.go         |  2 ++
 business/partner/partner.go         | 24 ------------------------
 business/partner/partner_printer.go | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 8ec8cd923..6db9dab30 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -10,6 +10,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/mobile"
 	"git.rosy.net.cn/jx-callback/business/jxutils/msg"
+	"git.rosy.net.cn/jx-callback/business/partner"
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -76,6 +77,7 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
 			"storeMsgSendStatusName": model.StoreMsgSendStatusName,
 			"shopChineseNames":       model.ShopChineseNames,
 			"printerVendorInfo":      model.PrinterVendorInfo,
+			"printerStatusName":      partner.PrinterStatusName,
 			"purchaseVendorInfo":     model.PurchaseVendorInfo,
 			"afsReasonTypeName":      model.AfsReasonTypeName,
 			"afsAppealTypeName":      model.AfsAppealTypeName,
diff --git a/business/partner/partner.go b/business/partner/partner.go
index d4a1150a4..7e3df1c82 100644
--- a/business/partner/partner.go
+++ b/business/partner/partner.go
@@ -26,36 +26,12 @@ const (
 	CancelWaybillReasonOther             = 10
 )
 
-const (
-	PrinterStatusUnknown        = 0
-	PrinterStatusOffline        = 1
-	PrinterStatusOnlineOK       = 2
-	PrinterStatusOnlineAbnormal = 3
-)
-
 const (
 	AfsApproveTypeRefund      = 1 // 退款
 	AfsApproveTypeReturnGoods = 2 // 退货
 	AfsApproveTypeRefused     = 3 // 驳回
 )
 
-const (
-	PrintResultSuccess   = 0
-	PrintResultNoPrinter = 1
-)
-
-type PrinterStatus struct {
-	PrintResult int `json:"printResult"` // 0：成功，1：没有配置网络打印机
-
-	// PrinterStatusUnknown        = 0
-	// PrinterStatusOffline        = 1
-	// PrinterStatusOnlineOK       = 2
-	// PrinterStatusOnlineAbnormal = 3
-	PrinterStatus int `json:"printerStatus"`
-	Printed       int `json:"printed"` // 已经打印的单数
-	Waiting       int `json:"waiting"` // 等待打印的单数，超过1一般不太正常
-}
-
 const (
 	TimerTypeNoOverride         = 0 // GetStatusActionConfig 返回表示不修改缺省配置
 	TimerTypeByPass             = 1
diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go
index 59c896838..f0ea317db 100644
--- a/business/partner/partner_printer.go
+++ b/business/partner/partner_printer.go
@@ -7,6 +7,34 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
+const (
+	PrinterStatusUnknown        = 0
+	PrinterStatusOffline        = 1
+	PrinterStatusOnlineOK       = 2
+	PrinterStatusOnlineAbnormal = 3
+)
+
+const (
+	PrintResultSuccess   = 0 // 成功
+	PrintResultNoPrinter = 1 // 没有配置网络打印机
+)
+
+var (
+	PrinterStatusName = map[int]string{
+		PrinterStatusUnknown:        "未知",
+		PrinterStatusOffline:        "离线",
+		PrinterStatusOnlineOK:       "正常",
+		PrinterStatusOnlineAbnormal: "异常",
+	}
+)
+
+type PrinterStatus struct {
+	PrintResult   int `json:"printResult"`
+	PrinterStatus int `json:"printerStatus"`
+	Printed       int `json:"printed"` // 已经打印的单数
+	Waiting       int `json:"waiting"` // 等待打印的单数，超过1一般不太正常
+}
+
 type BindPrinterResult struct {
 	PrinterSN   string `json:"printerSN"`
 	PrinterKey  string `json:"printerKey"`