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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
YAS\29473
2026-01-09 17:29:03 +08:00
parent bf9544bcdc 1182427c71
commit ba4c91b7bc
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -964,10 +964,10 @@ public abstract class AbstractProgramLogic implements InitializingBean {
BigDecimal electricityAmountDiscount = BigDecimal.ZERO; BigDecimal electricityAmountDiscount = BigDecimal.ZERO;
// 服务费折扣金额 初始值为0 // 服务费折扣金额 初始值为0
BigDecimal serviceAmountDiscount = BigDecimal.ZERO; BigDecimal serviceAmountDiscount = BigDecimal.ZERO;
// 优惠后电费金额 初始值为优惠前金额 // 优惠后电费金额 初始值为0
BigDecimal afterDiscountElectricityAmount = new BigDecimal(originalTotalElectricityAmount.toString()); BigDecimal afterDiscountElectricityAmount = BigDecimal.ZERO;
// 优惠后服务费金额 初始值为优惠前金额 // 优惠后服务费金额 初始值为0
BigDecimal afterDiscountServiceAmount = new BigDecimal(originalTotalServiceAmount.toString()); BigDecimal afterDiscountServiceAmount = BigDecimal.ZERO;
// 订单总耗电量 // 订单总耗电量
BigDecimal totalUsedElectricity = orderDetail.getTotalUsedElectricity(); BigDecimal totalUsedElectricity = orderDetail.getTotalUsedElectricity();
@@ -988,8 +988,8 @@ public abstract class AbstractProgramLogic implements InitializingBean {
MemberDiscountVO memberDiscountVO = memberGroupService.queryMemberDiscountV2(merchantId, stationId, memberId); MemberDiscountVO memberDiscountVO = memberGroupService.queryMemberDiscountV2(merchantId, stationId, memberId);
if (memberDiscountVO == null) { if (memberDiscountVO == null) {
// 如果没有优惠，则优惠后金额 等于优惠前金额 // 如果没有优惠，则优惠后金额 等于优惠前金额
afterDiscountElectricityAmount = orderDetail.getTotalElectricityAmount(); afterDiscountElectricityAmount = originalTotalElectricityAmount;
afterDiscountServiceAmount = orderDetail.getTotalServiceAmount(); afterDiscountServiceAmount = originalTotalServiceAmount;
} else { } else {
// 集团会员的订单，记录集团编号 // 集团会员的订单，记录集团编号
orderBasicInfo.setGroupCode(memberDiscountVO.getGroupCode()); orderBasicInfo.setGroupCode(memberDiscountVO.getGroupCode());
@@ -1076,6 +1076,22 @@ public abstract class AbstractProgramLogic implements InitializingBean {
afterDiscountServiceAmount = afterDiscountServiceAmount.add(serviceAmount); afterDiscountServiceAmount = afterDiscountServiceAmount.add(serviceAmount);
} }
// 如果4个时段都是0，并且总耗电量大于0，则折扣后电费等于原始电费，折扣后服务费等于原始服务费
// if (peakUsedElectricity.compareTo(BigDecimal.ZERO) == 0
// && flatUsedElectricity.compareTo(BigDecimal.ZERO) == 0
// && valleyUsedElectricity.compareTo(BigDecimal.ZERO) == 0
// && sharpUsedElectricity.compareTo(BigDecimal.ZERO) == 0
// && totalUsedElectricity.compareTo(BigDecimal.ZERO) > 0) {
// afterDiscountElectricityAmount = originalTotalElectricityAmount;
// afterDiscountServiceAmount = originalTotalServiceAmount;
// }
// 如果总耗电量大于0, 并且各个时段耗电量总和为0, 则优惠后金额等于优惠前金额
if (totalUsedElectricity.compareTo(BigDecimal.ZERO) > 0 && sumUsedElectricity.compareTo(BigDecimal.ZERO) == 0 ) {
afterDiscountElectricityAmount = originalTotalElectricityAmount;
afterDiscountServiceAmount = originalTotalServiceAmount;
}
// 计算优惠了多少钱 // 计算优惠了多少钱
// 电费折扣金额 = 优惠前电费 - 优惠后电费 // 电费折扣金额 = 优惠前电费 - 优惠后电费
electricityAmountDiscount = originalTotalElectricityAmount.subtract(afterDiscountElectricityAmount); electricityAmountDiscount = originalTotalElectricityAmount.subtract(afterDiscountElectricityAmount);
@@ -1086,12 +1102,6 @@ public abstract class AbstractProgramLogic implements InitializingBean {
// orderCode, originalTotalElectricityAmount, afterDiscountElectricityAmount, electricityAmountDiscount, originalTotalServiceAmount, afterDiscountServiceAmount, serviceAmountDiscount); // orderCode, originalTotalElectricityAmount, afterDiscountElectricityAmount, electricityAmountDiscount, originalTotalServiceAmount, afterDiscountServiceAmount, serviceAmountDiscount);
} }
// 如果总耗电量大于0, 并且各个时段耗电量总和为0, 则优惠后金额等于优惠前金额
if (totalUsedElectricity.compareTo(BigDecimal.ZERO) > 0 && sumUsedElectricity.compareTo(BigDecimal.ZERO) == 0 ) {
afterDiscountElectricityAmount = orderDetail.getTotalElectricityAmount();
afterDiscountServiceAmount = orderDetail.getTotalServiceAmount();
}
/** /**
* 电费折扣金额和服务费折扣金额 应该大于等于0, 如小于0, 则设置为0 * 电费折扣金额和服务费折扣金额 应该大于等于0, 如小于0, 则设置为0
*/ */