diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayrollService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayrollService.java index 3cd2fe921b..b3f788815c 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayrollService.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayrollService.java @@ -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; /** @@ -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; } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImpl.java index 5708e8579d..3d8c831271 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImpl.java @@ -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; @@ -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); } } diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImplTest.java index 2254bc6128..03bbc8c593 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImplTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayrollServiceImplTest.java @@ -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; @@ -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()); } }