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); // 结算退款金额 }