From 9088209cdd7e3158d2a04caae05e6726ba3b3ad6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 十二月 2023 18:26:17 +0800
Subject: [PATCH] Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkBike into devPartner
---
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 0ffaba6..85883e9 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().getAppId());//闈炶嚜琛岃溅鏀跺叆缁熻
queryWrapper.lambda().groupBy(WxBillDetail::getBillStatus);
queryWrapper.select( "count(id) as sum_bill"
,"sum(settlement_total_fee) as settlement_total_fee"
@@ -281,7 +281,7 @@
request.setBillType("SUCCESS");
WxPayBillResult response = null;
try {
- response = WxMiniConfig.wxPayService.downloadBill(request);
+ response = WxMiniConfig.wxPayV2Service.downloadBill(request);
}catch (WxPayException e){
}
@@ -289,7 +289,7 @@
//璇锋眰閫�娆惧崟浜ゆ槗璁板綍姹囨�绘暟鎹�
WxPayBillResult responseRefund = null;
try {
- responseRefund = WxMiniConfig.wxPayService.downloadBill(request);
+ responseRefund = WxMiniConfig.wxPayV2Service.downloadBill(request);
}catch (WxPayException e){
}
@@ -408,7 +408,7 @@
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().getAppId())){
//鑷杞︽敹鍏ョ疮璁℃敹娆鹃噾棰�(鏀粯鎴愬姛鎬婚噾棰�-閫�娆炬�婚噾棰濓級
if(StringUtils.equals(info.getTradeState(),"SUCCESS")){
//濡傛灉鏄氦鏄�
--
Gitblit v1.9.3