From cdf83baa4edbe37652133248f61db5e785922f1f Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Tue, 20 Aug 2024 11:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hfkj/service/order/OrderPaySuccessService.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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 {
                     // 能链【团油】