diff --git a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java index cb7698a..d7453a1 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java @@ -88,6 +88,10 @@ public class OrderPaySuccessService { if (gasOrder.getChannelType().equals(MerchantSourceTypeEnum.type1.getNumber())) { // 自建站 + // 打印小票 + if (gasOrder.getChannelType().equals(MerchantSourceTypeEnum.type1.getNumber())) { + deviceService.printGasOrder(gasOrder.getMerId(), gasOrder, false); + } // 查询油站 BsMerchant merchant = merchantService.getMerchant(gasOrder.getMerNo()); if (merchant != null) { @@ -122,11 +126,6 @@ public class OrderPaySuccessService { } } - // 打印小票 - if (gasOrder.getChannelType().equals(MerchantSourceTypeEnum.type1.getNumber())) { - deviceService.printGasOrder(gasOrder.getMerId(), gasOrder, false ); - } - } else if (gasOrder.getChannelType().equals(MerchantSourceTypeEnum.type2.getNumber())) { try { // 能链【团油】