From 08fc63c9d8401c89b3c24ba6b41d3a787b868d39 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 5 Aug 2025 16:47:45 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=200xA1=E5=8F=8C=E6=9E=AA=E5=B9=B6?= =?UTF-8?q?=E5=85=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunkuaichong/PileApplyMergeChargeHandler.java | 4 ++++ .../service/impl/OrderBasicInfoServiceImpl.java | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileApplyMergeChargeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileApplyMergeChargeHandler.java index 5fea30281..442ae94f6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileApplyMergeChargeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileApplyMergeChargeHandler.java @@ -110,6 +110,10 @@ public class PileApplyMergeChargeHandler extends AbstractYkcHandler{ byte[] mergeChargeNumberByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); String mergeChargeNumber = BytesUtil.bcd2Str(mergeChargeNumberByteArr); + log.info("平台收到消息----0xA1主动申请并充充电，桩号：{}，枪口号：{}，启动方式：{}，是否需要密码：{}，物理卡号：{}，" + + "输入密码：{}，VIN码：{}，主辅枪标记：{}，并充序号：{}", + pileSn, connectorCode, startMode, needPasswordFlag, physicsCard, inputPasswordHexStr, vinCode, connectorMark, mergeChargeNumber); + // 鉴权方法(返回交易流水号、账户余额、鉴权成功标识) String pileConnectorCode = pileSn + connectorCode; VerifyMergeChargeOrderDTO dto = VerifyMergeChargeOrderDTO.builder() 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 762192526..9aa8dd995 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 @@ -4712,11 +4712,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { @Override public OrderBasicInfo saveOrderForEV(GenerateOrderDTO dto) throws ParseException { String pileConnectorCode = dto.getPileSn() + dto.getConnectorCode(); - // 先根据枪口号查询是否有未启动的并充订单 - OrderBasicInfo orderBasicInfo = selectNotStartMergeOrder(pileConnectorCode); - if (orderBasicInfo != null) { - return orderBasicInfo; - } + // // 先根据枪口号查询是否有未启动的并充订单 + // OrderBasicInfo orderBasicInfo = selectNotStartMergeOrder(pileConnectorCode); + // if (orderBasicInfo != null) { + // logger.info("查询到有未启动的并充订单，直接返回"); + // return orderBasicInfo; + // } String orderCode = generateNewOrderCode(); String transactionCode = dto.getTransactionCode(); if (StringUtils.isBlank(transactionCode)) { @@ -4733,7 +4734,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : ""; String plateNumber = dto.getPlateNumber() != null ? dto.getPlateNumber() : ""; // 订单基本信息 - orderBasicInfo = OrderBasicInfo.builder() + OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder() .orderCode(orderCode) .transactionCode(transactionCode) .orderStatus(OrderStatusEnum.NOT_START.getValue())