From d360c3e92f70c9541aa82a497a240e00cb746c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 13 Jun 2022 11:12:09 +0800
Subject: [PATCH] 1

---
 .../partner/printer/yilianyun/yilianyun.go    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index 2bcd3faf5..6087e5d23 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -42,7 +42,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if storeDetail != nil {
 		if storeDetail.BrandIsPrint == model.NO {
 			orderFmt += `
-			<FS2><center>%s</center></FS2>\n\n
+			<FS2><CA>%s</CA></FS2>\n\n
 			`
 			if order.VendorOrgCode == "34665" {
 				orderParams = append(orderParams, globals.StoreNameEbai2)
@@ -52,8 +52,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		}
 	}
 	orderFmt += `
-<center>手机买菜上京西</center>
-<center>极速到家送惊喜</center>\n
+<CA>手机买菜上京西</CA>\n
+<CA>极速到家送惊喜</CA>\n
 --------------------------------
 下单时间: %s\n
 预计送达: %s\n
@@ -97,11 +97,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	)
 
 	for _, sku := range order.Skus {
-		orderFmt += `%s\n`
+		orderFmt += `<FH>%s</FH>\n`
 		//orderFmt += `%8s%10s%10s\n`
-		orderFmt += `%20s%8s\n`
+		orderFmt += `<FH>%20s%8s</FH>\n`
 		//orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
 		//标品需要打印条形码
 		if sku.Upc != "" {
 			orderFmt += `upc码： %s\n`
@@ -112,8 +112,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <FB>共%d种%d件商品</FB>
 \n
 --------------------------------\n
-<center><FH2>商品质量问题请联系:</FH2></center>
-<center><FH2>%s:%s</FH2></center>\n
+<CA><FH2>商品质量问题请联系:</FH2></CA>
+<CA><FH2>%s:%s</FH2></CA>\n
 更多信息请关注官方微信: %s\n
 --------------------------------\n
 --------------------------------\n
@@ -137,7 +137,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	if storeDetail != nil {
 		if storeDetail.BrandIsPrint == model.NO {
 			orderFmt += `
-		<FS2><center>%s</center></FS2>\n\n
+		<FS2><CA>%s</CA></FS2>\n\n
 		`
 			if order.VendorOrgCode == "34665" {
 				orderParams = append(orderParams, globals.StoreNameEbai2)
@@ -147,8 +147,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 		}
 	}
 	orderFmt += `
-<center>手机买菜上京西</center>
-<center>极速到家送惊喜</center>\n
+<CA>手机买菜上京西</CA>\n
+<CA>极速到家送惊喜</CA>\n
 --------------------------------
 <FS2>下单时间: %s\n\n</FS2>
 <FS2>预计送达: %s\n\n</FS2>
@@ -186,9 +186,9 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	for _, sku := range order.Skus {
 		orderFmt += `<FS><FB>%s\n</FB></FS>`
 		//orderFmt += `<FS2>%s %s %s\n\n</FS2>`
-		orderFmt += `<FS>%15s<FB>%8s</FB>\n</FS>`
+		orderFmt += `<FS><FB>%15s%8s</FB>\n</FS>`
 		//orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
 		//标品需要打印条形码
 		if sku.Upc != "" {
 			orderFmt += `<FS>upc码： %s\n</FS>`
@@ -199,8 +199,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 <FS2><FB>共%d种%d件商品</FB></FS2>
 \n
 --------------------------------\n
-<center><FH2>商品质量问题请联系:</FH2></center>
-<center><FH2>%s:%s</FH2></center>\n
+<CA><FH2>商品质量问题请联系:</FH2></CA>\n
+<CA><FH2>%s:%s</FH2></CA>\n
 <FS2>更多信息请关注官方微信: %s\n</FS2>
 --------------------------------\n
 --------------------------------\n