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

update lianlian启动金额

Browse Source
This commit is contained in:
Guoqs
2024-05-09 10:15:44 +08:00
parent 4c4c98d0c0
commit 66ccbb2ff1
8 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

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

9
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

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

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

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

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
View File

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