From 295d790dab86ed978116a778ff4c2063d3cd70e5 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 8 Jul 2021 18:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/print.go | 20 +++++++++++++++-----
 controllers/api_controller.go | 17 ++++++-----------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go
index 6c7774e19..37b71e921 100644
--- a/business/jxstore/cms/print.go
+++ b/business/jxstore/cms/print.go
@@ -59,16 +59,24 @@ func DelPrinter(appID int, printNos []string) (err error) {
 	return err
 }
 
-func UpdatePrinter(appID int, printNo, name string) (err error) {
+func UpdatePrinter(appID int, printNo, name, sim string) (err error) {
 	var (
-		db = dao.GetDB()
+		db     = dao.GetDB()
+		fields []string
 	)
 	//看有没有
 	if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 {
 		return fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo)
 	} else {
-		printers[0].Name = name
-		if _, err = dao.UpdateEntity(db, printers[0], "Name"); err != nil {
+		if printers[0].Name != name {
+			printers[0].Name = name
+			fields = append(fields, "name")
+		}
+		if printers[0].SIM != sim {
+			printers[0].SIM = sim
+			fields = append(fields, "sim")
+		}
+		if _, err = dao.UpdateEntity(db, printers[0], fields...); err != nil {
 			return err
 		}
 	}
@@ -99,7 +107,9 @@ func DoPrint(appID int, msgID, printNo, content string, orderNo int) (err error)
 		db = dao.GetDB()
 	)
 	//打印机必须绑定在该应用下才能打印
-
+	if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 {
+		return fmt.Errorf("未在该应用下获取到此打印机！print_no %v", printNo)
+	}
 	printMsg := &model.PrintMsg{
 		PrintNo: printNo,
 		Content: content,
diff --git a/controllers/api_controller.go b/controllers/api_controller.go
index 4b4741109..54c33bef8 100644
--- a/controllers/api_controller.go
+++ b/controllers/api_controller.go
@@ -243,11 +243,11 @@ func (c *ApiController) DelPrinter(dataMap map[string]interface{}) (data, errCod
 	return "", errCode, err
 }
 
-//修改打印机备注名
+//修改打印机信息
 func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, errCode string, err error) {
 	var (
-		printNo, name string
-		appID         int
+		printNo, name, sim string
+		appID              int
 	)
 	globals.SugarLogger.Debugf("Begin API UpdatePrinter data: [%v]", utils.Format4Output(dataMap, false))
 	if _, ok := dataMap[keyPrintNo].(string); !ok {
@@ -257,15 +257,10 @@ func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, err
 			return buildParamErrCodeAndErr(keyPrintNo)
 		}
 	}
-	if _, ok := dataMap[keyName].(string); !ok {
-		return buildParamErrCodeAndErr(keyName)
-	} else {
-		if name = dataMap[keyName].(string); name == "" {
-			return buildParamErrCodeAndErr(keyName)
-		}
-	}
+	name = dataMap[keyName].(string)
+	sim = dataMap["sim"].(string)
 	appID = utils.Str2Int(dataMap[keyAppID].(string))
-	if err = cms.UpdatePrinter(appID, printNo, name); err != nil {
+	if err = cms.UpdatePrinter(appID, printNo, name, sim); err != nil {
 		return "", model.ErrCodeGeneralFailed, err
 	}
 	return "", errCode, err