From 6b82b8a598226a3e0bd2ef57a6f2282bd135d709 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 13:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index 2d0a858..41e754d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -104,9 +104,7 @@
BigDecimal refundAmount = new BigDecimal("0");
int orderCount = 0;
for (ChargingBillListVO chargingBillListVO : list) {
- if (chargingBillListVO.getType()==2){
- continue;
- }
+
String temp = "";
String temp1 = "";
switch (chargingBillListVO.getType()){
@@ -314,9 +312,8 @@
chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
}
- chargingBillListVO.setOrderAmount(chargingBillVO.getPaymentAmount().subtract(chargingBillVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillVO.getRefundAmount()));
chargingBillListVO.setPaymentAmount(paymentAmount);
- chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount));
+ chargingBillListVO.setOrderAmount(paymentAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount));
chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
@@ -324,7 +321,7 @@
chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
chargingBillListVO.setBillMoney(chargingBillListVO.getPaymentAmount().subtract(chargingBillListVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillListVO.getRefundAmount()
- .subtract(commissionAmount).subtract(sharingAmount))
+ .subtract(commissionAmount).subtract(sharingAmount).setScale(2, RoundingMode.HALF_DOWN))
.subtract(chargingBillListVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillListVO.getCommissionAmount())
.subtract(chargingBillListVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillListVO.getSharingAmount()));
switch (chargingBillListVO.getType()){
@@ -344,6 +341,9 @@
chargingBillListVO.setChargingSecond(chargingSecond);
}
for (ChargingBillListVO chargingBillListVO : list1) {
+ if (chargingBillListVO.getType()==2){
+ continue;
+ }
LocalDateTime billTime = chargingBillListVO.getBillTime();
// 将其转化为yyyy-MM格式字符串
chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -400,7 +400,7 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -645,7 +645,7 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getOrderAmount().multiply(BigDecimal.valueOf(0.006)));
+ commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006)));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -664,7 +664,7 @@
String timeString = String.format("%d小时%d分钟%d秒", hours, minutes, seconds);
chargingBillVO.setChargingTime(timeString);
- chargingBillListVO.setPaymentAmount(paymentAmount);
+ chargingBillListVO.setPaymentAmount(orderAmount.subtract(commissionAmount).subtract(sharingAmount).setScale(2,RoundingMode.HALF_DOWN));
chargingBillListVO.setOrderAmount(orderAmount);
chargingBillListVO.setElectrovalence(electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,RoundingMode.HALF_DOWN));
@@ -756,8 +756,8 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
+ commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
--
Gitblit v1.7.1