diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index 6a7694889..beb392948 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -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 ( content = printMsg.Content 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 ( lenqr int hexLenqr string @@ -552,10 +552,7 @@ func replaceContent(content string, printMsg *dao.GetPrintMsgsResult) (result st return result } -func checkPrintMsg(printMsg *dao.GetPrintMsgsResult) (err error) { - if printMsg.FlowFlag == 1 { - return fmt.Errorf("打印机当月流量已经超过30MB,请及时充值!printNo:[%v]", printMsg.PrintNo) - } +func checkPrintMsg(printMsg *model.PrintMsg) (err error) { if printMsg.Content == "" { return fmt.Errorf("此打印信息内容为空!printMsg printNo:[%v], orderNo :[%v]", printMsg.PrintNo, printMsg.OrderNo) } diff --git a/business/model/dao/dao_print.go b/business/model/dao/dao_print.go index 3e199e21e..a7cf5acdd 100644 --- a/business/model/dao/dao_print.go +++ b/business/model/dao/dao_print.go @@ -25,19 +25,13 @@ func GetPrintMsgNoPage(db *DaoDB, printNo string, orderNo int64) (prints []*mode return prints, err } -type GetPrintMsgsResult struct { - model.PrintMsg - FlowFlag int `json:"flowFlag"` -} - -func GetPrintMsgs(db *DaoDB, statuss []int, beginAt, endAt time.Time, offset, pageSize int) (prints []*GetPrintMsgsResult, err error) { +func GetPrintMsgs(db *DaoDB, statuss []int, beginAt, endAt time.Time, offset, pageSize int) (prints []*model.PrintMsg, err error) { sql := ` - SELECT a.*, b.flow_flag + SELECT 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 = ? ` - sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue} + sqlParams := []interface{}{utils.DefaultTimeValue} if len(statuss) > 0 { sql += " AND a.status IN(" + GenQuestionMarks(len(statuss)) + ")" sqlParams = append(sqlParams, statuss) @@ -56,7 +50,7 @@ func GetPrintMsgs(db *DaoDB, statuss []int, beginAt, endAt time.Time, offset, pa 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 := ` SELECT * FROM print_msg