Skip to content

Commit d2fbb51

Browse files
committed
修正一个错误的类属性命名
1 parent cacfaf6 commit d2fbb51

4 files changed

Lines changed: 47 additions & 20 deletions

File tree

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
package com.github.binarywang.wxpay.bean.result;
22

3+
import me.chanjar.weixin.common.util.ToStringUtils;
4+
35
import java.io.Serializable;
46

7+
/**
8+
* 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
9+
* 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00
10+
* 退款类型:ORIGINAL 退款状态:SUCCESS 商品名称: 商户数据包: 手续费:0.00000 费率 :0.60%
11+
*/
512
public class WxPayBillBaseResult implements Serializable {
6-
/*
7-
* 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
8-
* 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00
9-
* 退款类型:ORIGINAL 退款状态:SUCCESS 商品名称: 商户数据包: 手续费:0.00000 费率 :0.60%
10-
*/
11-
private static final long serialVersionUID = 1L;
13+
private static final long serialVersionUID = 2226245109137435453L;
14+
15+
@Override
16+
public String toString() {
17+
return ToStringUtils.toSimpleString(this);
18+
}
19+
1220
/**
1321
* 交易时间
1422
*/
@@ -32,7 +40,7 @@ public class WxPayBillBaseResult implements Serializable {
3240
/**
3341
* 微信订单号
3442
*/
35-
private String transationId;
43+
private String transactionId;
3644
/**
3745
* 商户订单号
3846
*/
@@ -150,12 +158,12 @@ public void setDeviceInfo(String deviceInfo) {
150158
this.deviceInfo = deviceInfo;
151159
}
152160

153-
public String getTransationId() {
154-
return transationId;
161+
public String getTransactionId() {
162+
return transactionId;
155163
}
156164

157-
public void setTransationId(String transationId) {
158-
this.transationId = transationId;
165+
public void setTransactionId(String transactionId) {
166+
this.transactionId = transactionId;
159167
}
160168

161169
public String getOutTradeNo() {

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
package com.github.binarywang.wxpay.bean.result;
22

3+
import me.chanjar.weixin.common.util.ToStringUtils;
4+
35
import java.io.Serializable;
46
import java.util.List;
57

68
public class WxPayBillResult implements Serializable {
9+
private static final long serialVersionUID = -7687458652694204070L;
10+
11+
@Override
12+
public String toString() {
13+
return ToStringUtils.toSimpleString(this);
14+
}
15+
716
/**
817
* 对账返回对象
918
*/
10-
private static final long serialVersionUID = 1L;
11-
1219
private List<WxPayBillBaseResult> wxPayBillBaseResultLst;
1320
/**
1421
* 总交易单数

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ private WxPayBillResult handleBillInformation(String responseContent) {
446446
wxPayBillBaseResult.setMchId(tempStr[k + 2].trim());
447447
wxPayBillBaseResult.setSubMchId(tempStr[k + 3].trim());
448448
wxPayBillBaseResult.setDeviceInfo(tempStr[k + 4].trim());
449-
wxPayBillBaseResult.setTransationId(tempStr[k + 5].trim());
449+
wxPayBillBaseResult.setTransactionId(tempStr[k + 5].trim());
450450
wxPayBillBaseResult.setOutTradeNo(tempStr[k + 6].trim());
451451
wxPayBillBaseResult.setOpenId(tempStr[k + 7].trim());
452452
wxPayBillBaseResult.setTradeType(tempStr[k + 8].trim());

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
import com.google.inject.Inject;
1616
import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
18-
import org.testng.annotations.Guice;
19-
import org.testng.annotations.Test;
18+
import org.testng.annotations.*;
2019

2120
import java.nio.file.Files;
2221
import java.nio.file.Path;
@@ -90,11 +89,24 @@ public void testCloseOrder() throws WxPayException {
9089
this.logger.info(this.payService.closeOrder("11212121").toString());
9190
}
9291

92+
@DataProvider
93+
public Object[][] billingData() {
94+
return new Object[][]{
95+
// {"20170831", BillType.ALL, null, "deviceInfo"},
96+
{"20170831", BillType.SUCCESS, null, "deviceInfo"}
97+
};
98+
}
99+
100+
@Test(dataProvider = "billingData")
101+
public void testDownloadBill(String billDate, String billType,
102+
String tarType, String deviceInfo) throws Exception {
103+
WxPayBillResult billResult = this.payService.downloadBill(billDate, billType, tarType, deviceInfo);
104+
assertNotNull(billResult);
105+
this.logger.info(billResult.toString());
106+
}
107+
93108
@Test
94-
public void testDownloadBill() throws Exception {
95-
WxPayBillResult wxPayBillResult = this.payService.downloadBill("20170831", BillType.ALL, null, "1111111");
96-
//前一天没有账单记录返回null
97-
assertNotNull(wxPayBillResult);
109+
public void testDownloadBill_withNoParams() throws Exception {
98110
//必填字段为空时,抛出异常
99111
this.payService.downloadBill("", "", "", null);
100112
}

0 commit comments

Comments
 (0)