From da9b846912c25a4178884662d3ef266855cbc327 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Fri, 20 May 2022 14:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hai/config/SpPrinterTemplate.java       | 4 ++--
 hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java | 2 +-
 .../com/hai/service/impl/HighMerchantStoreServiceImpl.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/config/SpPrinterTemplate.java b/hai-service/src/main/java/com/hai/config/SpPrinterTemplate.java
index 9fc7a31e..03c69db9 100644
--- a/hai-service/src/main/java/com/hai/config/SpPrinterTemplate.java
+++ b/hai-service/src/main/java/com/hai/config/SpPrinterTemplate.java
@@ -41,7 +41,7 @@ public class SpPrinterTemplate {
                 "<L1>加油金额</L1><BR>" +
                 "<L1>￥" + orderPrice + "元</L1><BR>" +
                 "------------------------------<BR>" +
-                "<C><B>来＂嗨森逛“；开心又省钱</B></C>";
+                "<C><B>开心又省钱;来＂嗨森逛“</B></C>";
         return str;
     }
 
@@ -80,7 +80,7 @@ public class SpPrinterTemplate {
                 "<L1>加油金额</L1><BR>" +
                 "<L1>￥" + orderPrice + "元</L1><BR>" +
                 "------------------------------<BR>" +
-                "<C><B>来＂嗨森逛“；开心又省钱</B></C>";
+                "<C><B>开心又省钱;来＂嗨森逛“</B></C>";
         return str;
     }
 
diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
index 793cee85..95d3e01a 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
@@ -1094,7 +1094,7 @@ public interface HighOrderMapperExt {
             " b.order_status status," +
             " a.goods_name gasName," +
             " (select address from high_merchant_store where id = a.goods_id) gasAddress," +
-            " (select store_logo from high_merchant_store where id = a.goods_id) gasLogo," +
+            " a.goods_img gasLogo," +
             " a.gas_oil_type gasOilType," +
             " a.gas_oil_no gasOilNo," +
             " a.gas_gun_no gasGunNo," +
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java
index a6355805..268d69ef 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java
@@ -71,8 +71,8 @@ public class HighMerchantStoreServiceImpl implements HighMerchantStoreService {
                 && StringUtils.isNotBlank(highMerchantStore.getDeviceName())) {
             SpPrinterConfig sp = new SpPrinterConfig();
             JSONObject jsonObject = JSONObject.parseObject(sp.addPrinter(highMerchantStore.getDeviceSn(), highMerchantStore.getDeviceKey(), highMerchantStore.getDeviceName()));
-            if (!jsonObject.getLong("errorcode").equals(0)) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOF_FOUND, jsonObject.getString("errormsg"));
+            if (!jsonObject.getInteger("errorcode").equals(0)) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOF_FOUND, "设备绑定失败");
             }
         }