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 3b7e90732..6fcc88f07 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 @@ -395,10 +395,10 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler { return resultMap; } - // 如果不是平台测试员, 并且也不是站点白名单, 并且总余额小于0, 则提示余额不足 + // 如果不是平台测试员, 并且也不是站点白名单, 并且总余额小于等于0, 则提示余额不足 if (!StringUtils.equals(Constants.ONE, memberWalletVO.getPlatformTesterFlag()) && !StringUtils.equals(Constants.ONE, memberWalletVO.getStationWhiteListFlag()) - && memberWalletVO.getTotalBalance().compareTo(BigDecimal.ZERO) < 0) { + && memberWalletVO.getTotalBalance().compareTo(BigDecimal.ZERO) <= 0) { resultMap.put("transactionCode", Constants.ILLEGAL_TRANSACTION_CODE); resultMap.put("accountBalance", accountBalance); resultMap.put("defeatReasonCode", "03"); 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 deb9b7552..d6f55f2ab 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 @@ -5450,11 +5450,22 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } // 如果总余额小于0, 则标示余额不足 - if (memberWalletVO.getTotalBalance().compareTo(BigDecimal.ZERO) < 0) { + // if (memberWalletVO.getTotalBalance().compareTo(BigDecimal.ZERO) <= 0) { + // map.put("transactionCode", Constants.ILLEGAL_TRANSACTION_CODE); + // map.put("accountBalance", accountBalance); + // map.put("defeatReasonCode", "03"); + // logger.info("并充生成订单----余额不足"); + // return map; + // } + + // 如果不是平台测试员, 并且也不是站点白名单, 并且总余额小于等于0, 则提示余额不足 + if (!StringUtils.equals(Constants.ONE, memberWalletVO.getPlatformTesterFlag()) + && !StringUtils.equals(Constants.ONE, memberWalletVO.getStationWhiteListFlag()) + && memberWalletVO.getTotalBalance().compareTo(BigDecimal.ZERO) <= 0) { map.put("transactionCode", Constants.ILLEGAL_TRANSACTION_CODE); map.put("accountBalance", accountBalance); map.put("defeatReasonCode", "03"); - logger.info("并充生成订单----余额不足"); + logger.info("余额不足"); return map; }