From 87c5373430e47ba0f5095df8f69b91ccaaab9064 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 6 Nov 2025 11:17:05 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=AF=E5=8A=A8=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E8=AE=BE=E7=BD=AE=E7=BB=93=E7=AE=97=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E3=80=81debugOrder=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/TempService.java | 5 +++++ .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 3 +++ 2 files changed, 8 insertions(+) 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); // 订单退款(结算订单)