提交代码

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;
     }
 

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," +

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, "设备绑定失败");
             }
         }