From d86ddb98a3f8c7953810190ecc2df2a70a8c30c6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 02 十一月 2024 20:22:11 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 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 c1b037f..255389b 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
@@ -74,12 +74,14 @@
ChargingBillVO res = chargingBillService.chargingBillList1(dto);
List<ChargingBillListVO> records = res.getList().getRecords();
accountListVO.setBillCount(records.size());
- accountListVO.setTotalAmount(res.getOrderAmount());
- accountListVO.setPaymentAmount(res.getPaymentAmount());
- accountListVO.setRefundAmount(res.getRefundAmount());
- accountListVO.setCommissionAmount(res.getCommissionAmount());
- accountListVO.setSharingAmount(res.getSharingAmount());
+ accountListVO.setTotalAmount(res.getPaymentAmount().subtract(res.getRefundAmount())
+ .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")
@@ -245,14 +247,12 @@
chargingBillExport.setCode(byId.getCode());
chargingBillExport.setAccountType("微信商户");
chargingBillExport.setType(byId.getType().toString());
- chargingBillExport.setBillType("月账单");
LocalDateTime billTime = byId.getBillTime();
// 将billTime 减去一个月 转化为yyyy-MM格式字符串
billTime = billTime.minusMonths(1);
chargingBillExport.setBillWeek(DateUtils.parseDateToStr("yyyy-MM",DateUtils.toDate(billTime)));
chargingBillExport.setBillTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(billTime)));
- chargingBillExport.setState("未出账");
List<Site> data = siteClient.getSiteByIds(Arrays.asList(byId.getSiteId())).getData();
if (!data.isEmpty()){
chargingBillExport.setSiteName(data.get(0).getName());
@@ -294,9 +294,7 @@
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 账单信息
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
- if (tChargingOrder.getRefundStatus()!=null && tChargingOrder.getRefundStatus()==2){
- refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
- }
+
// 退款信息
ChargingBillRefundExport chargingBillRefundExport = new ChargingBillRefundExport();
ChargingBillPayExport chargingBillPayExport = new ChargingBillPayExport();
@@ -316,13 +314,17 @@
chargingBillPayExport.setPlatformPay("支付宝小程序支付");
}
- TChargingOrderRefund one = tChargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).one();
- if (one!=null){
- chargingBillRefundExport.setRechargeSerialNumber(one.getSerailNumber());
- chargingBillRefundExport.setCode(one.getCode());
- chargingBillRefundExport.setPayTime(tChargingOrder.getPayTime()!=null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(tChargingOrder.getPayTime())):"");
- if (tChargingOrder.getRefundTime()!=null){
- chargingBillRefundExport.setRefundTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(tChargingOrder.getRefundTime())));
+ List<TChargingOrderRefund> one1 = tChargingOrderRefundService.lambdaQuery()
+ .eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId())
+ .eq(TChargingOrderRefund::getRefundStatus, 2)
+ .list();
+ for (TChargingOrderRefund one : one1) {
+ refundAmount= refundAmount.add(one.getRefundAmount());
+ chargingBillRefundExport.setRechargeSerialNumber(tChargingOrder.getRechargeSerialNumber());
+ chargingBillRefundExport.setCode(tChargingOrder.getCode());
+ chargingBillRefundExport.setPayTime(tChargingOrder.getCreateTime()!=null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(tChargingOrder.getCreateTime())):"");
+ if (one.getRefundTime()!=null){
+ chargingBillRefundExport.setRefundTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(one.getRefundTime())));
}
chargingBillRefundExport.setRefundMoney(one.getRefundAmount().toString());
chargingBillRefundExport.setRefundRemark(one.getRefundReason());
@@ -330,12 +332,13 @@
chargingBillRefundExport.setRefundSerialNumber(one.getRefundSerialNumber());
chargingBillRefundExports.add(chargingBillRefundExport);
}
+
// 支付信息
chargingBillPayExport.setId(i+"");
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++;
@@ -352,13 +355,11 @@
String name = data1.get(0).getName();
chargingBillExport.setSiteName(name);
}
-
}
chargingBillExport.setPaymentAmount(paymentAmount);
chargingBillExport.setRefundAmount(refundAmount);
chargingBillExport.setIncome(paymentAmount.subtract(refundAmount));
chargingBillExports.add(chargingBillExport);
-
// 导出
List<Map<String, Object>> sheetsList = new ArrayList<>();
for (int i1 = 1; i1 <= 3; i1++) {
--
Gitblit v1.7.1