diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java index 770167427..c3dcef7ec 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java @@ -346,7 +346,11 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler { } dto.setConnectorCode(connectorCode); dto.setTransactionCode(transactionCode); - dto.setChargeAmount(new BigDecimal(accountBalance)); + if (memberWalletVO.getDefaultChargeAmount() != null && memberWalletVO.getDefaultChargeAmount().compareTo(BigDecimal.ZERO) > 0) { + dto.setChargeAmount(memberWalletVO.getDefaultChargeAmount()); + }else { + dto.setChargeAmount(new BigDecimal(accountBalance)); + } dto.setPayMode(payMode); dto.setStartMode(StringUtils.equals("01", startMode) ? "2" : "5"); dto.setMemberId(memberWalletVO.getMemberId()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java index 2aa359606..edaf93b08 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java @@ -22,6 +22,11 @@ public class ConfirmStartChargingMemberVO { */ private String plateNumber; + /** + * 默认充电金额 + */ + private BigDecimal defaultChargeAmount; + /** * 本金金额 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 39316a9c6..8da3b1b1d 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -331,6 +331,7 @@