From fa7ac16021db8d9a6a5bc214f50600420876325e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:57:41 +0800
Subject: [PATCH] jtt808初始化
---
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 41abf6d..de6b416 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()));
@@ -243,6 +245,7 @@
,"sum(total) as total"
,"sum(sum_refund_cmms_amt) as sum_refund_cmms_amt"
,"sum(bike_fee) as bike_fee"
+ ,"sum(discount_fee) as discount_fee"
);
WxBill bill = wxBillMapper.selectOne(param.last("limit 1"));
if(bill == null){
@@ -461,7 +464,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