From 5aa919b2008efb82fd2dd828ee323c008bcac6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 26 Jul 2022 17:11:18 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/print.go | 2 +- business/model/print.go | 2 +- controllers/api_controller.go | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go index d018fa525..bff6f9d1e 100644 --- a/business/jxstore/cms/print.go +++ b/business/jxstore/cms/print.go @@ -209,7 +209,7 @@ func DelPrinterSeq(appID int, printNo string) (err error) { return err } -func DoPrint(appID int, msgID, printNo, content string, orderNo int) (err error) { +func DoPrint(appID int, msgID, printNo, content string, orderNo string) (err error) { var ( db = dao.GetDB() ) diff --git a/business/model/print.go b/business/model/print.go index 335adb6e4..66843d730 100644 --- a/business/model/print.go +++ b/business/model/print.go @@ -41,7 +41,7 @@ type PrintMsg struct { MsgID string `orm:"column(msg_id)" json:"msg_id"` //消息ID PrintNo string `json:"print_no"` //打印机编号 - OrderNo int `json:"order_no"` //订单序号 + OrderNo string `json:"order_no"` //订单序号 Content string `orm:"type(text)" json:"content"` //订单内容 Status int `json:"status"` //打印状态 Comment string `json:"comment"` //失败原因 diff --git a/controllers/api_controller.go b/controllers/api_controller.go index e8a233178..2ebc93b7e 100644 --- a/controllers/api_controller.go +++ b/controllers/api_controller.go @@ -323,7 +323,8 @@ func (c *ApiController) DelPrinterSeq(dataMap map[string]interface{}) (data, err func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data, errCode string, err error) { var ( printNo, content string - orderNo, appID int + appID int + orderNo string ) globals.SugarLogger.Debugf("Begin API DoPrint data: [%v]", utils.Format4Output(dataMap, false)) if _, ok := dataMap[keyPrintNo].(string); !ok { @@ -344,7 +345,7 @@ func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data, errCode s return buildParamErrCodeAndErr(keyOrderNo) } else { orderNoStr := dataMap[keyOrderNo].(string) - if orderNo = utils.Str2Int(orderNoStr); orderNo == 0 { + if orderNo = orderNoStr; orderNo == "" { return buildParamErrCodeAndErr(keyOrderNo) } }