From a9dbf8e888bec20c9cfd04b55a251e811a975457 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 13 Mar 2023 16:22:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=85=85=E7=94=B5=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/netty/handler/ChargeEndHandler.java | 5 +++-- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 2 ++ 2 files changed, 5 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 778528ef6..f226b80da 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 @@ -49,7 +49,7 @@ public class ChargeEndHandler extends AbstractHandler{ // 交易流水号 byte[] serialNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); - String orderCode = BytesUtil.bcd2Str(serialNumByteArr); + String transactionCode = BytesUtil.bcd2Str(serialNumByteArr); // 桩编码 startIndex += length; @@ -104,7 +104,8 @@ public class ChargeEndHandler extends AbstractHandler{ byte[] pileChargedCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); // 查询订单，改为待结算 将结束soc传入 - OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); + // OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(transactionCode); + OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); if (Objects.nonNull(orderInfo)) { if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderInfo.getOrderStatus())) { orderInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue()); 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 b2a2ee596..6058d099b 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 @@ -349,6 +349,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 清缓存 String redisKey = CacheConstants.GET_ORDER_INFO_BY_ORDER_CODE + orderBasicInfo.getOrderCode(); redisCache.deleteObject(redisKey); + String redisKey2 = CacheConstants.GET_ORDER_INFO_BY_TRANSACTION_CODE + orderBasicInfo.getTransactionCode(); + redisCache.deleteObject(redisKey2); return orderBasicInfoMapper.updateOrderBasicInfo(orderBasicInfo); }