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

update 0xA1双枪并充逻辑

Browse Source
This commit is contained in:
Lemon
2025-08-05 16:47:45 +08:00
parent 9adc5761bf
commit 08fc63c9d8
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileApplyMergeChargeHandler.java
View File

@@ -110,6 +110,10 @@ public class PileApplyMergeChargeHandler extends AbstractYkcHandler{
byte[] mergeChargeNumberByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); byte[] mergeChargeNumberByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String mergeChargeNumber = BytesUtil.bcd2Str(mergeChargeNumberByteArr); String mergeChargeNumber = BytesUtil.bcd2Str(mergeChargeNumberByteArr);
log.info("平台收到消息----0xA1主动申请并充充电，桩号：{}，枪口号：{}，启动方式：{}，是否需要密码：{}，物理卡号：{}，" +
"输入密码：{}，VIN码：{}，主辅枪标记：{}，并充序号：{}",
pileSn, connectorCode, startMode, needPasswordFlag, physicsCard, inputPasswordHexStr, vinCode, connectorMark, mergeChargeNumber);
// 鉴权方法(返回交易流水号、账户余额、鉴权成功标识) // 鉴权方法(返回交易流水号、账户余额、鉴权成功标识)
String pileConnectorCode = pileSn + connectorCode; String pileConnectorCode = pileSn + connectorCode;
VerifyMergeChargeOrderDTO dto = VerifyMergeChargeOrderDTO.builder() VerifyMergeChargeOrderDTO dto = VerifyMergeChargeOrderDTO.builder()

13
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -4712,11 +4712,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
@Override @Override
public OrderBasicInfo saveOrderForEV(GenerateOrderDTO dto) throws ParseException { public OrderBasicInfo saveOrderForEV(GenerateOrderDTO dto) throws ParseException {
String pileConnectorCode = dto.getPileSn() + dto.getConnectorCode(); String pileConnectorCode = dto.getPileSn() + dto.getConnectorCode();
// 先根据枪口号查询是否有未启动的并充订单 // // 先根据枪口号查询是否有未启动的并充订单
OrderBasicInfo orderBasicInfo = selectNotStartMergeOrder(pileConnectorCode); // OrderBasicInfo orderBasicInfo = selectNotStartMergeOrder(pileConnectorCode);
if (orderBasicInfo != null) { // if (orderBasicInfo != null) {
return orderBasicInfo; // logger.info("查询到有未启动的并充订单，直接返回");
} // return orderBasicInfo;
// }
String orderCode = generateNewOrderCode(); String orderCode = generateNewOrderCode();
String transactionCode = dto.getTransactionCode(); String transactionCode = dto.getTransactionCode();
if (StringUtils.isBlank(transactionCode)) { if (StringUtils.isBlank(transactionCode)) {
@@ -4733,7 +4734,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : ""; String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
String plateNumber = dto.getPlateNumber() != null ? dto.getPlateNumber() : ""; String plateNumber = dto.getPlateNumber() != null ? dto.getPlateNumber() : "";
// 订单基本信息 // 订单基本信息
orderBasicInfo = OrderBasicInfo.builder() OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
.orderCode(orderCode) .orderCode(orderCode)
.transactionCode(transactionCode) .transactionCode(transactionCode)
.orderStatus(OrderStatusEnum.NOT_START.getValue()) .orderStatus(OrderStatusEnum.NOT_START.getValue())