aa

business/jxstore/cms/print.go

@@ -145,14 +145,30 @@ func DoPrint(appID int, msgID, printNo, content string, orderNo int) (err error)
 	return err
 }
 
-func GetPrintMsg(appID int, msgID string) (printMsg *model.PrintMsg, err error) {
+type GetPrintMsgResult struct {
+	MsgID   string `json:"msg_id"`   //消息ID
+	PrintNo string `json:"print_no"` //打印机编号
+	OrderNo int    `json:"order_no"` //订单序号
+	Content string `json:"content"`  //订单内容
+	Status  int    `json:"status"`   //打印状态
+	Comment string `json:"comment"`  //失败原因
+}
+
+func GetPrintMsg(appID int, msgID string) (printMsg *GetPrintMsgResult, err error) {
 	var (
 		db = dao.GetDB()
 	)
 	if printMsgs, _ := dao.GetPrintMsgs(db, "", msgID, model.PrintMsgAll); len(printMsgs) > 0 {
-		for _, v := range printMsgs {
-			return v, err
+		result := printMsgs[0]
+		printMsg = &GetPrintMsgResult{
+			MsgID:   result.MsgID,
+			PrintNo: result.PrintNo,
+			OrderNo: result.OrderNo,
+			Content: result.Content,
+			Status:  result.Status,
+			Comment: result.Comment,
 		}
+		return printMsg, err
 	} else {
 		return printMsg, fmt.Errorf("未找到该消息！msg_id :%v", msgID)
 	}