From 2c765f7547863ee4e007bf41103cc0b992e59658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 28 Jul 2022 11:15:29 +0800
Subject: [PATCH] 1

---
 business/jxstore/event/event_tcp_utils.go | 45 +++++++++++------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go
index 70a59bd75..d3112ba52 100644
--- a/business/jxstore/event/event_tcp_utils.go
+++ b/business/jxstore/event/event_tcp_utils.go
@@ -360,29 +360,28 @@ func changePrinterStatus(printNo string, status int) {
 
 //按打印机方提供的文档来的
 func buildMsg(printMsg *model.PrintMsg) (data []byte, err error) {
-	//var (
-	//	content   = printMsg.Content
-	//	orderNo   = printMsg.OrderNo
-	//	str       = "1e"
-	//	const1    = "0200ff50"
-	//	printInit = "1b40" //打印机初始化
-	//	//voice     = "1d6b401dfd001a01015b7631365d736f756e64622cc4fad3d0d0c2b6a9b5a5c0b1" //语音，中国
-	//	//qr                                  = "1d58021b5a0001061600747470733a2f2f7777772e62616964752e636f6d2f1b000A0A0A1B40"
-	//	orderNoHexH, orderNoHexL, printData string
-	//)
-	////写入数据
-	//orderNoHexH, orderNoHexL = int2h8l8(int64(orderNo))
-	//
-	//// 将数据与模板组装
-	//printDataGBK, _ := jxutils.Utf8ToGbk([]byte(replaceContentOther(content)))
-	//printData = hex.EncodeToString(printDataGBK)
-	//printData = replaceContent(printData, printMsg)
-	//lenData := int64(len(str) + len(const1) + len(orderNoHexH) + len(orderNoHexL) + len(printInit) + 2 + 4 + len(printData))
-	//x1, x2 := int2h8l8(lenData / 2)
-	//dataStr := str + x1 + x2 + const1 + orderNoHexH + orderNoHexL + printInit + printData
-	//check := getCheckSum(dataStr)
-	//return jxutils.Hextob(dataStr + check), err
-	return jxutils.Hextob("1e001e0200ff50bc147df3d71b401B594155401B594155411B59415542ff"), nil
+	var (
+		content   = printMsg.Content
+		orderNo   = printMsg.OrderNo
+		str       = "1e"
+		const1    = "0200ff50"
+		printInit = "1b40" //打印机初始化
+		//voice     = "1d6b401dfd001a01015b7631365d736f756e64622cc4fad3d0d0c2b6a9b5a5c0b1" //语音，中国
+		//qr                                  = "1d58021b5a0001061600747470733a2f2f7777772e62616964752e636f6d2f1b000A0A0A1B40"
+		orderNoHexH, orderNoHexL, printData string
+	)
+	//写入数据
+	orderNoHexH, orderNoHexL = int2h8l8(int64(orderNo))
+
+	// 将数据与模板组装
+	printDataGBK, _ := jxutils.Utf8ToGbk([]byte(replaceContentOther(content)))
+	printData = hex.EncodeToString(printDataGBK)
+	printData = replaceContent(printData, printMsg)
+	lenData := int64(len(str) + len(const1) + len(orderNoHexH) + len(orderNoHexL) + len(printInit) + 2 + 4 + len(printData))
+	x1, x2 := int2h8l8(lenData / 2)
+	dataStr := str + x1 + x2 + const1 + orderNoHexH + orderNoHexL + printInit + printData
+	check := getCheckSum(dataStr)
+	return jxutils.Hextob(dataStr + check), err
 }
 
 //替换特殊字符，上面那个hextob转不了，先替换一下