From c650ae418d719898ba0532e83137fc658db569e9 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 30 Jun 2021 18:59:51 +0800
Subject: [PATCH] a

---
 business/model/error_code.go  |  6 ++++--
 controllers/api_controller.go | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/business/model/error_code.go b/business/model/error_code.go
index ed812146b..04303f97a 100644
--- a/business/model/error_code.go
+++ b/business/model/error_code.go
@@ -11,8 +11,10 @@ const (
 
 	ErrCodeJsonSyncErr = "-105"
 
-	ErrCodeOpenAPIParamErrMethod    = "1000" //参数错误，method
-	ErrCodeOpenAPIParamErrTimeStamp = "1001" //参数错误，timestamp
+	ErrCodeOpenAPIParamErrMethod    = "1001" //参数错误，method
+	ErrCodeOpenAPIParamErrTimeStamp = "1002" //参数错误，timestamp
+
+	ErrCodeOpenAPIParamErrNormal = "1000" //api非通用参数错误
 )
 
 var (
diff --git a/controllers/api_controller.go b/controllers/api_controller.go
index 6b8d45e45..a7d766a6e 100644
--- a/controllers/api_controller.go
+++ b/controllers/api_controller.go
@@ -117,8 +117,8 @@ func (c *ApiController) CallOpenAPI() {
 	globals.SugarLogger.Debugf("Begin API CallOpenAPI Method: %s, accessUUID:%s, sign:%s\n", method, accessID, sign)
 	if err == nil {
 		result = routerMap[method].Call(parms)
-		if result[1].String() != "" {
-			err = fmt.Errorf(result[1].String())
+		if result[1].Interface() != nil {
+			err = result[1].Interface().(error)
 			goto end
 		}
 		goto success
@@ -142,15 +142,15 @@ success:
 	}
 }
 
-func (c *ApiController) AddPrint(dataMap map[string]interface{}) (data string, err error) {
+func (c *ApiController) AddPrint(dataMap map[string]interface{}) (data, errCode string, err error) {
 	if dataMap[keySign].(string) != "222" {
-		return "", buildParamErr(keySign)
+		return "", errCode, buildParamErr(keySign)
 	}
 	data2, err := json.Marshal(dataMap)
-	return string(data2), err
+	return string(data2), errCode, err
 }
 
-func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data string, err string) {
+func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data, errCode string, err error) {
 	var (
 		content = dataMap["data"].(string)
 		printNo = dataMap["print_no"].(string)
@@ -159,7 +159,7 @@ func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data string, er
 	)
 	globals.SugarLogger.Debugf("Begin API DoPrint data: [%v]", utils.Format4Output(dataMap, true))
 	if orderNo == 0 {
-		return data, fmt.Sprintf("订单序号不能为0")
+		return data, errCode, fmt.Errorf("参数错误：order_no 不能为空")
 	}
 	printMsg := &model.PrintMsg{
 		PrintNo: printNo,
@@ -167,6 +167,8 @@ func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data string, er
 		OrderNo: int(orderNo),
 	}
 	dao.WrapAddIDCULDEntity(printMsg, "")
-	dao.CreateEntity(db, printMsg)
-	return data, err
+	if err = dao.CreateEntity(db, printMsg); err != nil {
+		return data, errCode, err
+	}
+	return data, errCode, err
 }