diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 12a103618..29f0e4d55 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -321,7 +321,7 @@ public class MemberService { relation.setPhoneNumber(dto.getPhoneNumber()); if (StringUtils.isNotBlank(dto.getVinCode())) { relation.setVinCode(dto.getVinCode().toUpperCase(Locale.ROOT)); - relation.setVinStatus("0"); + relation.setVinStatus("1"); // 1-正常使用 } memberPlateNumberRelationService.insertMemberPlateNumberRelation(relation); } 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 57843bde5..4c6b47f99 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 @@ -167,7 +167,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ } if (!StringUtils.equals("1", plateInfo.getVinStatus())) { // 1- 正常使用 - throw new BusinessException("", "状态不正确"); + throw new BusinessException("", "vin状态不正确"); } // vin码生成订单 vin启动充电 GenerateOrderDTO dto = new GenerateOrderDTO(); 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 6e57eed9e..2d6c035b4 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 @@ -613,8 +613,8 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { // 如果是vin启动,将启动锁定状态改为正常 if (StringUtils.equals(data.getTransactionIdentifier(), "05")) { MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(data.getVinCode()); - if (plateInfo != null && (StringUtils.equals(plateInfo.getVinStatus(), "1"))) { - plateInfo.setVinStatus("0"); + if (plateInfo != null && (StringUtils.equals(plateInfo.getVinStatus(), "2"))) { + plateInfo.setVinStatus("1"); memberPlateNumberRelationService.updateMemberPlateNumberRelation(plateInfo); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index e4b1f0947..9f1b10781 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1568,6 +1568,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { memberId = pileAuthCardInfo.getMemberId(); logicCard = pileAuthCardInfo.getLogicCard(); }else if (StringUtils.equals(StartModeEnum.VIN_CODE.getValue(), startMode)) { + logger.info("车辆vin启动充电 params:{}", JSON.toJSONString(dto)); // vin启动充电 relation = dto.getMemberPlateNumberRelation(); memberId = relation.getMemberId(); @@ -1644,7 +1645,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { pileAuthCardService.updatePileAuthCard(pileAuthCard); } else if (StringUtils.equals(StartModeEnum.VIN_CODE.getValue(), startMode)) { // 将vin码改成启动锁定 - relation.setVinStatus("1"); + relation.setVinStatus("2"); memberPlateNumberRelationService.updateMemberPlateNumberRelation(relation); }