hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pre' into gas

Browse Source
dev-discount
胡锐 2 years ago
parent 50f508ec90 49e1471d4e
commit aaa051848c
2 changed files with 6 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java
  2. 19
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

2
hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java
Unescape View File

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

19
hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
Unescape View File

@ -1695,20 +1695,8 @@ public class HighOrderServiceImpl implements HighOrderService {
childOrder.getGasOilNo(), childOrder.getGasOilNo(),
childOrder.getGasOilLiters().toString(), childOrder.getGasOilLiters().toString(),
order.getTotalPrice().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>"; ) + "<BR>";
sp.print(device.getDeviceSn(), printStr, 1); /* +
/* sp.print(device.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp( SpPrinterTemplate.oilClientStubTemp(
childOrder.getGoodsName(), childOrder.getGoodsName(),
order.getOrderNo(), order.getOrderNo(),
@ -1719,7 +1707,8 @@ public class HighOrderServiceImpl implements HighOrderService {
childOrder.getGasOilNo(), childOrder.getGasOilNo(),
childOrder.getGasOilLiters().toString(), childOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString() order.getTotalPrice().toString()
), 1);*/ ) + "<BR>";*/
sp.print(device.getDeviceSn(), printStr, 1);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -1730,7 +1719,7 @@ public class HighOrderServiceImpl implements HighOrderService {
new Thread(() -> { new Thread(() -> {
try { try {
mqttProviderConfig.publish(2, false, device.getDeviceImei(), mqttProviderConfig.publish(2, false, device.getDeviceImei(),
ZkcPrinterTemplate.oilTemp( ZkcPrinterTemplate.oilCashierStubTemp(
childOrder.getGoodsName(), childOrder.getGoodsName(),
order.getOrderNo(), order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"), DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),

Write Preview
Loading…
Cancel
Save