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

aa

Browse Source
This commit is contained in:
suyl
2021-07-09 16:19:05 +08:00
parent e8ac03ce9c
commit 0a8211dd5b
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,6 @@ func changePrintMsg(data string) (err error) {
printNo, comment string printNo, comment string
orderNo int64 orderNo int64
status int status int
printMsg = &model.PrintMsg{}
) )
//1、先找出打印机编号和订单序列号，这两个确定唯一一条消息 //1、先找出打印机编号和订单序列号，这两个确定唯一一条消息
orderNo = h8l82int(data[len(data)-6:len(data)-4], data[len(data)-4:len(data)-2]) orderNo = h8l82int(data[len(data)-6:len(data)-4], data[len(data)-4:len(data)-2])
@@ -270,15 +269,17 @@ func changePrintMsg(data string) (err error) {
if tcpClient.Clients[printNo] == nil { if tcpClient.Clients[printNo] == nil {
return err return err
} }
if printMsg, err = dao.GetPrintMsg(db, printNo, orderNo); err != nil { if printMsgs, err := dao.GetPrintMsgNoPage(db, printNo, orderNo); err != nil {
globals.SugarLogger.Debugf("changePrintMsg err :[%v]", err) globals.SugarLogger.Debugf("changePrintMsg err :[%v]", err)
return return
} else if printMsg == nil { } else if len(printMsgs) == 0 {
globals.SugarLogger.Debugf("changePrintMsg err ,not found printMsg printNo:[%v], orderNo :[%v]", printNo, orderNo) globals.SugarLogger.Debugf("changePrintMsg err ,not found printMsg printNo:[%v], orderNo :[%v]", printNo, orderNo)
} else if printMsg.Status != status { } else if len(printMsgs) > 0 {
printMsg.Comment = comment for _, v := range printMsgs {
printMsg.Status = status v.Comment = comment
dao.UpdateEntity(db, printMsg, "Comment", "Status") v.Status = status
dao.UpdateEntity(db, v, "Comment", "Status")
}
} }
return err return err
} }

2
business/model/dao/dao_print.go
View File

@@ -6,7 +6,7 @@ import (
"time" "time"
) )
func GetPrintMsg(db *DaoDB, printNo string, orderNo int64) (prints *model.PrintMsg, err error) { func GetPrintMsgNoPage(db *DaoDB, printNo string, orderNo int64) (prints []*model.PrintMsg, err error) {
sql := ` sql := `
SELECT * SELECT *
FROM print_msg FROM print_msg