diff --git a/hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java b/hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java
index abdf415e..2bc51261 100644
--- a/hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java
+++ b/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");
}
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
index 2843ee49..d897e837 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
@@ -1695,7 +1695,8 @@ public class HighOrderServiceImpl implements HighOrderService {
childOrder.getGasOilNo(),
childOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
- ) + "
" +
+ ) + "
";
+ /* +
SpPrinterTemplate.oilClientStubTemp(
childOrder.getGoodsName(),
order.getOrderNo(),
@@ -1706,20 +1707,8 @@ public class HighOrderServiceImpl implements HighOrderService {
childOrder.getGasOilNo(),
childOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
- ) + "
";
+ ) + "
";*/
sp.print(device.getDeviceSn(), printStr, 1);
- /* sp.print(device.getDeviceSn(),
- 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()
- ), 1);*/
} catch (Exception e) {
e.printStackTrace();
}
@@ -1730,7 +1719,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"),