From 95d1dace4dd0b2a488a4959ecf8f0b1d85be81ed Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 20 Nov 2024 17:23:54 +0800
Subject: [PATCH] fix printer bug

---
 .../service/impl/ShopStorePrinterServiceImpl.java      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java
index 86c02eb2..2ad55c1f 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java
@@ -201,10 +201,11 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
         UpdateWrapper<ShopStorePrinter> updateWrapper = new UpdateWrapper<ShopStorePrinter>();
         updateWrapper.eq("printer_id", record.getPrinter_id());
         updateWrapper.set("printer_name", record.getPrinter_name());
+        updateWrapper.set("printer_sn", record.getPrinter_sn());
+        updateWrapper.set("printer_key", record.getPrinter_key());
         updateWrapper.set("model_id", record.getModel_id());
         updateWrapper.set("region_id", record.getRegion_id());
         updateWrapper.set("paper_with", record.getPaper_with());
-        updateWrapper.set("printer_key", record.getPrinter_key());
         updateWrapper.set("website_url", record.getWebsite_url());
         if (record.getStatus() == null) {
             updateWrapper.set("status", ConstantError.Enable);
@@ -232,17 +233,14 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
             queryWrapper2.eq("printer_sn", record.getPrinter_sn());
             ShopStorePrinter existRecord2 = getOne(queryWrapper2);
             if (existRecord2 == null || existRecord2.getPrinter_id() <= 0) {
-                // 打印机从未加入到厂家到情况
-                // 往厂商添加打印机
-                // "922441475#r6ZXPvHH#核销柜台";
+                // 打印机从未加入到厂家到情况，往厂商添加打印机
+                // 格式："922441475#r6ZXPvHH#核销柜台";
                 boolean success = feieUtil.addPrinter(String.format("%s#%s#%s", record.getPrinter_sn(), record.getPrinter_key(), record.getPrinter_name()));
                 if (success) {
                     updateWrapper.set("flag", ConstantError.Enable);
                 } else {
                     msg = msg + ",但打印机绑定未成功，请检查打印机编号和密钥是否正确。";
                 }
-
-                updateWrapper.set("printer_sn", record.getPrinter_sn());
             }
         }