From d039f7c8ce54963b3513293dc923771971f16a72 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 29 四月 2026 19:47:40 +0800
Subject: [PATCH] feat:冒烟修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index f76a621..6a706f7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -172,6 +172,9 @@
}
}
+ tChargingOrderExport.setPaymentMethod(getPaymentMethod(chargingOrderListVO));
+ tChargingOrderExport.setCashPayAmount(formatMoney(getCashPayAmount(chargingOrderListVO)));
+ tChargingOrderExport.setBalancePayAmount(formatMoney(getBalancePayAmount(chargingOrderListVO)));
if (chargingOrderListVO.getCreateTime()!=null){
String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
tChargingOrderExport.setCreateTime(s1);
@@ -218,7 +221,6 @@
tChargingOrderExport.setServiceChargePrice("");
tChargingOrderExport.setServiceChargePriceLook("");
tChargingOrderExport.setCumulativeChargingTime(chargingOrderListVO.getChargingSecond() + "");
- tChargingOrderExport.setRechargeAmount(chargingOrderListVO.getRechargeAmount().toString());
tChargingOrderExport.setRefundAmount(null != chargingOrderListVO.getRefundAmount() ? chargingOrderListVO.getRefundAmount().toString() : "");
tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc());
tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc());
@@ -283,6 +285,59 @@
e.printStackTrace();
}
}
+ }
+
+ private String getPaymentMethod(ChargingOrderListVO chargingOrderListVO) {
+ Integer payMethod = chargingOrderListVO.getPayMethod();
+ String thirdPayName = getThirdPayName(chargingOrderListVO.getRechargePaymentType());
+ if (Integer.valueOf(1).equals(payMethod)) {
+ return "余额支付";
+ }
+ if (Integer.valueOf(2).equals(payMethod)) {
+ return thirdPayName.isEmpty() ? "余额支付" : "余额支付+" + thirdPayName;
+ }
+ if (Integer.valueOf(3).equals(payMethod)) {
+ return thirdPayName;
+ }
+ return thirdPayName;
+ }
+
+ private String getThirdPayName(Integer rechargePaymentType) {
+ if (Integer.valueOf(1).equals(rechargePaymentType)) {
+ return "微信支付";
+ }
+ if (Integer.valueOf(2).equals(rechargePaymentType) || Integer.valueOf(3).equals(rechargePaymentType)) {
+ return "支付宝支付";
+ }
+ return "";
+ }
+
+ private BigDecimal getCashPayAmount(ChargingOrderListVO chargingOrderListVO) {
+ if (chargingOrderListVO.getThirdPayAmount() != null) {
+ return chargingOrderListVO.getThirdPayAmount();
+ }
+ if (Integer.valueOf(3).equals(chargingOrderListVO.getPayMethod())) {
+ return nullToZero(chargingOrderListVO.getPaymentAmount());
+ }
+ return BigDecimal.ZERO;
+ }
+
+ private BigDecimal getBalancePayAmount(ChargingOrderListVO chargingOrderListVO) {
+ if (chargingOrderListVO.getBalancePayAmount() != null) {
+ return chargingOrderListVO.getBalancePayAmount();
+ }
+ if (Integer.valueOf(1).equals(chargingOrderListVO.getPayMethod())) {
+ return nullToZero(chargingOrderListVO.getPaymentAmount());
+ }
+ return BigDecimal.ZERO;
+ }
+
+ private BigDecimal nullToZero(BigDecimal amount) {
+ return amount == null ? BigDecimal.ZERO : amount;
+ }
+
+ private String formatMoney(BigDecimal amount) {
+ return nullToZero(amount).setScale(2, RoundingMode.HALF_UP).toPlainString();
}
@@ -356,4 +411,3 @@
}
}
-
--
Gitblit v1.7.1