From d2230c638cc57b7dc4fa4570e79cbc93107926b0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 15:44:38 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 0df619b..6288179 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
@@ -73,18 +73,13 @@
public R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto) {
AccountListVO accountListVO = new AccountListVO();
ChargingBillVO res = chargingBillService.chargingBillList1(dto);
-
- ChargingBillVO res1 = chargingBillService.chargingBillList1(dto);
- List<ChargingBillListVO> records = res1.getList().getRecords();
+ List<ChargingBillListVO> records = res.getList().getRecords();
accountListVO.setBillCount(records.size());
- 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());
- accountListVO.setSharingAmount(res1.getSharingAmount());
+ accountListVO.setTotalAmount(res.getOrderAmount());
+ accountListVO.setPaymentAmount(res.getPaymentAmount());
+ accountListVO.setRefundAmount(res.getRefundAmount());
+ accountListVO.setCommissionAmount(res.getCommissionAmount());
+ accountListVO.setSharingAmount(res.getSharingAmount());
accountListVO.setList(res.getList());
return R.ok(accountListVO);
}
@@ -167,7 +162,7 @@
}
}
@ApiOperation(value = "导出", tags = {"管理后台-账户结算账单"})
- @PostMapping("/exportAccount")
+ @PutMapping("/exportAccount")
public void exportAccount(@RequestBody ChargingListQuery dto)
{
ChargingBillVO res = chargingBillService.chargingBillList1(dto);
@@ -176,7 +171,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