From 97f0349543ba83e6cdf69d99328f811bee40102e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 05 三月 2025 14:46:07 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 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 6c372d7..9b398f4 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
@@ -128,6 +128,7 @@
bill3.setSumRefundCmmsAmt(Constants.formatDecimalNum(bill.getSumRefundCmmsAmt()).add(Constants.formatDecimalNum(bill.getSumCmmsAmt())));//鎵嬬画璐�
bill3.setSumRefundFee(bill.getSumRefundFee());//閫�娆鹃噾棰�
bill3.setTotal(bill.getTotal());
+ bill3.setBikeFee(bill.getBikeFee());
QueryWrapper<WxBillDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().ge(param.getStartDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getStartDate()));
@@ -334,7 +335,22 @@
// bill.setBikeFee(bill.getSumSuccessFee().subtract(bill.getSumRefundFee()));
wxBillMapper.insert(bill);
if(detailList.size()>0){
- wxBillDetailMapper.insertBatch(detailList);
+ int sublistSize = 500;
+ int startIndex = 0;
+ int endIndex = sublistSize;
+ while (startIndex < detailList.size()) {
+ if (endIndex > detailList.size()) {
+ endIndex = detailList.size();
+ }
+
+ List<WxBillDetail> sublist = detailList.subList(startIndex, endIndex);
+ if(sublist.size()>0){
+// wxBillDetailMapper.insertBatch(sublist);
+ wxBillDetailMapper.insert(sublist);
+ }
+ startIndex = endIndex;
+ endIndex += sublistSize;
+ }
}
}
@@ -410,19 +426,18 @@
detail.setRefundSuccessDate(DateUtil.getDateFromString2(info.getRefundSuccessTime()));//鎴愬姛閫�娆炬椂闂�
detail.setRefundApplyDate(DateUtil.getDateFromString2(info.getRefundTime())); //鐢宠閫�娆炬椂闂�
//璁＄畻鑷杞︽敹鍏ワ紝鍖归厤鏉ヨ嚜鑷杞﹀皬绋嬪簭鐨勬墍鏈夋敮浠樻垚鍔熷拰閫�娆炬垚鍔熺殑閲戦锛屼綔涓鸿嚜琛岃溅鏀跺叆锛堢疮璁℃敹娆鹃噾棰�-绱閫�娆炬垚鍔熼噾棰濓級
- if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayV2Service.getConfig().getAppId())){
+ if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayV2Service.getConfig().getSubAppId())){
//鑷杞︽敹鍏ョ疮璁℃敹娆鹃噾棰�(鏀粯鎴愬姛鎬婚噾棰�-閫�娆炬�婚噾棰濓級
if(StringUtils.equals(info.getTradeState(),"SUCCESS")){
- //濡傛灉鏄氦鏄�
+ //濡傛灉鏄氦鏄擄紙鍖呭惈鎵嬬画璐癸級
bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee()));
- bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
+// bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
}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()) );
+// bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
}
}
-
detailList.add(detail);
}
}
--
Gitblit v1.9.3