This commit is contained in:
2024-01-17 20:07:43 +08:00
parent 88cc37703a
commit e2a53104a3
2 changed files with 2 additions and 1 deletions

View File

@@ -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));

View File

@@ -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()));