From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
index 5715b41..36c5cdf 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -116,6 +116,7 @@
bill1.setSumTotalFee(bill.getSumTotalFee());//浜ゆ槗閲戦
bill1.setSumCmmsAmt(bill.getSumCmmsAmt());//浜ゆ槗鎵嬬画璐�
bill1.setSumSuccessFee(bill.getSumSuccessFee());//鎴愬姛浜ゆ槗閲戦
+ bill1.setDiscountFee(bill.getDiscountFee());//鎴愬姛浜ゆ槗閲戦
WxBill bill2 = initBillData();//璁板綍閫�娆剧粺璁℃暟鎹�
bill2.setSumRefundBill(bill.getSumRefundBill());//閫�娆剧瑪鏁�
@@ -132,6 +133,7 @@
bill3.setSumRefundFee(bill.getSumRefundFee());//閫�娆鹃噾棰�
bill3.setTotal(bill.getTotal());
bill3.setBikeFee(bill.getBikeFee());
+ bill3.setDiscountFee(bill.getDiscountFee());//鎴愬姛浜ゆ槗閲戦
QueryWrapper<WxBillDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().ge(param.getStartDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getStartDate()));
@@ -271,6 +273,7 @@
bill.setDiscountRefundFee(new BigDecimal(0.00));
bill.setDiscountRefundCmmsAmt(new BigDecimal(0.00));
bill.setBikeRefundCmmsAmt(new BigDecimal(0.00));
+ bill.setDiscountFee(new BigDecimal(0.00));
return bill;
}
@Override
@@ -462,7 +465,7 @@
bill.setDiscountFee(bill.getDiscountFee().subtract(detail.getRefundFee()) );
bill.setDiscountRefundFee(bill.getDiscountRefundFee().add(detail.getRefundFee()) );
bill.setDiscountRefundCmmsAmt(bill.getDiscountRefundCmmsAmt().add(detail.getCmmsAmt()) );
-// bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
+// bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
}
}
}
--
Gitblit v1.9.3