From 18cd4250afb0e64e6f989a3cc072e76dd6c2abf9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:27:36 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 e44bb5a..4e17355 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
@@ -77,7 +77,10 @@
ChargingBillVO res1 = chargingBillService.chargingBillList1(dto);
List<ChargingBillListVO> records = res1.getList().getRecords();
accountListVO.setBillCount(records.size());
- accountListVO.setTotalAmount(res1.getPaymentAmount().subtract(res1.getRefundAmount()).subtract(res1.getCommissionAmount()).subtract(res1.getSharingAmount()));
+ accountListVO.setTotalAmount(
+ res1.getPaymentAmount().subtract(res1.getRefundAmount()==null?BigDecimal.ZERO:res1.getRefundAmount())
+ .subtract(res1.getCommissionAmount()==null?BigDecimal.ZERO:res1.getCommissionAmount())
+ .subtract(res1.getSharingAmount()==null?BigDecimal.ZERO:res1.getSharingAmount()));
accountListVO.setPaymentAmount(res1.getPaymentAmount());
accountListVO.setRefundAmount(res1.getRefundAmount());
accountListVO.setCommissionAmount(res1.getCommissionAmount());
@@ -173,7 +176,7 @@
for (ChargingBillListVO orderInvoiceVO : list) {
TChargingBillExport tChargingBillExport = new TChargingBillExport();
tChargingBillExport.setCode(orderInvoiceVO.getCode());
- switch (orderInvoiceVO.getTimeType()){
+ switch (orderInvoiceVO.getOrderState()){
case 1:
tChargingBillExport.setBillType("日账单");
break;
--
Gitblit v1.7.1