提交代码

hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java

@@ -279,6 +279,8 @@ public class ZkcPrinterTemplate {
         stream.write(0x0A);
         stream.write(0x0A);
         stream.write(0x0A);
+        stream.write(0x0A);
+        stream.write(0x0A);
         return getPrinterBytes(stream.toByteArray(), 1, "UTF-8");
     }
 

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -1685,20 +1685,8 @@ public class HighOrderServiceImpl implements HighOrderService {
                                         childOrder.getGasOilNo(),
                                         childOrder.getGasOilLiters().toString(),
                                         order.getTotalPrice().toString()
-                                ) + "<BR><BR><BR><BR><BR>" +
-                                SpPrinterTemplate.oilClientStubTemp(
-                                        childOrder.getGoodsName(),
-                                        order.getOrderNo(),
-                                        DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
-                                        order.getMemPhone(),
-                                        "嗨森逛",
-                                        childOrder.getGasGunNo(),
-                                        childOrder.getGasOilNo(),
-                                        childOrder.getGasOilLiters().toString(),
-                                        order.getTotalPrice().toString()
                                 ) + "<BR>";
-                                sp.print(device.getDeviceSn(), printStr, 1);
+                             /*           +
-                               /* sp.print(device.getDeviceSn(),
                                 SpPrinterTemplate.oilClientStubTemp(
                                         childOrder.getGoodsName(),
                                         order.getOrderNo(),
@@ -1709,7 +1697,8 @@ public class HighOrderServiceImpl implements HighOrderService {
                                         childOrder.getGasOilNo(),
                                         childOrder.getGasOilLiters().toString(),
                                         order.getTotalPrice().toString()
-                                        ), 1);*/
+                                ) + "<BR>";*/
+                                sp.print(device.getDeviceSn(), printStr, 1);
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -1720,7 +1709,7 @@ public class HighOrderServiceImpl implements HighOrderService {
                         new Thread(() -> {
                             try {
                                 mqttProviderConfig.publish(2, false, device.getDeviceImei(),
-                                      ZkcPrinterTemplate.oilTemp(
+                                      ZkcPrinterTemplate.oilCashierStubTemp(
                                         childOrder.getGoodsName(),
                                         order.getOrderNo(),
                                         DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),