autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-08 03:50:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 交易流水号

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-13 15:51:41 +08:00
parent 27608923cb
commit 9a0692a0f6
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -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);

2
jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java
View File

@@ -18,7 +18,7 @@ public class StartChargingCommand {
/**
* 交易流水号
*/
private String orderCode;
private String transactionCode;
/**
* 充电桩编号

8
jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java
View File

@@ -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

2
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -6,6 +6,7 @@
<resultMap type="com.jsowell.pile.domain.OrderBasicInfo" id="OrderBasicInfoResult">
<result property="id" column="id"/>
<result property="orderCode" column="order_code"/>
<result property="transactionCode" column="transaction_code"/>
<result property="orderStatus" column="order_status"/>
<result property="memberId" column="member_id"/>
<result property="stationId" column="station_id"/>
@@ -80,6 +81,7 @@
<sql id="Base_Column_List">
id,
order_code,
transaction_code,
order_status,
member_id,
station_id,