From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 5542746..0ffaba6 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
@@ -144,14 +144,14 @@
for(WxBillDetail detail : detailList){
if(StringUtils.equals(detail.getBillStatus(), "SUCCESS")){
//瀹炴敹鏁版嵁
- bill4.setSumBill(detail.getSumBill());//浜ゆ槗绗旀暟
+ bill4.setSumBill( detail.getSumBill());//浜ゆ槗绗旀暟
bill4.setSumSuccessFee(Constants.formatDecimalNum(detail.getSettlementTotalFee()));//浜ゆ槗閲戦
bill4.setSumCmmsAmt(Constants.formatDecimalNum(detail.getCmmsAmt()));//浜ゆ槗鎵嬬画璐�
- } else if(StringUtils.equals(detail.getBillStatus(), "REFUND")){
+ } else if(StringUtils.equals(detail.getBillStatus(), "REFUND") || StringUtils.equals(detail.getBillStatus(), "REVOKED")){
//閫�娆炬暟鎹�
- bill4.setSumRefundBill(detail.getSumBill());//閫�娆剧瑪鏁�
- bill4.setSumRefundFee(detail.getRefundFee());
- bill4.setSumRefundCmmsAmt(Constants.formatDecimalNum(detail.getCmmsAmt()));//閫�娆炬墜缁垂
+ bill4.setSumRefundBill(Constants.formatIntegerNum(bill4.getSumRefundBill())+detail.getSumBill());//閫�娆剧瑪鏁�
+ bill4.setSumRefundFee(Constants.formatDecimalNum(bill4.getSumRefundFee()).add(Constants.formatDecimalNum(detail.getRefundFee())));
+ bill4.setSumRefundCmmsAmt(Constants.formatDecimalNum(bill4.getSumRefundCmmsAmt()).add(Constants.formatDecimalNum(Constants.formatDecimalNum(detail.getCmmsAmt()))));//閫�娆炬墜缁垂
}
}
//缁撶畻閲戦
@@ -370,7 +370,7 @@
if(billInfoList!=null){
for (int i = 0; i <billInfoList.size(); i++) {
WxPayBillInfo info =billInfoList.get(i);
- if(StringUtils.equals(info.getTradeType(),"REFUND" ) && !StringUtils.equals(info.getRefundState(),"SUCCESS" )){
+ if((StringUtils.equals(info.getTradeType(),"REFUND" )||StringUtils.equals(info.getTradeType(),"REVOKED" )) && !StringUtils.equals(info.getRefundState(),"SUCCESS" )){
//濡傛灉鏄潪鎴愬姛鐨勯��娆炬暟鎹紝涓嶈繘琛屽悓姝�
continue;
}
@@ -414,7 +414,7 @@
//濡傛灉鏄氦鏄�
bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee()));
bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
- }else if(StringUtils.equals(info.getTradeState(),"REFUND" )){
+ }else if(StringUtils.equals(info.getTradeState(),"REFUND" ) || StringUtils.equals(info.getTradeState(),"REVOKED" )){
//濡傛灉閫�娆炬垚鍔燂紝鎵ｉ櫎閫�娆鹃噾棰�
bill.setBikeFee(bill.getBikeFee().subtract(detail.getRefundFee()) );
bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
--
Gitblit v1.9.3