From 15080aac57d7a8a70993cf9036b5758150146efc Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 30 Mar 2023 10:30:43 +0800 Subject: [PATCH] update --- .../ConfirmStartChargingRequestHandler.java | 15 +++++--- .../TransactionRecordsRequestHandler.java | 7 +++- .../service/impl/PileAuthCardServiceImpl.java | 2 +- jsowell-ui/src/views/pile/card/index.vue | 34 +++++++++++-------- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 978401764..a94e3fe4d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -123,7 +123,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ String logicCard = ""; byte[] authenticationFlagByteArr = Constants.zeroByteArray; byte[] accountBalanceByteArr = Constants.zeroByteArray; - String transactionCode = IdUtils.generateTransactionCode(pileSn, connectorCode); + String transactionCode = ""; try { if (StringUtils.equals("01", startMode)) { // 刷卡启动充电 @@ -149,10 +149,12 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ BigDecimal principalBalance = memberVO.getPrincipalBalance(); // 本金金额 double accountBalance = principalBalance.add(memberVO.getGiftBalance()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); accountBalanceByteArr = YKCUtils.getPriceByte(String.valueOf(accountBalance), 2); - if (StringUtils.equals("1", cardStatus)) { - // 鉴权成功标识 0x00 失败 0x01 成功 - authenticationFlagByteArr = Constants.oneByteArray; + if (!StringUtils.equals("1", cardStatus)) { + return null; } + // 鉴权成功标识 0x00 失败 0x01 成功 + authenticationFlagByteArr = Constants.oneByteArray; + transactionCode = IdUtils.generateTransactionCode(pileSn, connectorCode); // 通过桩号查询所属站点 PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn); Long stationId = pileBasicInfo.getStationId(); @@ -198,6 +200,11 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ .orderDetail(orderDetail) .build(); pileTransactionService.doCreateOrder(createOrderTransactionDTO); + + // 将卡状态改为启动锁定 + pileAuthCard.setId(pileAuthCardInfo.getId()); + pileAuthCard.setStatus("2"); + pileAuthCardService.updatePileAuthCard(pileAuthCard); } } catch (BusinessException e){ log.error("刷卡启动充电鉴权 error:{}, {}", e.getCode(), e.getMessage()); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index a5b4bbd49..df7e0e743 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -544,7 +544,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { if (Objects.isNull(orderBasicInfo.getChargeEndTime())) { // 结束时间 orderBasicInfo.setChargeEndTime(DateUtils.parseDate(data.getEndTime())); } - if (StringUtils.isNotBlank(data.getLogicCard())) { + if (!StringUtils.equals("0000000000000000", data.getLogicCard())) { // 根据物理卡号查出所属用户 PileAuthCard pileAuthCard = PileAuthCard.builder() .logicCard(data.getLogicCard()) @@ -552,7 +552,12 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { PileAuthCard cardInfo = pileAuthCardService.selectPileAuthCardInfo(pileAuthCard); if (cardInfo != null) { orderBasicInfo.setMemberId(cardInfo.getMemberId()); + // 将此卡状态改为正常 + pileAuthCard.setId(cardInfo.getId()); + pileAuthCard.setStatus("1"); + pileAuthCardService.updatePileAuthCard(pileAuthCard); } + } orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index d399f7af9..9d13cd8b2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -144,7 +144,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { .id(dto.getId()) .logicCard(dto.getLogicCard()) .memberId(memberBasicInfo.getMemberId()) - .status(dto.getStatus()) + .status("1") .build(); return pileAuthCardMapper.updatePileAuthCard(pileAuthCard); } diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue index afa5009a4..1595a2eb6 100644 --- a/jsowell-ui/src/views/pile/card/index.vue +++ b/jsowell-ui/src/views/pile/card/index.vue @@ -133,25 +133,25 @@ - + - - - - - - + + + + + + + + + + + + + + @@ -196,6 +196,8 @@ export default { title: "", // 是否显示弹出层 open: false, + // 卡号是否可填写 + isDisabled: false, // 查询参数 queryParams: { pageNum: 1, @@ -274,6 +276,7 @@ export default { this.reset(); this.open = true; this.title = "添加充电站鉴权卡"; + this.isDisabled = false; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -282,6 +285,7 @@ export default { getCard(id).then(response => { this.form = response.data; this.open = true; + this.isDisabled = true; this.title = "修改充电站鉴权卡"; }); },