From 5a58d6e22ca314c152157c4e1ff6a6a43ed97e80 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 24 Jul 2024 13:57:13 +0800
Subject: [PATCH] update

---
 .../src/main/java/com/jsowell/service/OrderService.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index c56812191..e8ebb539a 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -577,6 +577,9 @@ public class OrderService {
         vo.setPileConnectorCode(pileSn + connectorCode);
         String orderStatus = orderBasicInfo.getOrderStatus();
         vo.setOrderStatus(orderStatus);
+        // 订单状态描述
+        String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
+        vo.setOrderStatusDescribe(orderStatusDescribe);
         if (Objects.nonNull(orderBasicInfo.getChargeStartTime())) {
             vo.setStartChargingTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()));
         }
@@ -597,9 +600,6 @@ public class OrderService {
         if (StringUtils.isNotBlank(String.valueOf(stationInfo.getOccupyFee()))) {
             vo.setOccupyFee(stationInfo.getOccupyFee());
         }
-        // 订单状态描述
-        String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
-        vo.setOrderStatusDescribe(orderStatusDescribe);
 
         // 获取充电桩枪口信息
         PileConnectorDetailVO pileConnectorDetailVO = pileService.queryPileConnectorDetail(vo.getPileConnectorCode());