From b19dba0a65da20bf6eb2a02268e3114ee3cbb8c2 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 17 Jan 2024 19:04:20 +0800 Subject: [PATCH] update --- .../service/impl/OrderBasicInfoServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 3ae7a54e4..c8f629c2c 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 @@ -3013,6 +3013,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { sendStartCharging = false; } + // 修改订单 + orderInfo.setPayMode(dto.getPayMode()); + orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue()); + BigDecimal orderPayAmount = orderInfo.getPayAmount() == null ? BigDecimal.ZERO : orderInfo.getPayAmount(); + orderInfo.setPayAmount(orderPayAmount.add(payAmount)); + orderInfo.setPayTime(new Date()); + if (sendStartCharging) { String pileSn = orderInfo.getPileSn(); // 发送启动充电指令前，再次下发计费模板 @@ -3027,13 +3034,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { logger.info("订单:{}支付成功, 发送启动指令", dto.getOrderCode()); } - // 修改订单 - orderInfo.setPayMode(dto.getPayMode()); - orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue()); - BigDecimal orderPayAmount = orderInfo.getPayAmount() == null ? BigDecimal.ZERO : orderInfo.getPayAmount(); - orderInfo.setPayAmount(orderPayAmount.add(payAmount)); - orderInfo.setPayTime(new Date()); - if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) { // 如果订单状态是待补缴，表示已经停止充电了，需要补缴费用，补缴完成订单状态改为订单完成，设置结算时间 orderInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());