From e2a53104a35cc5df7995a48467f12129baee7e9d Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 17 Jan 2024 20:07:43 +0800 Subject: [PATCH] update --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 1 + .../jsowell/pile/service/impl/OrderPayRecordServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 a0b2774f7..14bace52f 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 @@ -3065,6 +3065,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) { // 如果订单状态是待补缴，表示已经停止充电了，需要补缴费用，补缴完成订单状态改为订单完成，设置结算时间 orderInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue()); + orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue()); orderInfo.setSettlementTime(new Date()); BigDecimal remedialAmount = orderInfo.getRemedialAmount(); orderInfo.setRemedialAmount(remedialAmount.subtract(payAmount)); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java index ad44182b0..daf854e6f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java @@ -101,7 +101,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord(); payInfo.setPayAmount(orderPayRecord.getPayAmount().toString()); - // payInfo.setPayStatus(orderBasicInfo.getPayStatus()); + payInfo.setPayStatus(orderBasicInfo.getPayStatus()); payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime())); payInfo.setRefundAmount(String.valueOf(orderPayRecord.getRefundAmount()));