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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-04 15:39:25 +08:00
parent a4c47427b7
commit 7496a3459f
2 changed files with 276 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1370
jsowell-admin/src/test/java/SpringBootTestController.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -269,7 +269,8 @@ public abstract class AbstractProgramLogic implements InitializingBean {
// 虚拟金额 指订单消费中不参与结算的部分 // 虚拟金额 指订单消费中不参与结算的部分
BigDecimal virtualAmount = BigDecimal.ZERO; BigDecimal virtualAmount = BigDecimal.ZERO;
if (OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue().equals(orderBasicInfo.getPayMode())) { if (OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue().equals(orderBasicInfo.getPayMode())
|| OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
// 白名单支付所消费的金额，都属于虚拟金额，不参与结算对账 // 白名单支付所消费的金额，都属于虚拟金额，不参与结算对账
virtualAmount = new BigDecimal(orderAmount.toString()); virtualAmount = new BigDecimal(orderAmount.toString());
} }