autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-15 15:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 电单车

Browse Source
This commit is contained in:
Guoqs
2024-10-08 15:20:20 +08:00
parent 6aeded9d93
commit 6e5c3fb8bb
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,18 +517,15 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
orderDetail.setFlatUsedElectricity(message.getConsumedEnergy()); orderDetail.setFlatUsedElectricity(message.getConsumedEnergy());
} }
// 充满自停需要退款
BigDecimal bigDecimal = new BigDecimal("5");
if (bigDecimal.compareTo(orderBasicInfo.getPayAmount()) == 0) {
// 计算电单车退款金额 // 计算电单车退款金额
calculateEBikeRefund(orderBasicInfo, orderDetail, message); calculateEBikeRefund(orderBasicInfo, orderDetail, message);
// 订单退款
refundOrder(orderBasicInfo);
}
// 退款金额 // 退款金额
BigDecimal refundAmount = orderBasicInfo.getRefundAmount() == null ? BigDecimal.ZERO : orderBasicInfo.getRefundAmount(); BigDecimal refundAmount = orderBasicInfo.getRefundAmount() == null ? BigDecimal.ZERO : orderBasicInfo.getRefundAmount();
if (refundAmount.compareTo(BigDecimal.ZERO) > 0) {
// 订单退款, 退款金额大于0才退款
refundOrder(orderBasicInfo);
}
// 结算金额 = 支付金额 - 退款金额 // 结算金额 = 支付金额 - 退款金额
BigDecimal settleAmount = orderBasicInfo.getPayAmount().subtract(refundAmount).setScale(2, RoundingMode.DOWN); BigDecimal settleAmount = orderBasicInfo.getPayAmount().subtract(refundAmount).setScale(2, RoundingMode.DOWN);
@@ -547,6 +544,12 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
* @param orderBasicInfo * @param orderBasicInfo
*/ */
private void calculateEBikeRefund(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail, EBikeMessageCmd03 message) { private void calculateEBikeRefund(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail, EBikeMessageCmd03 message) {
// 充满自停需要退款
BigDecimal fullOfSelfStopping = new BigDecimal("5"); // 充满自停金额5元
// 退款金额
BigDecimal refundAmount = BigDecimal.ZERO;
if (fullOfSelfStopping.compareTo(orderBasicInfo.getPayAmount()) == 0) {
// 耗电量 // 耗电量
BigDecimal consumedEnergy = message.getConsumedEnergy(); BigDecimal consumedEnergy = message.getConsumedEnergy();
@@ -563,9 +566,14 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
BigDecimal consumeAmount = consumedEnergy.multiply(flatElectricityPrice); BigDecimal consumeAmount = consumedEnergy.multiply(flatElectricityPrice);
// 更新退款金额 = 支付金额 - 优惠后总消费金额 // 更新退款金额 = 支付金额 - 优惠后总消费金额
BigDecimal refundAmount = orderBasicInfo.getPayAmount().subtract(consumeAmount).setScale(2, RoundingMode.DOWN); refundAmount = orderBasicInfo.getPayAmount().subtract(consumeAmount).setScale(2, RoundingMode.DOWN);
orderBasicInfo.setRefundAmount(refundAmount); }
// 结算金额 = 支付金额 - 退款金额
BigDecimal settleAmount = orderBasicInfo.getPayAmount().subtract(refundAmount).setScale(2, RoundingMode.DOWN);
orderBasicInfo.setRefundAmount(refundAmount);
orderBasicInfo.setSettleAmount(settleAmount);
} }
/** /**