From 6de92e38fc0ad0886edf933ac3c1309633764e66 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Thu, 21 Nov 2024 00:45:35 +0800
Subject: [PATCH] fix printer bug

---
 .../service/impl/ShopStorePrinterServiceImpl.java   | 13 +++++++++++--
 .../impl/ShopStorePrinterTemplateServiceImpl.java   |  5 ++++-
 .../com/suisung/mall/shop/store/utis/FeieUtil.java  |  5 +++--
 3 files changed, 18 insertions(+), 5 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 2ad55c1f..ef36b0d8 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
@@ -97,7 +97,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
             return CommonResult.success(null, "记录不存在！");
         }
 
-        if(StrUtil.isBlank(user.getStore_id()) || !user.getStore_id().equals(record.getStore_id().toString())){
+        if (StrUtil.isBlank(user.getStore_id()) || !user.getStore_id().equals(record.getStore_id().toString())) {
             return CommonResult.failed("无权限操作!");
         }
 
@@ -267,7 +267,16 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
             return CommonResult.failed("打票机不存在，无法操作！");
         }
 
-        if(status.equals(record.getStatus())) {
+        if (ConstantError.Enable.equals(status)) {
+            // 向厂家新增打印机
+            // 格式："922441475#r6ZXPvHH#核销柜台";
+            feieUtil.addPrinter(String.format("%s#%s#%s", record.getPrinter_sn(), record.getPrinter_key(), record.getPrinter_name()));
+        } else {
+            // 向厂家删除打印机
+            feieUtil.delPrinter(record.getPrinter_sn());
+        }
+
+        if (status.equals(record.getStatus())) {
             return CommonResult.success();
         }
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java
index bea831bc..e2e796a3 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java
@@ -34,8 +34,11 @@ public class ShopStorePrinterTemplateServiceImpl extends BaseServiceImpl<ShopSto
         queryWrapper.eq("category", category);
         queryWrapper.orderByAsc("template_id");
         ShopStorePrinterTemplate shopStorePrinterTemplate = getOne(queryWrapper);
-        if (shopStorePrinterTemplate == null) {
+        if (shopStorePrinterTemplate == null || shopStorePrinterTemplate.getTemplate_id() <= 0) {
+            queryWrapper.clear();
             queryWrapper.eq("store_id", 0);// 公共下单模版
+            queryWrapper.eq("category", category);
+            queryWrapper.orderByAsc("template_id");
             shopStorePrinterTemplate = getOne(queryWrapper);
         }
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/utis/FeieUtil.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/utis/FeieUtil.java
index 1feb35c9..f9e8d13b 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/utis/FeieUtil.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/utis/FeieUtil.java
@@ -95,7 +95,7 @@ public class FeieUtil {
         List<NameValuePair> nvps = new ArrayList<NameValuePair>();
         nvps.add(new BasicNameValuePair("printerContent", printerInfo));
         FeiePrinterApiRes<FeiePrinterApiDataRes> reps = sendHttpPost("Open_printerAddlist", nvps);
-
+        logger.info("飞鹅添加打印机返回数据：{}", reps);
         if (reps != null && reps.getRet().equals(0)) {
             //  && reps.getData()!=null && reps.getData().getOk()!=null &&reps.getData().getOk().length>0
             return true;
@@ -116,6 +116,7 @@ public class FeieUtil {
         nvps.add(new BasicNameValuePair("snlist", snList));
 
         FeiePrinterApiRes<FeiePrinterApiDataRes> reps = sendHttpPost("Open_printerDelList", nvps);
+        logger.info("飞鹅删除打印机返回数据：{}", reps);
         if (reps != null && reps.getRet().equals(0)) {
             return true;
         }
@@ -251,7 +252,7 @@ public class FeieUtil {
                 HttpEntity httpentity = response.getEntity();
                 if (httpentity != null) {
                     String result = EntityUtils.toString(httpentity);
-                    logger.info("飞鹅云返回到信息：\n" + result);
+                    logger.debug("飞鹅云返回到信息：{}", result);
                     return JsonUtil.json2object(result, FeiePrinterApiRes.class);
                 }
             }