From 9a0692a0f68a348010df2614b672ee13c8859b9c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 13 Mar 2023 15:51:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BA=A4=E6=98=93=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 2 +- .../jsowell/netty/command/ykc/StartChargingCommand.java | 2 +- .../yunkuaichong/impl/YKCPushCommandServiceImpl.java | 8 ++++---- .../main/resources/mapper/pile/OrderBasicInfoMapper.xml | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index e5eead8a8..9138ea7eb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -317,7 +317,7 @@ public class OrderService { StartChargingCommand startChargingCommand = StartChargingCommand.builder() .pileSn(pileSn) .connectorCode(orderInfo.getConnectorCode()) - .orderCode(dto.getOrderCode()) + .transactionCode(orderInfo.getTransactionCode()) .chargeAmount(payAmount) .build(); ykcPushCommandService.pushStartChargingCommand(startChargingCommand); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java b/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java index 891ac7525..ce74e8788 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java @@ -18,7 +18,7 @@ public class StartChargingCommand { /** * 交易流水号 */ - private String orderCode; + private String transactionCode; /** * 充电桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java index 65160e557..bddf5bcd9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java @@ -138,12 +138,12 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { public void pushStartChargingCommand(StartChargingCommand command) { String pileSn = command.getPileSn(); String connectorCode = command.getConnectorCode(); - String orderCode = command.getOrderCode(); + String transactionCode = command.getTransactionCode(); if (StringUtils.isEmpty(pileSn) || StringUtils.isEmpty(connectorCode) ) { log.warn("远程启动充电, 充电桩编号和枪口号不能为空"); return; } - if (StringUtils.isEmpty(orderCode)) { + if (StringUtils.isEmpty(transactionCode)) { log.warn("远程启动充电, 交易流水号不能为空"); return; } @@ -156,7 +156,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { byte[] connectorCodeByteArr = BytesUtil.str2Bcd(connectorCode); // 交易流水号 - byte[] orderIdByteArr = BytesUtil.str2Bcd(orderCode); + byte[] orderIdByteArr = BytesUtil.str2Bcd(transactionCode); // 桩编号 byte[] pileSnByteArr = BytesUtil.str2Bcd(pileSn); @@ -180,7 +180,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { byte[] msgBody = Bytes.concat(orderIdByteArr, pileSnByteArr, connectorCodeByteArr, logicCardNumByteArr, physicsCardNumByteArr, accountBalanceByteArr); this.push(msgBody, pileSn, YKCFrameTypeCode.REMOTE_CONTROL_START_CODE); log.info("【=====平台下发充电指令=====】:订单id:{}, 桩号:{}, 枪口号:{}, 逻辑卡号:{}, 物理卡号:{}, 账户余额:{}", - orderCode, pileSn, BytesUtil.bcd2Str(connectorCodeByteArr), logicCardNum, physicsCardNum, chargeAmount); + transactionCode, pileSn, BytesUtil.bcd2Str(connectorCodeByteArr), logicCardNum, physicsCardNum, chargeAmount); } @Override diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 6365d9c0d..1d980e0ba 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -6,6 +6,7 @@ + @@ -80,6 +81,7 @@ id, order_code, + transaction_code, order_status, member_id, station_id,