From b17b13367aae563c7ed3147712bb4969372f67e9 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 23 Aug 2024 11:11:50 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A2=84=E7=BA=A6=E5=85=85=E7=94=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...servationChargingStartupResultHandler.java | 49 +++++++++++++++++++
 .../impl/OrderBasicInfoServiceImpl.java       |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java
index b39d9aa19..02b6a4c1a 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java
@@ -34,6 +34,55 @@ public class ReservationChargingStartupResultHandler extends AbstractYkcHandler
         YKCOperateFactory.register(type, this);
     }
 
+    public static void main(String[] args) {
+        // 获取消息体
+        String msg = "8823000000071801240823102300000088230000000718010190";
+        byte[] msgBody = BytesUtil.str2Bcd(msg);
+
+        int startIndex = 0;
+        int length = 16;
+
+        // 交易流水号
+        byte[] transactionCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
+        String transactionCode = BytesUtil.bcd2Str(transactionCodeByteArr);
+
+        // 桩编码
+        startIndex += length;
+        length = 7;
+        byte[] pileSnByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
+        String pileSn = BytesUtil.bcd2Str(pileSnByteArr);
+
+        // 枪号
+        startIndex += length;
+        length = 1;
+        byte[] connectorCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
+        String connectorCode = BytesUtil.bcd2Str(connectorCodeByteArr);
+
+        // vin
+        startIndex += length;
+        length = 17;
+        byte[] vinCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
+        String vinCode = YKCUtils.parseVin(vinCodeByteArr); // 解析vin
+
+        // 启动结果 0x00失败 0x01成功
+        startIndex += length;
+        length = 1;
+        byte[] startupResultByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
+        String startupResult = BytesUtil.bcd2Str(startupResultByteArr);
+        String startupResultMsg = StringUtils.equals(startupResult, "00") ? "失败" : "成功";
+
+        // 失败原因
+        startIndex += length;
+        length = 1;
+        byte[] failReasonByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
+        String failReason = BytesUtil.bcd2Str(failReasonByteArr);
+        String failReasonMsg = ChargingFailedReasonEnum.getMsgByCode(Integer.parseInt(failReason, 16));
+
+        log.info("[===预约充电启动结果上送===]交易流水号:{}, 桩编号:{}, 枪号:{}, vin:{}, 启动结果:{}, 失败原因:{}",
+                transactionCode, pileSn, connectorCode, vinCode, startupResult + "-" +startupResultMsg, failReasonMsg);
+
+    }
+
     @Override
     public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) {
         log.info("[===预约充电启动结果上送===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString());
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 7f108361a..2a102f981 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
@@ -3796,7 +3796,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         String orderCode = generateNewOrderCode();
         String transactionCode = chargingStartupResult.getTransactionCode();
 
-        String status = StringUtils.equals(chargingStartupResult.getStartupResult(), "00")
+        String status = StringUtils.equals(chargingStartupResult.getStartupResult(), "01")
                 ? OrderStatusEnum.IN_THE_CHARGING.getValue()
                 : OrderStatusEnum.ORDER_CLOSE_TIMEOUT.getValue();