From 11acaaf1e2e5e71dff57a788fb26b263bcd117b7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 89 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 39 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 22f1e35..2d0a858 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
@@ -37,6 +37,7 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -77,6 +78,8 @@
}
}
ChargingBillVO chargingBillVO = new ChargingBillVO();
+ List<TChargingOrder> exports = new ArrayList<>();
+
String startTime1 = null;
String startTime2 = null;
if (StringUtils.hasLength(dto.getStartTime())){
@@ -91,6 +94,7 @@
chargingBillVO.setOrderCount(list1.size());
BigDecimal paymentAmountTotal = new BigDecimal("0");
BigDecimal orderAmountTotal = new BigDecimal("0");
+ BigDecimal refundAmountTotal = new BigDecimal("0");
BigDecimal electrovalenceTotal = new BigDecimal("0");
BigDecimal serviceChargeTotal = new BigDecimal("0");
BigDecimal commissionAmountTotal = new BigDecimal("0");
@@ -100,6 +104,9 @@
BigDecimal refundAmount = new BigDecimal("0");
int orderCount = 0;
for (ChargingBillListVO chargingBillListVO : list) {
+ if (chargingBillListVO.getType()==2){
+ continue;
+ }
String temp = "";
String temp1 = "";
switch (chargingBillListVO.getType()){
@@ -169,6 +176,16 @@
if (data1!=null && data2!=null){
tChargingOrder.setTerminalName(data1.getName()+data2.getName());
tChargingOrder.setTerminalCode(data2.getCode());
+ }
+ if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==1){
+ chargingBillListVO.setPayTypeName("微信商户");
+ }
+ if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==2){
+ if (StringUtils.hasLength(chargingBillListVO.getPayTypeName())){
+ chargingBillListVO.setPayTypeName("微信商户+支付宝商户");
+ }else{
+ chargingBillListVO.setPayTypeName("支付宝商户");
+ }
}
tChargingOrder.setOrderClassification1("线上订单");
tChargingOrder.setRechargePaymentType1("预付");
@@ -248,11 +265,11 @@
}
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
- // 累加实收金额
- if (tChargingOrder.getOrderAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount());
+ // 累加实收金额 支付结算金额
+ if (tChargingOrder.getChargeAmount()!=null){
+ paymentAmount = paymentAmount.add(tChargingOrder.getChargeAmount());
}
- // 累加订单金额
+ // 总金额
if (tChargingOrder.getOrderAmount()!=null){
orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
}
@@ -263,7 +280,9 @@
List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2)
.eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).list();
for (TChargingOrderRefund tChargingOrderRefund : list2) {
- refundAmount = refundAmount.add(tChargingOrderRefund.getRefundAmount());
+ if (tChargingOrderRefund.getRefundStatus()==2){
+ refundAmount = refundAmount.add(tChargingOrderRefund.getRefundTotalAmount());
+ }
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -271,7 +290,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){
@@ -283,6 +302,7 @@
}
}
+ exports.addAll(tChargingOrders);
// 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
int hours = chargingSecond / 3600;
int minutes = (chargingSecond % 3600) / 60;
@@ -294,18 +314,17 @@
chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
}
- chargingBillVO.setOrderAmount(chargingBillVO.getPaymentAmount().subtract(chargingBillVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillVO.getRefundAmount())
- .subtract(chargingBillVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillVO.getCommissionAmount())
- .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.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.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2, RoundingMode.HALF_DOWN));
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())
+ chargingBillListVO.setBillMoney(chargingBillListVO.getPaymentAmount().subtract(chargingBillListVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillListVO.getRefundAmount()
+ .subtract(commissionAmount).subtract(sharingAmount))
.subtract(chargingBillListVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillListVO.getCommissionAmount())
.subtract(chargingBillListVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillListVO.getSharingAmount()));
switch (chargingBillListVO.getType()){
@@ -358,12 +377,10 @@
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
-
- }else if (tChargingOrder.getPaymentAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
+ if (tChargingOrder.getOrderAmount()!=null){
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getChargeAmount());
}
+
// 累加订单金额
if (tChargingOrder.getOrderAmount()!=null){
orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
@@ -372,8 +389,10 @@
if (tChargingOrder.getElectrovalence()!=null){
electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
}
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus()!=null&& tChargingOrder.getRefundStatus()==2){
- refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
+ List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId())
+ .eq(TChargingOrderRefund::getRefundStatus, 2).list();
+ for (TChargingOrderRefund tChargingOrderRefund : list2) {
+ refundAmountTotal =refundAmountTotal.add(tChargingOrderRefund.getRefundAmount());
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -403,14 +422,14 @@
}
chargingBillVO.setChargingCapacity(chargingCapacityTotal);
chargingBillVO.setPaymentAmount(paymentAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setOrderAmount(orderAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setOrderAmount(paymentAmountTotal.subtract(refundAmountTotal).subtract(commissionAmountTotal).subtract(sharingAmountTotal));
chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setOrderCount(orderCount);
chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setDiscount(discountTotal);
-
+ chargingBillVO.setRefundAmount(refundAmountTotal);
pageInfo.setRecords(list);
chargingBillVO.setList(pageInfo);
@@ -573,8 +592,8 @@
tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");
UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
if (data5!=null){
- if (data5.getTime_remaining()!=null){
- chargingSecond+=data5.getTime_remaining()*60;
+ if (data5.getCumulative_charging_time()!=null){
+ chargingSecond+=data5.getCumulative_charging_time()*60;
}
Integer cumulativeChargingTime = data5.getCumulative_charging_time();
// 将其转化为xx小时xx分钟xx秒显示 如果是0小时则不展示小时 如果是0分钟则不展示分钟
@@ -606,16 +625,12 @@
}
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
- // 累加实收金额 支付金额减去退款金额
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
-
- }else if (tChargingOrder.getPaymentAmount()!=null){
+ if ( tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}
- // 累加订单金额
+ // 总金额
if (tChargingOrder.getOrderAmount()!=null){
- orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
+ orderAmount = orderAmount.add(tChargingOrder.getPaymentAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -717,18 +732,14 @@
chargingBillListVO.setOrderCount(tChargingOrders.size());
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 累加实收金额 支付金额减去退款金额
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
-
- }else if (tChargingOrder.getPaymentAmount()!=null){
+ if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}
// 累加订单金额
if (tChargingOrder.getOrderAmount()!=null){
- orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
- orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
+ orderAmount = orderAmount.add(tChargingOrder.getPaymentAmount());
+ orderAmountTotal = orderAmountTotal.add(tChargingOrder.getPaymentAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -768,7 +779,7 @@
}
}
chargingBillVO.setChargingCapacity(chargingCapacityTotal);
- chargingBillVO.setPaymentAmount(paymentAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setPaymentAmount(orderAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal).setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setOrderAmount(orderAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, RoundingMode.HALF_DOWN));
--
Gitblit v1.7.1