From 1c76565c02d32316bd97e71f5548c4d47eb4bb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Jul 2023 11:20:24 +0800 Subject: [PATCH] 1 --- business/jxstore/event/event_tcp_utils.go | 2 +- business/jxstore/event/print_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go index a319471b0..d692ac193 100644 --- a/business/jxstore/event/event_tcp_utils.go +++ b/business/jxstore/event/event_tcp_utils.go @@ -417,7 +417,7 @@ func buildMsg(printMsg *model.PrintMsg) (data []byte, err error) { //替换特殊字符，上面那个hextob转不了，先替换一下 func replaceContentOther(content string) string { - return strings.ReplaceAll(content, "⃣️", " ") + return strings.ReplaceAll(strings.ReplaceAll(content, "⃣️", " "), "•", "-") } func getCheckSum(str string) (check string) { diff --git a/business/jxstore/event/print_test.go b/business/jxstore/event/print_test.go index a53f20be6..9ffdc9b6e 100644 --- a/business/jxstore/event/print_test.go +++ b/business/jxstore/event/print_test.go @@ -17,7 +17,7 @@ func TestPrintMsg(t *testing.T) { msg := &model.PrintMsg{ ModelIDCULD: model.ModelIDCULD{}, PrintNo: "120220915001069", - Content: "646
美团外卖
--------------------------------
下单时间：2022-12-16 09:48:17预计送达：1970-01-01 00:00:00订单编号：1100330341689298103客户名称：桃子(先生)客户电话：15680644242,5107客户地址：快递之家@#四川省成都市郫都区合作街道天辰路南晨风社区--------------------------------
客户备注：
收货人隐私号 15680644242_5107，手机号 199****2903--------------------------------
12美团外卖 #12
商品列表
品名 数量 单价 小计
--------------------------------
满49.0元赠赠送当季新鲜水果250g*1
X1 ￥0.00 ￥0.00
【整果】补充vc精选黄柠檬一个100g/个
X3 ￥5.00 ￥15.00
【2022年新上市 】超甜砂糖桔/砂糖橘约500g/份
X1 ￥7.90 ￥7.90
【整果】福建三红蜜柚约1.1~1.2kg 1个1.1kg/个
X1 ￥17.00 ￥17.00
【手剥，皮薄汁多】爱媛橙2个400g/个
X1 ￥7.80 ￥7.80
【整果】精选皇冠梨约600g/份
X1 ￥19.20 ￥19.20
【整果】轻畅 新鲜香蕉约500g/份(480~500g)
X1 ￥8.90 ￥8.90

共 7 种 9 件商品
实付金额：￥76.40
--------------------------------
商品质量问题
18884056557
京西果园（果切·果捞·聚果堂）
--------------------------------", + Content: "客户地址：瑞小满颐园 (瑞小满•颐园正门 门卫大叔 就可以 拍照反馈 辛苦谢谢)@#四川省成都市金牛区天回镇街道瑞小满•熊猫颐园", OrderNo: "12", // 2147483648111 Status: 0, Comment: "",