From 9dc7bcc2a92f5b4143bbc814ace40bafb386a949 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 07 一月 2025 19:00:03 +0800
Subject: [PATCH] 修改故障短信
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
index fefdb02..7f68ade 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -75,12 +75,13 @@
List<ChargingBillListVO> records = res.getList().getRecords();
accountListVO.setBillCount(records.size());
accountListVO.setTotalAmount(res.getPaymentAmount().subtract(res.getRefundAmount())
- .subtract(res.getCommissionAmount()).subtract(res.getSharingAmount()));
- accountListVO.setPaymentAmount(res.getPaymentAmount());
- accountListVO.setRefundAmount(res.getRefundAmount());
- accountListVO.setCommissionAmount(res.getCommissionAmount());
- accountListVO.setSharingAmount(res.getSharingAmount());
+ .subtract(res.getCommissionAmount().setScale(2,BigDecimal.ROUND_DOWN)).subtract(res.getSharingAmount()).setScale(2, BigDecimal.ROUND_DOWN));
+ accountListVO.setPaymentAmount(res.getPaymentAmount().setScale(2, BigDecimal.ROUND_DOWN));
+ accountListVO.setRefundAmount(res.getRefundAmount().setScale(2, BigDecimal.ROUND_DOWN));
+ accountListVO.setCommissionAmount(res.getCommissionAmount().setScale(2, BigDecimal.ROUND_DOWN));
+ accountListVO.setSharingAmount(res.getSharingAmount().setScale(2, BigDecimal.ROUND_DOWN));
accountListVO.setList(res.getList());
+ accountListVO.setOrderList(res.getExportList());
return R.ok(accountListVO);
}
@PostMapping(value = "/chargingBillList")
@@ -285,15 +286,18 @@
}
BigDecimal paymentAmount = new BigDecimal("0");
BigDecimal refundAmount = new BigDecimal("0");
+ BigDecimal commissionAmount = new BigDecimal("0");
List<TChargingOrder> tChargingOrders = chargingOrderService.list(eq);
// 累加支付金额
BigDecimal bigDecimal = new BigDecimal("0");
+ BigDecimal bigDecimal1 = new BigDecimal("0.006");
+
int i =1;
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 账单信息
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
-
+ paymentAmount = paymentAmount.add(tChargingOrder.getChargeAmount());
+ commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(bigDecimal1));
// 退款信息
ChargingBillRefundExport chargingBillRefundExport = new ChargingBillRefundExport();
ChargingBillPayExport chargingBillPayExport = new ChargingBillPayExport();
@@ -337,11 +341,11 @@
chargingBillPayExport.setRechargeSerialNumber(tChargingOrder.getRechargeSerialNumber());
chargingBillPayExport.setCode(tChargingOrder.getCode());
chargingBillPayExport.setPayTime(tChargingOrder.getPayTime()!=null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(tChargingOrder.getPayTime())):"");
- chargingBillPayExport.setPaymentAmount(tChargingOrder.getOrderAmount().toString());
+ chargingBillPayExport.setPaymentAmount(tChargingOrder.getChargeAmount().toString());
chargingBillPayExport.setTotal("");
chargingBillPayExports.add(chargingBillPayExport);
i++;
- bigDecimal = bigDecimal.add(tChargingOrder.getOrderAmount());
+ bigDecimal = bigDecimal.add(tChargingOrder.getChargeAmount());
}
if (!chargingBillPayExports.isEmpty()){
chargingBillPayExports.get(0).setTotal(bigDecimal+"");
@@ -357,7 +361,7 @@
}
chargingBillExport.setPaymentAmount(paymentAmount);
chargingBillExport.setRefundAmount(refundAmount);
- chargingBillExport.setIncome(paymentAmount.subtract(refundAmount));
+ chargingBillExport.setIncome(paymentAmount.subtract(refundAmount).subtract(commissionAmount).setScale(2, BigDecimal.ROUND_DOWN));
chargingBillExports.add(chargingBillExport);
// 导出
List<Map<String, Object>> sheetsList = new ArrayList<>();
--
Gitblit v1.7.1