diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
index e49259dea..1b3609610 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
@@ -1151,6 +1151,11 @@ public class TempService {
                 //         orderBasicInfo.getDiscountAmount(), orderBasicInfo.getRefundAmount(), orderBasicInfo.getSettleAmount());
                 logger.info(reCalculateFlagResult);
 
+                // 如果不是已完成的订单，将订单状态改为 6-订单完成
+                if (!StringUtils.equals(OrderStatusEnum.ORDER_COMPLETE.getValue(), orderBasicInfo.getOrderStatus())) {
+                    orderBasicInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
+                }
+
                 // 更新数据库
                 OrderTransactionDTO orderTransactionDTO = new OrderTransactionDTO();
                 orderTransactionDTO.setOrderBasicInfo(orderBasicInfo);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 530cd3138..6c4db9491 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -597,6 +597,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         // 发送停止充电指令
         pileRemoteService.remoteStopCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode());
 
+        // 结算时间设置为当前时间
+        orderInfo.setSettlementTime(new Date());
+        
         // 启动失败原因
         orderInfo.setReason(failedReasonMsg);
         // 订单退款(结算订单)