|
@@ -59,8 +59,12 @@ public class ComPrintManager implements PrintManager, DataReceivedListener {
|
|
|
serialControl.send(PrintCmd.PrintString("自助机加油支付小票", 0));
|
|
|
serialControl.send(PrintCmd.PrintFeedline(2));
|
|
|
serialControl.send(PrintCmd.SetAlignment(0));
|
|
|
- if (!TextUtils.isEmpty(GlobalData.INSTANCE.getBusinessName().get()))
|
|
|
+ if (!TextUtils.isEmpty(GlobalData.INSTANCE.getBusinessName().get())) {
|
|
|
serialControl.send(PrintCmd.PrintString("加油站名称:" + GlobalData.INSTANCE.getBusinessName().get(), 0));
|
|
|
+ }
|
|
|
+ if (!GlobalData.INSTANCE.getStationTel().get().isEmpty()) {
|
|
|
+ serialControl.send(PrintCmd.PrintString("联系电话:" + GlobalData.INSTANCE.getStationTel().get(), 0));
|
|
|
+ }
|
|
|
serialControl.send(PrintCmd.SetBold(1));
|
|
|
serialControl.send(PrintCmd.PrintString("油枪号:" + dc.getNozzleNo() + "号枪", 0));
|
|
|
serialControl.send(PrintCmd.PrintString("加油金额:" + dc.getMyAmount() + "元", 0));
|
|
@@ -82,7 +86,8 @@ public class ComPrintManager implements PrintManager, DataReceivedListener {
|
|
|
// serialControl.send(PrintCmd.PrintString("支付方式:" + payResult.getMyPayType(), 0));
|
|
|
// serialControl.send(PrintCmd.PrintString("订单号:" + ptb.getId(), 0));
|
|
|
// serialControl.send(PrintCmd.PrintString("支付ID:" + o.getMyId(), 0));
|
|
|
- serialControl.send(PrintCmd.PrintString("支付时间:" + ptb.getTransactionInitTimeInPos(), 0));
|
|
|
+ String rawTime = ptb.getTransactionInitTimeInPos();
|
|
|
+ serialControl.send(PrintCmd.PrintString("支付时间:" + rawTime.substring(0, Math.min(19, rawTime.length())), 0));
|
|
|
serialControl.send(PrintCmd.PrintFeedline(1));
|
|
|
serialControl.send(PrintCmd.SetAlignment(1));
|
|
|
serialControl.send(PrintCmd.PrintString("感谢您使用,请妥善保管交易凭条", 0));
|