From 0f38cadb5f9e1fee65ab6ca8926dcd4e22ab0637 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 10 Apr 2019 11:03:17 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=88=A0=E9=99=A4=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E6=97=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?printerVendorID=E4=B8=BA0=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 40 ++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index c51c59990..088501501 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -385,25 +385,27 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 		} else {
 			store.PrinterVendorID = int(utils.Interface2Int64WithDefault(valid["printerVendorID"], 0))
 		}
-		if valid["printerSN"] == nil {
-			valid["printerSN"] = store.PrinterSN
-		}
-		if valid["printerKey"] == nil {
-			valid["printerKey"] = store.PrinterKey
-		}
-		var handler partner.IPrinterHandler
-		if handler, err = netprinter.GetHandlerFromStore(store); err != nil {
-			return 0, err
-		}
-		newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name)
-		if err = err2; err != nil {
-			return 0, err
-		}
-		if newID1 != "" {
-			valid["printerSN"] = newID1
-		}
-		if newID2 != "" {
-			valid["printerKey"] = newID2
+		if store.PrinterVendorID > 0 {
+			if valid["printerSN"] == nil {
+				valid["printerSN"] = store.PrinterSN
+			}
+			if valid["printerKey"] == nil {
+				valid["printerKey"] = store.PrinterKey
+			}
+			var handler partner.IPrinterHandler
+			if handler, err = netprinter.GetHandlerFromStore(store); err != nil {
+				return 0, err
+			}
+			newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name)
+			if err = err2; err != nil {
+				return 0, err
+			}
+			if newID1 != "" {
+				valid["printerSN"] = newID1
+			}
+			if newID2 != "" {
+				valid["printerKey"] = newID2
+			}
 		}
 	}