Skip to content

Commit 0240fff

Browse files
committed
binarywang#392 微信支付增加企业付款到银行卡的相关接口
1 parent 34a974b commit 0240fff

10 files changed

Lines changed: 178 additions & 14 deletions

File tree

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.github.binarywang.wxpay.bean.entpay;
2+
3+
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
4+
import com.thoughtworks.xstream.annotations.XStreamAlias;
5+
import lombok.*;
6+
import me.chanjar.weixin.common.annotation.Required;
7+
import me.chanjar.weixin.common.util.ToStringUtils;
8+
9+
/**
10+
* <pre>
11+
* 企业付款到银行卡的请求对象
12+
* Created by Binary Wang on 2017/12/21.
13+
* </pre>
14+
*
15+
* @author <a href="https://github.com/binarywang">Binary Wang</a>
16+
*/
17+
@Data
18+
@EqualsAndHashCode(callSuper = true)
19+
@NoArgsConstructor
20+
@XStreamAlias("xml")
21+
public class EntPayBankQueryRequest extends EntPayQueryRequest {
22+
private static final long serialVersionUID = -479088843124447119L;
23+
24+
@Override
25+
protected boolean ignoreAppid() {
26+
return true;
27+
}
28+
}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
package com.github.binarywang.wxpay.bean.entpay;
2+
3+
import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
4+
import com.thoughtworks.xstream.annotations.XStreamAlias;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
7+
import lombok.NoArgsConstructor;
8+
9+
/**
10+
* <pre>
11+
* 企业付款到银行卡查询返回结果.
12+
* Created by Binary Wang on 2017/12/21.
13+
* </pre>
14+
*
15+
* @author <a href="https://github.com/binarywang">Binary Wang</a>
16+
*/
17+
@Data
18+
@EqualsAndHashCode(callSuper = true)
19+
@NoArgsConstructor
20+
@XStreamAlias("xml")
21+
public class EntPayBankQueryResult extends BaseWxPayResult {
22+
private static final long serialVersionUID = -8336631015989500746L;
23+
24+
/**
25+
* 商户企业付款单号
26+
*/
27+
@XStreamAlias("partner_trade_no")
28+
private String partnerTradeNo;
29+
30+
/**
31+
* 微信企业付款单号.
32+
* 即为微信内部业务单号
33+
*/
34+
@XStreamAlias("payment_no")
35+
private String paymentNo;
36+
37+
/**
38+
* 银行卡号.
39+
* 收款用户银行卡号(MD5加密)
40+
*/
41+
@XStreamAlias("bank_no_md5")
42+
private String bankNoMd5;
43+
44+
/**
45+
* 用户真实姓名.
46+
* 收款人真实姓名(MD5加密)
47+
*/
48+
@XStreamAlias("true_name_md5")
49+
private String trueNameMd5;
50+
51+
/**
52+
* 付款金额.
53+
*/
54+
@XStreamAlias("amount")
55+
private Integer amount;
56+
57+
/**
58+
* 代付单状态.
59+
* <pre>
60+
* PROCESSING(处理中,如有明确失败,则返回额外失败原因;否则没有错误原因)
61+
* SUCCESS(付款成功)
62+
* FAILED(付款失败)
63+
* BANK_FAIL(银行退票,订单状态由付款成功流转至退票,退票时付款金额和手续费会自动退还)
64+
* </pre>
65+
*/
66+
@XStreamAlias("status")
67+
private String status;
68+
69+
/**
70+
* 手续费金额
71+
*/
72+
@XStreamAlias("cmms_amt")
73+
private Integer cmmsAmount;
74+
75+
/**
76+
* 商户下单时间.
77+
* 微信侧订单创建时间
78+
*/
79+
@XStreamAlias("create_time")
80+
private String createTime;
81+
82+
/**
83+
* 成功付款时间.
84+
* 微信侧付款成功时间(但无法保证银行不会退票)
85+
*/
86+
@XStreamAlias("pay_succ_time")
87+
private String paySuccessTime;
88+
89+
/**
90+
* 失败原因.
91+
* 订单失败原因(如:余额不足)
92+
*/
93+
@XStreamAlias("reason")
94+
private String failReason;
95+
96+
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/**
1010
* <pre>
11-
* 企业付款到银行卡的响应结果
11+
* 企业付款到银行卡的响应结果.
1212
* Created by Binary Wang on 2017/12/21.
1313
* </pre>
1414
*
@@ -19,6 +19,8 @@
1919
@NoArgsConstructor
2020
@XStreamAlias("xml")
2121
public class EntPayBankResult extends BaseWxPayResult {
22+
private static final long serialVersionUID = 3449707749935227689L;
23+
2224
/**
2325
* 代付金额.
2426
*/

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryRequest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/**
1010
* <pre>
11-
* 企业付款请求对象
11+
* 企业付款请求对象.
1212
* Created by Binary Wang on 2016/10/19.
1313
* </pre>
1414
*
@@ -21,6 +21,8 @@
2121
@AllArgsConstructor
2222
@XStreamAlias("xml")
2323
public class EntPayQueryRequest extends BaseWxPayRequest {
24+
private static final long serialVersionUID = 1972288742207813985L;
25+
2426
/**
2527
* <pre>
2628
* 字段名:商户订单号.

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
@NoArgsConstructor
2020
@XStreamAlias("xml")
2121
public class EntPayQueryResult extends BaseWxPayResult {
22+
private static final long serialVersionUID = 3948485732447456947L;
2223

2324
/**
2425
* 商户订单号

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,23 @@
1212
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
1313
import org.apache.commons.lang3.StringUtils;
1414

15+
import java.io.Serializable;
1516
import java.math.BigDecimal;
1617

1718
import static com.github.binarywang.wxpay.constant.WxPayConstants.SignType.ALL_SIGN_TYPES;
1819

1920
/**
2021
* <pre>
21-
* Created by Binary Wang on 2016-10-24.
2222
* 微信支付请求对象共用的参数存放类
23+
* Created by Binary Wang on 2016-10-24.
2324
* </pre>
2425
*
2526
* @author <a href="https://github.com/binarywang">Binary Wang</a>
2627
*/
2728
@Data
28-
public abstract class BaseWxPayRequest {
29+
public abstract class BaseWxPayRequest implements Serializable {
30+
private static final long serialVersionUID = -4766915659779847060L;
31+
2932
/**
3033
* <pre>
3134
* 字段名:公众账号ID
@@ -117,7 +120,7 @@ public abstract class BaseWxPayRequest {
117120
*
118121
* @param yuan 将要转换的元的数值字符串
119122
*/
120-
public static Integer yuanToFee(String yuan) {
123+
public static Integer yuanToFen(String yuan) {
121124
return new BigDecimal(yuan).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).intValue();
122125
}
123126

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.github.binarywang.wxpay.exception.WxPayException;
44
import com.github.binarywang.wxpay.service.WxPayService;
5-
import com.github.binarywang.wxpay.service.impl.BaseWxPayServiceImpl;
65
import com.github.binarywang.wxpay.util.SignUtils;
76
import com.google.common.base.Joiner;
87
import com.google.common.collect.Lists;
@@ -26,20 +25,23 @@
2625
import javax.xml.xpath.XPathFactory;
2726
import java.io.ByteArrayInputStream;
2827
import java.io.IOException;
28+
import java.io.Serializable;
2929
import java.math.BigDecimal;
3030
import java.util.List;
3131
import java.util.Map;
3232

3333
/**
3434
* <pre>
35-
* 微信支付结果共用属性类
35+
* 微信支付结果共用属性类.
3636
* Created by Binary Wang on 2016-10-24.
3737
* </pre>
3838
*
3939
* @author <a href="https://github.com/binarywang">Binary Wang</a>
4040
*/
4141
@Data
42-
public abstract class BaseWxPayResult {
42+
public abstract class BaseWxPayResult implements Serializable {
43+
private static final long serialVersionUID = 2416778827989487412L;
44+
4345
/**
4446
* 返回状态码
4547
*/

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EntPayService.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,17 @@ public interface EntPayService {
6868
*
6969
* @param request 请求对象
7070
*/
71-
EntPayBankResult payToBankCard(EntPayBankRequest request) throws WxPayException;
71+
EntPayBankResult payBank(EntPayBankRequest request) throws WxPayException;
72+
73+
/**
74+
* 企业付款到银行卡查询.
75+
* <pre>
76+
* 用于对商户企业付款到银行卡操作进行结果查询,返回付款操作详细结果。
77+
* 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=24_3
78+
* 接口链接:https://api.mch.weixin.qq.com/mmpaysptrans/query_bank
79+
* </pre>
80+
*
81+
* @param partnerTradeNo 商户订单号
82+
*/
83+
EntPayBankQueryResult queryPayBank(String partnerTradeNo) throws WxPayException;
7284
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImpl.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public String getPublicKey() throws WxPayException {
7575
}
7676

7777
@Override
78-
public EntPayBankResult payToBankCard(EntPayBankRequest request) throws WxPayException {
78+
public EntPayBankResult payBank(EntPayBankRequest request) throws WxPayException {
7979
File publicKeyFile = this.buildPublicKeyFile();
8080
request.setEncBankNo(this.encryptRSA(publicKeyFile, request.getEncBankNo()));
8181
request.setEncTrueName(this.encryptRSA(publicKeyFile, request.getEncTrueName()));
@@ -90,6 +90,19 @@ public EntPayBankResult payToBankCard(EntPayBankRequest request) throws WxPayExc
9090
return result;
9191
}
9292

93+
@Override
94+
public EntPayBankQueryResult queryPayBank(String partnerTradeNo) throws WxPayException {
95+
EntPayBankQueryRequest request = new EntPayBankQueryRequest();
96+
request.setPartnerTradeNo(partnerTradeNo);
97+
request.checkAndSign(this.payService.getConfig());
98+
99+
String url = this.payService.getPayBaseUrl() + "/mmpaysptrans/query_bank";
100+
String responseContent = this.payService.post(url, request.toXML(), true);
101+
EntPayBankQueryResult result = BaseWxPayResult.fromXML(responseContent, EntPayBankQueryResult.class);
102+
result.checkResult(this.payService, request.getSignType(), true);
103+
return result;
104+
}
105+
93106
private String encryptRSA(File publicKeyFile, String srcString) throws WxPayException {
94107
try {
95108
Security.addProvider(new BouncyCastleProvider());

‎weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImplTest.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.github.binarywang.wxpay.service.impl;
22

3+
import com.github.binarywang.wxpay.bean.entpay.EntPayRequest;
34
import com.github.binarywang.wxpay.bean.entpay.EntPayBankRequest;
45
import com.github.binarywang.wxpay.bean.entpay.EntPayBankResult;
5-
import com.github.binarywang.wxpay.bean.entpay.EntPayRequest;
66
import com.github.binarywang.wxpay.bean.request.WxEntPayRequest;
77
import com.github.binarywang.wxpay.constant.WxPayConstants;
88
import com.github.binarywang.wxpay.exception.WxPayException;
@@ -16,7 +16,7 @@
1616

1717
/**
1818
* <pre>
19-
* 企业付款测试类
19+
* 企业付款测试类.
2020
* Created by BinaryWang on 2017/12/19.
2121
* </pre>
2222
*
@@ -72,8 +72,8 @@ public void testGetPublicKey() throws Exception {
7272
}
7373

7474
@Test
75-
public void testPayToBankCard() throws Exception {
76-
EntPayBankResult result = this.payService.getEntPayService().payToBankCard(EntPayBankRequest.builder()
75+
public void testPayBank() throws Exception {
76+
EntPayBankResult result = this.payService.getEntPayService().payBank(EntPayBankRequest.builder()
7777
.bankCode("aa")
7878
.amount(1)
7979
.encBankNo("1")
@@ -83,4 +83,9 @@ public void testPayToBankCard() throws Exception {
8383
.build());
8484
this.logger.info(result.toString());
8585
}
86+
87+
@Test
88+
public void testQueryPayBank() throws Exception {
89+
this.logger.info(this.payService.getEntPayService().queryPayBank("123").toString());
90+
}
8691
}

0 commit comments

Comments
 (0)