From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商
---
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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..c0032c1 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
@@ -132,7 +132,7 @@
QueryWrapper<WxBillDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().ge(param.getStartDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getStartDate()));
queryWrapper.lambda().le(param.getEndDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getEndDate()));
- queryWrapper.lambda().ne(WxBillDetail::getAppid, WxMiniConfig.wxPayService.getConfig().getAppId());//闈炶嚜琛岃溅鏀跺叆缁熻
+ queryWrapper.lambda().ne(WxBillDetail::getAppid, WxMiniConfig.wxPayV2Service.getConfig().getSubAppId());//闈炶嚜琛岃溅鏀跺叆缁熻
queryWrapper.lambda().groupBy(WxBillDetail::getBillStatus);
queryWrapper.select( "count(id) as sum_bill"
,"sum(settlement_total_fee) as settlement_total_fee"
@@ -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()))));//閫�娆炬墜缁垂
}
}
//缁撶畻閲戦
@@ -279,9 +279,11 @@
// Date ydate = DateUtil.addDaysToDate(new Date(), -1);
request.setBillDate(billDate);
request.setBillType("SUCCESS");
+ request.setSubMchId(WxMiniConfig.wxProperties.getSubMchId());
+
WxPayBillResult response = null;
try {
- response = WxMiniConfig.wxPayService.downloadBill(request);
+ response = WxMiniConfig.wxPayV2Service.downloadBill(request);
}catch (WxPayException e){
}
@@ -289,7 +291,7 @@
//璇锋眰閫�娆惧崟浜ゆ槗璁板綍姹囨�绘暟鎹�
WxPayBillResult responseRefund = null;
try {
- responseRefund = WxMiniConfig.wxPayService.downloadBill(request);
+ responseRefund = WxMiniConfig.wxPayV2Service.downloadBill(request);
}catch (WxPayException e){
}
@@ -370,7 +372,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;
}
@@ -408,19 +410,18 @@
detail.setRefundSuccessDate(DateUtil.getDateFromString2(info.getRefundSuccessTime()));//鎴愬姛閫�娆炬椂闂�
detail.setRefundApplyDate(DateUtil.getDateFromString2(info.getRefundTime())); //鐢宠閫�娆炬椂闂�
//璁＄畻鑷杞︽敹鍏ワ紝鍖归厤鏉ヨ嚜鑷杞﹀皬绋嬪簭鐨勬墍鏈夋敮浠樻垚鍔熷拰閫�娆炬垚鍔熺殑閲戦锛屼綔涓鸿嚜琛岃溅鏀跺叆锛堢疮璁℃敹娆鹃噾棰�-绱閫�娆炬垚鍔熼噾棰濓級
- if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayService.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()) );
- }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()) );
}
}
-
detailList.add(detail);
}
}
--
Gitblit v1.9.3