diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java index c41f7e3fd..ce69017b0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java @@ -66,7 +66,7 @@ public class PileRemoteController extends BaseController { String transactionCode = null; try { transactionCode = IdUtils.generateTransactionCode(dto.getPileSn(), dto.getConnectorCode()); - pileRemoteService.remoteStartCharging(dto.getPileSn(), dto.getConnectorCode(), transactionCode, Constants.whitelistDefaultAmount); + pileRemoteService.remoteStartCharging(dto.getPileSn(), dto.getConnectorCode(), transactionCode, Constants.WHITELIST_DEFAULT_AMOUNT); // // 生成订单 // orderCode = orderService.generateOrder(dto); // // 支付订单 diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 6d038d457..397cd6a45 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -9358,7 +9358,7 @@ public class SpringBootTestController { List recordList = Lists.newArrayList(); // recordList.add(RefundableWxPayOrderData.builder().outTradeNo("1").transactionId("1").payerAmount(new BigDecimal("1000")).refundableAmount(new BigDecimal("0")).build()); // recordList.add(RefundableWxPayOrderData.builder().outTradeNo("2").transactionId("2").payerAmount(new BigDecimal("1000")).refundableAmount(new BigDecimal("0")).build()); - recordList.add(RefundableWxPayOrderData.builder().outTradeNo("3").transactionId("3").payerAmount(Constants.whitelistDefaultAmount).refundableAmount(new BigDecimal("300")).build()); + recordList.add(RefundableWxPayOrderData.builder().outTradeNo("3").transactionId("3").payerAmount(Constants.WHITELIST_DEFAULT_AMOUNT).refundableAmount(new BigDecimal("300")).build()); // 也许需要多笔支付订单才够退款 List requestList = com.google.common.collect.Lists.newArrayList(); diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index 538ba1dcd..e3ec6dee6 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -15,10 +15,13 @@ public class Constants { public static final String HEX_PREFIX = "0x"; // 白名单默认金额 - public static final BigDecimal whitelistDefaultAmount = new BigDecimal(Constants.FIVE_HUNDRED); + public static final BigDecimal WHITELIST_DEFAULT_AMOUNT = new BigDecimal(Constants.FIVE_HUNDRED); // 余额支付默认最大金额 - public static final BigDecimal balancePayMaxAmount = new BigDecimal(Constants.TWO_HUNDRED); + public static final BigDecimal BALANCE_PAY_MAX_AMOUNT = new BigDecimal(Constants.TWO_HUNDRED); + + // 联联平台最大启动金额 + public static final BigDecimal LIAN_LIAN_MAX_AMOUNT = new BigDecimal(Constants.THREE_HUNDRED_FIFTY); // 默认分隔符 public static final String DEFAULT_DELIMITER = ","; @@ -88,6 +91,8 @@ public class Constants { public static final String TWO_HUNDRED = "200"; + public static final String THREE_HUNDRED_FIFTY = "350"; + public static final String FIVE_HUNDRED = "500"; public static final int zero = 0; 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 b41b78b3f..9254b50e7 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 @@ -2405,11 +2405,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (platformTesterVO != null && StringUtils.equals(Constants.ONE, platformTesterVO.getStatus())) { // 是平台测试员 - accountBalance = Constants.whitelistDefaultAmount; + accountBalance = Constants.WHITELIST_DEFAULT_AMOUNT; payMode = OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue(); } else if (pileStationWhitelist != null) { // 站点白名单 - accountBalance = Constants.whitelistDefaultAmount; + accountBalance = Constants.WHITELIST_DEFAULT_AMOUNT; payMode = OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue(); } else { // 通过memberId获取账户余额 @@ -2422,7 +2422,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { logger.info("充电桩主动申请启动充电生成订单 余额不足, memberId:{}, MemberVO:{}", dto.getMemberId(), JSON.toJSONString(memberVO)); throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT); } - BigDecimal defaultAmount = Constants.balancePayMaxAmount; + BigDecimal defaultAmount = Constants.BALANCE_PAY_MAX_AMOUNT; if (accountBalance.compareTo(defaultAmount) > 0) { accountBalance = defaultAmount; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 2bf4c71e8..d868f539c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -1,7 +1,6 @@ package com.jsowell.pile.service.programlogic; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.jsowell.adapay.service.AdapayService; @@ -192,11 +191,11 @@ public abstract class AbstractProgramLogic implements InitializingBean { if (platformTesterVO != null && StringUtils.equals(Constants.ONE, platformTesterVO.getStatus())) { // 是平台测试员 - accountBalance = Constants.whitelistDefaultAmount; + accountBalance = Constants.WHITELIST_DEFAULT_AMOUNT; payMode = OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue(); } else if (pileStationWhitelist != null) { // 站点白名单 - accountBalance = Constants.whitelistDefaultAmount; + accountBalance = Constants.WHITELIST_DEFAULT_AMOUNT; payMode = OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue(); } else { // 通过memberId获取账户余额 @@ -209,7 +208,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { logger.info("充电桩主动申请启动充电生成订单 余额不足, memberId:{}, MemberVO:{}", dto.getMemberId(), JSON.toJSONString(memberVO)); throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT); } - BigDecimal defaultAmount = Constants.balancePayMaxAmount; + BigDecimal defaultAmount = Constants.BALANCE_PAY_MAX_AMOUNT; if (accountBalance.compareTo(defaultAmount) > 0) { accountBalance = defaultAmount; } @@ -1093,7 +1092,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { BigDecimal giftBalancePay; BigDecimal totalAccountAmount = memberVO.getTotalAccountAmount(); // 余额支付最大下发200 - BigDecimal defaultAmount = Constants.balancePayMaxAmount; + BigDecimal defaultAmount = Constants.BALANCE_PAY_MAX_AMOUNT; if (totalAccountAmount.compareTo(defaultAmount) < 0) { principalBalancePay = memberVO.getPrincipalBalance(); giftBalancePay = memberVO.getGiftBalance(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index f07b76425..4074766dc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -108,7 +108,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { resultMap.put("weixinMap", weixinMap); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付 // 白名单支付可以直接调支付回调方法 - dto.setPayAmount(Constants.whitelistDefaultAmount); + dto.setPayAmount(Constants.WHITELIST_DEFAULT_AMOUNT); whitelistPaymentOrder(dto); } return resultMap; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 5e053b799..e1c41299b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -217,7 +217,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { resultMap.put("weixinMap", weixinMap); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付 // 白名单支付可以直接调支付回调方法 - dto.setPayAmount(Constants.whitelistDefaultAmount); + dto.setPayAmount(Constants.WHITELIST_DEFAULT_AMOUNT); whitelistPaymentOrder(dto); } return resultMap; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java index 5714d10f9..6842c70c1 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java @@ -1239,6 +1239,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { .chargeAmount(orderBasicInfo.getPayAmount()) .logicCardNum(null) .physicsCardNum(null) + .chargeAmount(Constants.LIAN_LIAN_MAX_AMOUNT) .build(); ykcPushCommandService.pushStartChargingCommand(command);