From 22f9ba419d12cc0818859884affb26ca311c7ce5 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 2 Apr 2019 09:35:49 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E7=9A=84=E6=89=93=E5=8D=B0=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/jxutils.go               | 4 ++++
 business/jxutils/netprinter/netprinter.go | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 172050294..e025464df 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -193,6 +193,10 @@ func IntPrice2StandardString(value int64) string {
 	return fmt.Sprintf("%.2f", IntPrice2Standard(value))
 }
 
+func IntPrice2StandardCurrencyString(value int64) string {
+	return fmt.Sprintf("￥%.2f", IntPrice2Standard(value))
+}
+
 func CallMsgHandler(handler func(), primaryID string) {
 	routinePool.CallFun(func() {
 		handler()
diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go
index 1fd8ccde3..cd8780442 100644
--- a/business/jxutils/netprinter/netprinter.go
+++ b/business/jxutils/netprinter/netprinter.go
@@ -62,7 +62,7 @@ func GetFeieOrderContent(order *model.GoodsOrder, storeTel string) (content stri
 <BOLD>实际支付:</BOLD>%.2f<BR>
 <BR>
 商品明细: <BR>
-品名   数量    单价         小计
+品名    数量    单价       小计
 --------------------------------<BR>`
 	orderParams := []interface{}{
 		utils.Time2Str(order.OrderCreatedAt),
@@ -80,8 +80,8 @@ func GetFeieOrderContent(order *model.GoodsOrder, storeTel string) (content stri
 
 	for _, sku := range order.Skus {
 		orderFmt += `%s<BR>`
-		orderFmt += `%10d%10.2f%10.2f<BR>`
-		orderParams = append(orderParams, sku.SkuName, sku.Count, jxutils.IntPrice2Standard(sku.SalePrice), jxutils.IntPrice2Standard(sku.SalePrice*int64(sku.Count)))
+		orderFmt += `%10s%10s%10s<BR>`
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
 	}
 	orderFmt += `<BR>
 <BOLD>共%d种%d件商品</BOLD>