From 45c2cc854fc55d99a2923bb91e623fb4b575bd62 Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Tue, 10 Feb 2026 16:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/OrderInfoService.java       | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
index 2cf03ae..a87c666 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
@@ -1275,6 +1275,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Long orderId = truckLeavingOrderParam.getOrderId();
         OrderInfoEntity orderInfoEntity = this.getById(orderId);
         Long truckId = orderInfoEntity.getTruckId();
+        boolean result = false;
         try {
             Assert.notNull(orderInfoEntity, () -> Exceptions.clierr("订单不存在"));
             OrderStatus orderStatus = orderInfoEntity.getOrderStatus();
@@ -1350,25 +1351,6 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 log.error("订单状态改变事件发布失败，订单{}，状态{}", orderInfoEntity_.getSn(), newOrderStatus, e);
                 return null;
             });
-            CompletableFuture.runAsync(() -> {
-                OrderPagingResult detail = this.detail(orderId);
-                HsoaResult<?> result = hsoaService.pushProvincialSave(detail);
-                HsoaRecode hsoaRecode = new HsoaRecode()
-                        .setOrderId(orderId)
-                        .setOrderSn(detail.getSn())
-                        .setLicensePlate(detail.getLicensePlate())
-                        .setPushType(PushType.LianDan);
-                if (result == null || !result.isSuccess()) {
-                    Hsoa.relogin();
-                    log.error("推送订单数据失败，数据Id：{}", entity.getId());
-                    hsoaService.save(hsoaRecode.setSuccess(Boolean.FALSE));
-                } else {
-                    hsoaService.save(hsoaRecode.setSuccess(Boolean.TRUE));
-                }
-            }).exceptionally(e -> {
-                log.error("推送订单数据失败，数据Id：{}", entity.getId(), e);
-                return null;
-            });
 
             // 出厂付费
             if (OrderCategory.PuTong.equals(orderInfoEntity.getOrderCategory()) && MoneyWay.OUT.getVal().equals(entity.getMoneyWay())) {
@@ -1376,12 +1358,13 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 // updateOrderItems(orderInfoEntity.getId(), settleWeight, Boolean.FALSE);
 
                 // 扣费
-                return handleCompanyPay(orderInfoEntity, Boolean.FALSE, new BigDecimal("0"), Boolean.FALSE);
+                result = handleCompanyPay(orderInfoEntity, Boolean.FALSE, new BigDecimal("0"), Boolean.FALSE);
             } else if (OrderCategory.DuanBoRu.equals(orderInfoEntity.getOrderCategory())) {
                 // 扣费
-                return handleCompanyPay(orderInfoEntity, Boolean.FALSE, new BigDecimal("0"), Boolean.FALSE);
+                result = handleCompanyPay(orderInfoEntity, Boolean.FALSE, new BigDecimal("0"), Boolean.FALSE);
             }
-
+            OrderPagingResult detail = this.detail(orderId);
+            pushData(detail);
         } finally {
             if (orderInfoEntity.getOrderCategory() != OrderCategory.DuanBoChu) {
                 // 关闭 GPS
@@ -1389,8 +1372,31 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 String gpsId = truckInfo.getGps();
                 stopTrack(gpsId);
             }
+
         }
-        return false;
+        return result;
+    }
+
+    public void pushData(OrderPagingResult detail) {
+        Long orderId = detail.getId();
+        CompletableFuture.runAsync(() -> {
+            HsoaResult<?> result = hsoaService.pushProvincialSave(detail);
+            HsoaRecode hsoaRecode = new HsoaRecode()
+                    .setOrderId(orderId)
+                    .setOrderSn(detail.getSn())
+                    .setLicensePlate(detail.getLicensePlate())
+                    .setPushType(PushType.LianDan);
+            if (result == null || !result.isSuccess()) {
+                Hsoa.relogin();
+                log.error("推送订单数据失败，数据Id：{}", orderId);
+                hsoaService.save(hsoaRecode.setSuccess(Boolean.FALSE));
+            } else {
+                hsoaService.save(hsoaRecode.setSuccess(Boolean.TRUE));
+            }
+        }).exceptionally(e -> {
+            log.error("推送订单数据失败，数据Id：{}", orderId, e);
+            return null;
+        });
     }
 
     /**