liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-12-20 11:19:51 +08:00
parent 192c922cbc
commit caf21632de
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/event/event_tcp.go
View File

@@ -264,10 +264,8 @@ func (t *TcpClient) doPrint(key string) (err error) {
//t.delConn(printMsg.PrintNo) //t.delConn(printMsg.PrintNo)
close(t.TimeoutMap[key]) close(t.TimeoutMap[key])
} else { } else {
globals.SugarLogger.Debugf("=====wait callback1")
//等待回调 //等待回调
dataStr := <-t.CallBackMap[printMsg.PrintNo] dataStr := <-t.CallBackMap[printMsg.PrintNo]
globals.SugarLogger.Debugf("=====wait callback2 %s", dataStr)
if dataStr != "" { if dataStr != "" {
a, b := getCallbackMsgInfo(dataStr) a, b := getCallbackMsgInfo(dataStr)
t.changePrintMsg(dataStr, a, b) t.changePrintMsg(dataStr, a, b)

8
business/jxstore/event/print_test.go
View File

@@ -15,12 +15,12 @@ func TestPrintMsg(t *testing.T) {
msg := &model.PrintMsg{ msg := &model.PrintMsg{
ModelIDCULD: model.ModelIDCULD{}, ModelIDCULD: model.ModelIDCULD{},
PrintNo: "120221008001001", PrintNo: "120220915001069",
Content: "<center>居中文字</center>", Content: "<sound>64</sound><sound>6</sound><center><b>美团外卖</b></center>--------------------------------<br><left>下单时间：2022-12-16 09:48:17</left><left>预计送达：1970-01-01 00:00:00</left><left>订单编号：1100330341689298103</left><left>客户名称：桃子(先生)</left><left>客户电话：15680644242,5107</left><left><hb>客户地址：快递之家@#四川省成都市郫都区合作街道天辰路南晨风社区</hb></left>--------------------------------<br><left><b>客户备注：<br>收货人隐私号 15680644242_5107，手机号 199****2903</b></left>--------------------------------<br><qrc>12</qrc><b>美团外卖 #12</b><br>商品列表<br>品名 数量 单价 小计<br>--------------------------------<br>满49.0元赠赠送当季新鲜水果250g*1<br> X1 ￥0.00 ￥0.00<br>【整果】补充vc精选黄柠檬一个100g/个<br> X3 ￥5.00 ￥15.00<br>【2022年新上市 】超甜砂糖桔/砂糖橘约500g/份<br> X1 ￥7.90 ￥7.90<br>【整果】福建三红蜜柚约1.1~1.2kg 1个1.1kg/个<br> X1 ￥17.00 ￥17.00<br>【手剥，皮薄汁多】爱媛橙2个400g/个<br> X1 ￥7.80 ￥7.80<br>【整果】精选皇冠梨约600g/份<br> X1 ￥19.20 ￥19.20<br>【整果】轻畅 新鲜香蕉约500g/份(480~500g)<br> X1 ￥8.90 ￥8.90<br><br>共 7 种 9 件商品<br>实付金额：￥76.40<br>--------------------------------<br><center>商品质量问题</center><center>18884056557</center><center>京西果园（果切·果捞·聚果堂）</center>--------------------------------",
OrderNo: "1", // 2147483648111 OrderNo: "12", // 2147483648111
Status: 0, Status: 0,
Comment: "", Comment: "",
MsgID: "1", MsgID: "20221216175529_09440117",
} }
data, err := buildMsg(msg) data, err := buildMsg(msg)