Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复按日下载提现异常文件接口响应异常 #3154

Merged
merged 1 commit into from
Nov 7, 2023
Merged

修复按日下载提现异常文件接口响应异常 #3154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayrollService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.binarywang.wxpay.service;

import com.github.binarywang.wxpay.bean.marketing.payroll.*;
import com.github.binarywang.wxpay.bean.result.WxPayApplyBillV3Result;
import com.github.binarywang.wxpay.exception.WxPayException;

/**
Expand Down Expand Up @@ -98,6 +99,6 @@ public interface PayrollService {
* @return 返回数据
* @throws WxPayException the wx pay exception
*/
PreOrderWithAuthResult merchantFundWithdrawBillType(String billType, String billDate) throws WxPayException;
WxPayApplyBillV3Result merchantFundWithdrawBillType(String billType, String billDate, String tarType) throws WxPayException;

}
8 changes: 6 additions & 2 deletions ...n-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.binarywang.wxpay.service.impl;

import com.github.binarywang.wxpay.bean.marketing.payroll.*;
import com.github.binarywang.wxpay.bean.result.WxPayApplyBillV3Result;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.PayrollService;
import com.github.binarywang.wxpay.service.WxPayService;
Expand Down Expand Up @@ -182,11 +183,14 @@ public PreOrderWithAuthResult payrollCardPreOrderWithAuth(PreOrderWithAuthReques
* @throws WxPayException the wx pay exception
*/
@Override
public PreOrderWithAuthResult merchantFundWithdrawBillType(String billType, String billDate) throws WxPayException {
public WxPayApplyBillV3Result merchantFundWithdrawBillType(String billType, String billDate, String tarType) throws WxPayException {
String url = String.format("%s/v3/merchant/fund/withdraw/bill-type/%s", payService.getPayBaseUrl(), billType);
String query = String.format("?bill_date=%s", billDate);
if (StringUtils.isNotBlank(tarType)) {
query += String.format("&tar_type=%s", tarType);
}
String response = payService.getV3(url + query);
return GSON.fromJson(response, PreOrderWithAuthResult.class);
return GSON.fromJson(response, WxPayApplyBillV3Result.class);
}

}
6 changes: 3 additions & 3 deletions ...va-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.github.binarywang.wxpay.bean.marketing.payroll.*;
import com.github.binarywang.wxpay.bean.marketing.transfer.PartnerTransferRequest;
import com.github.binarywang.wxpay.bean.marketing.transfer.PartnerTransferResult;
import com.github.binarywang.wxpay.bean.result.WxPayApplyBillV3Result;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import com.github.binarywang.wxpay.testbase.ApiTestModule;
Expand Down Expand Up @@ -120,9 +121,8 @@ public void payrollCardPreOrderWithAuth() throws WxPayException {
public void merchantFundWithdrawBillType() throws WxPayException {
String billType = "NO_SUCC";
String billDate = "2019-08-17";
PreOrderWithAuthResult preOrderWithAuthResult = wxPayService.getPayrollService().merchantFundWithdrawBillType(billType, billDate);
log.info(preOrderWithAuthResult.toString());

WxPayApplyBillV3Result result = wxPayService.getPayrollService().merchantFundWithdrawBillType(billType, billDate, null);
log.info(result.toString());
}

}