From 3990c55d55bb5e7124cb663ee308934e9dab4ce7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 21 Feb 2024 16:52:56 +0800 Subject: [PATCH] =?UTF-8?q?0x19=E5=85=85=E7=94=B5=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9B=B4=E6=96=B0=E4=B8=AA=E5=88=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/netty/handler/ChargeEndHandler.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index 1bebe73db..5f0bbfc9b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -4,6 +4,7 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.util.BytesUtil; +import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; @@ -105,14 +106,25 @@ public class ChargeEndHandler extends AbstractHandler{ // 查询订单，改为待结算 将结束soc传入 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); if (Objects.nonNull(orderInfo)) { + Date nowDate = DateUtils.getNowDate(); // 当前时间 if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderInfo.getOrderStatus())) { orderInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue()); } orderInfo.setEndSoc(stopSoc); if (orderInfo.getChargeEndTime() == null) { - orderInfo.setChargeEndTime(new Date()); // 结束充电时间 + orderInfo.setChargeEndTime(nowDate); // 结束充电时间 } - orderBasicInfoService.updateOrderBasicInfo(orderInfo); + // orderBasicInfoService.updateOrderBasicInfo(orderInfo); + + // 只更新个别字段 + OrderBasicInfo updateOrder = new OrderBasicInfo(); + updateOrder.setId(orderInfo.getId()); + updateOrder.setEndSoc(stopSoc); + if (orderInfo.getChargeEndTime() == null) { + updateOrder.setChargeEndTime(nowDate); // 结束充电时间 + } + updateOrder.setUpdateTime(nowDate); + orderBasicInfoService.updateOrderBasicInfo(updateOrder); } return null;