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

update

Browse Source
This commit is contained in:
Lemon
2023-03-30 10:30:43 +08:00
parent ca7bb356dd
commit 15080aac57
4 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
View File

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

7
jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
View File

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