From c97b518d5fbb570817ca835e96c1b8aa49b099e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 19:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 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 4bd5a2e..3ce44cb 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
@@ -199,7 +199,7 @@
}
BigDecimal add = tChargingOrder.getElectrovalence().add(tChargingOrder.getServiceCharge());
tChargingOrder.setTotalAmount(add.toString());
- tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount().toString());
+ tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");
UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
if (data5!=null){
if (data5.getTime_remaining()!=null){
@@ -236,10 +236,7 @@
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付金额减去退款金额
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
-
- }else if (tChargingOrder.getPaymentAmount()!=null){
+ if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}
// 累加订单金额
@@ -250,7 +247,7 @@
if (tChargingOrder.getElectrovalence()!=null){
electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
}
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() == 2){
+ if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus()!=null && tChargingOrder.getRefundStatus()== 2){
refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
}
// 累加累计服务费
@@ -258,8 +255,9 @@
serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
}
// 累加平台手续费
- if (tChargingOrder.getCommissionAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());
+ if (tChargingOrder.getServiceCharge()!=null){
+ commissionAmount = commissionAmount.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.006))
+ .setScale(2,RoundingMode.HALF_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -287,6 +285,7 @@
.subtract(chargingBillVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillVO.getSharingAmount()));
chargingBillListVO.setPaymentAmount(paymentAmount == null?BigDecimal.ZERO:paymentAmount);
chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount);
+ chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:orderAmount);
chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount);
@@ -312,9 +311,6 @@
chargingBillListVO.setChargingSecond(chargingSecond);
}
for (ChargingBillListVO chargingBillListVO : list1) {
-
-
-
LocalDateTime billTime = chargingBillListVO.getBillTime();
// 将其转化为yyyy-MM格式字符串
chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -343,14 +339,6 @@
eq.eq("site_id", chargingBillListVO.getSiteId());
}
List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
- int chargingSecond = 0;
- BigDecimal paymentAmount = new BigDecimal("0");
- BigDecimal orderAmount = new BigDecimal("0");
- BigDecimal electrovalence = new BigDecimal("0");
- BigDecimal serviceCharge = new BigDecimal("0");
- BigDecimal commissionAmount = new BigDecimal("0");
- BigDecimal sharingAmount = new BigDecimal("0");
- BigDecimal chargingCapacity = new BigDecimal("0");
orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
@@ -358,7 +346,7 @@
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
@@ -589,7 +577,7 @@
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
@@ -610,8 +598,8 @@
serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
}
// 累加平台手续费
- if (tChargingOrder.getCommissionAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());
+ if (tChargingOrder.getServiceCharge()!=null){
+ commissionAmount = commissionAmount.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.006)).setScale(2,RoundingMode.HALF_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -633,7 +621,7 @@
chargingBillListVO.setPaymentAmount(paymentAmount);
chargingBillListVO.setOrderAmount(orderAmount);
chargingBillListVO.setElectrovalence(electrovalence);
- chargingBillListVO.setServiceCharge(serviceCharge);
+ chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,RoundingMode.HALF_DOWN));
chargingBillListVO.setCommissionAmount(commissionAmount);
chargingBillListVO.setSharingAmount(sharingAmount);
chargingBillListVO.setChargingCapacity(chargingCapacity);
@@ -696,8 +684,8 @@
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
--
Gitblit v1.7.1