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-21 15:14:16 +08:00
parent 7106636263
commit 6e9d746b40
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,7 @@ func HandleCheckTcpHeart() {
} }
} }
func buildMsg(printMsg *dao.GetPrintMsgsResult) (data []byte, err error) { func buildMsg(printMsg *model.PrintMsg) (data []byte, err error) {
var ( var (
content = printMsg.Content content = printMsg.Content
orderNo = printMsg.OrderNo orderNo = printMsg.OrderNo
@@ -454,7 +454,7 @@ func getCheckSum(str string) (check string) {
} }
//内容中的标签替换成指令 //内容中的标签替换成指令
func replaceContent(content string, printMsg *dao.GetPrintMsgsResult) (result string) { func replaceContent(content string, printMsg *model.PrintMsg) (result string) {
var ( var (
lenqr int lenqr int
hexLenqr string hexLenqr string
@@ -552,10 +552,7 @@ func replaceContent(content string, printMsg *dao.GetPrintMsgsResult) (result st
return result return result
} }
func checkPrintMsg(printMsg *dao.GetPrintMsgsResult) (err error) { func checkPrintMsg(printMsg *model.PrintMsg) (err error) {
if printMsg.FlowFlag == 1 {
return fmt.Errorf("打印机当月流量已经超过30MB，请及时充值！printNo:[%v]", printMsg.PrintNo)
}
if printMsg.Content == "" { if printMsg.Content == "" {
return fmt.Errorf("此打印信息内容为空！printMsg printNo:[%v], orderNo :[%v]", printMsg.PrintNo, printMsg.OrderNo) return fmt.Errorf("此打印信息内容为空！printMsg printNo:[%v], orderNo :[%v]", printMsg.PrintNo, printMsg.OrderNo)
} }

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

@@ -25,19 +25,13 @@ func GetPrintMsgNoPage(db *DaoDB, printNo string, orderNo int64) (prints []*mode
return prints, err return prints, err
} }
type GetPrintMsgsResult struct { func GetPrintMsgs(db *DaoDB, statuss []int, beginAt, endAt time.Time, offset, pageSize int) (prints []*model.PrintMsg, err error) {
model.PrintMsg
FlowFlag int `json:"flowFlag"`
}
func GetPrintMsgs(db *DaoDB, statuss []int, beginAt, endAt time.Time, offset, pageSize int) (prints []*GetPrintMsgsResult, err error) {
sql := ` sql := `
SELECT a.*, b.flow_flag SELECT a.*
FROM print_msg a FROM print_msg a
LEFT JOIN printer b ON a.print_no = b.print_no AND b.deleted_at = ?
WHERE 1 = 1 AND a.deleted_at = ? WHERE 1 = 1 AND a.deleted_at = ?
` `
sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue} sqlParams := []interface{}{utils.DefaultTimeValue}
if len(statuss) > 0 { if len(statuss) > 0 {
sql += " AND a.status IN(" + GenQuestionMarks(len(statuss)) + ")" sql += " AND a.status IN(" + GenQuestionMarks(len(statuss)) + ")"
sqlParams = append(sqlParams, statuss) sqlParams = append(sqlParams, statuss)
@@ -56,7 +50,7 @@ func GetPrintMsgs(db *DaoDB, statuss []int, beginAt, endAt time.Time, offset, pa
return prints, err return prints, err
} }
func GetPrintMsgsFail(db *DaoDB, beginAt, endAt time.Time) (prints []*GetPrintMsgsResult, err error) { func GetPrintMsgsFail(db *DaoDB, beginAt, endAt time.Time) (prints []*model.PrintMsg, err error) {
sql := ` sql := `
SELECT * SELECT *
FROM print_msg FROM print_msg