From 5236fdf90c4bbb87e22891dd2a51cb0318858639 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 10 Apr 2019 16:09:23 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=98=93=E8=81=94=E4=BA=91=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E8=AE=A2=E5=8D=95=E6=8E=92=E7=89=88=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/printer/yilianyun/yilianyun.go | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index 5ab07bd2d..346d00b41 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -34,14 +34,13 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	}
 	orderFmt := `
 <FS2><center>京西菜市</center></FS2>\n\n
-<center>手机买菜上京西</center>\n
+<center>手机买菜上京西</center>
 <center>极速到家送惊喜</center>\n
---------------------------------\n
+--------------------------------
 下单时间: %s\n
 预计送达: %s\n
 订单编号: %s\n
 \n
-
 <FS2>%s#%d</FS2>\n\n
 <QR>%s</QR>
 \n
@@ -52,7 +51,6 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 客户备注: \n
 <FS2>%s</FS2>\n
 \n
-
 <FB>实际支付:</FB>%s\n
 \n
 商品明细: \n
@@ -81,20 +79,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <FB>共%d种%d件商品</FB>
 \n
 --------------------------------\n
-<center<FB>商品质量问题请联系:</FB>\n</center>
-<center><FB>%s:%s</FB>\n</center>\n
-\n
+<center><FB>商品质量问题请联系:</FB></center>
+<center><FB>%s:%s</FB></center>\n
 官方服务热线: 18011516898\n
 更多信息请关注官方微信: 京西菜市\n
-\n
-\n\n
 --------------------------------\n
 --------------------------------\n
-\n\n
 `
 	// <QR>http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk</QR>
 	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel)
-	return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...)
+	return strings.Replace(fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...), "\\n", "\r\n", -1)
 }
 
 func (c *PrinterHandler) GetVendorID() int {