From 3863f8bcc10c570008a48aae615c588ecf290fba Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 6 Mar 2024 16:00:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=BB=93=E7=AE=97=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B8=BA=E7=A9=BA=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4=E4=B8=BA=E7=BB=93=E7=AE=97=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/programlogic/AbstractProgramLogic.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index bd245bd93..b0df58cec 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -37,6 +37,7 @@ import java.math.RoundingMode; import java.text.ParseException; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 描述订单逻辑 @@ -285,7 +286,10 @@ public abstract class AbstractProgramLogic implements InitializingBean { orderBasicInfo.setSettleAmount(settleAmount); // 结算金额 orderBasicInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue()); orderBasicInfo.setReason(data.getStopReasonMsg()); // 充电停止原因 - orderBasicInfo.setSettlementTime(DateUtils.getNowDate()); // 结算时间 + if (Objects.isNull(orderBasicInfo.getSettlementTime())) { + // 如果结算时间为空，设置当前时间为结算时间 + orderBasicInfo.setSettlementTime(DateUtils.getNowDate()); // 结算时间 + } orderBasicInfo.setRefundAmount(residue); // 结算退款金额 }