Skip to content

Commit

Permalink
🐛 binarywang#1275 微信支付优化对账单下载解析接口，兼容普通结算对账单
Browse files Browse the repository at this point in the history
  • Loading branch information
@binarywang
binarywang committed Dec 26, 2019
1 parent fa1f085 commit 79f8517
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 33 deletions.
26 changes: 17 additions & 9 deletions weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ public String toString() {
*/
public static WxPayBillResult fromRawBillResultString(String responseContent, String billType) {
switch (billType) {
case "ALL":{
case "ALL": {
return fromRawBillResultString(responseContent);
}
case "SUCCESS":{
case "SUCCESS": {
return fromRawBillResultStringToSuccess(responseContent);
}
case "REFUND" :{
case "REFUND": {
return fromRawBillResultStringToRefund(responseContent);
}
case "RECHARGE_REFUND" :{
case "RECHARGE_REFUND": {
return fromRawBillResultStringToRechargeRefund(responseContent);
}
default: {
Expand Down Expand Up @@ -106,7 +106,9 @@ private static WxPayBillResult fromRawBillResultString(String responseContent) {
int j = tempStr.length / t.length;
// 纪录数组下标
int k = 1;
// 交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,微信退款单号,商户退款单号,退款金额,充值券退款金额,退款类型,退款状态,商品名称,商户数据包,手续费,费率,订单金额,申请退款金额,费率备注
// 交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,
// 应结订单金额,代金券金额,微信退款单号,商户退款单号,退款金额,充值券退款金额,退款类型,退款状态,商品名称,商户数据包,手续费,费率,
// 订单金额,申请退款金额,费率备注 （开通免充值券后的结算对账单专有的三个字段）
for (int i = 0; i < j; i++) {
WxPayBillInfo result = new WxPayBillInfo();
result.setTradeTime(tempStr[k].trim());
Expand All @@ -133,9 +135,14 @@ private static WxPayBillResult fromRawBillResultString(String responseContent) {
result.setAttach(tempStr[k + 21].trim());
result.setPoundage(tempStr[k + 22].trim());
result.setPoundageRate(tempStr[k + 23].trim());
result.setTotalAmount(tempStr[k + 24].trim());
result.setAppliedRefundAmount(tempStr[k + 25].trim());
result.setFeeRemark(tempStr[k + 26].trim());

if (t.length > 24) {
// 开通免充值券后的结算对账单
result.setTotalAmount(tempStr[k + 24].trim());
result.setAppliedRefundAmount(tempStr[k + 25].trim());
result.setFeeRemark(tempStr[k + 26].trim());
}

results.add(result);
k += t.length;
}
Expand Down Expand Up @@ -181,7 +188,8 @@ private static WxPayBillResult fromRawBillResultStringToSuccess(String responseC
int j = tempStr.length / t.length;
// 纪录数组下标
int k = 1;
// 交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,商品名称,商户数据包,手续费,费率,订单金额,费率备注
// 交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,
// 应结订单金额,代金券金额,商品名称,商户数据包,手续费,费率,订单金额,费率备注
for (int i = 0; i < j; i++) {
WxPayBillInfo result = new WxPayBillInfo();
result.setTradeTime(tempStr[k].trim());
Expand Down
68 changes: 44 additions & 24 deletions ...n-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBillResultTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,65 @@
package com.github.binarywang.wxpay.bean.result;

import com.github.binarywang.wxpay.constant.WxPayConstants;
import org.testng.Assert;
import org.testng.annotations.Test;

import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;

/**
* @author m8cool
*/
public class WxPayBillResultTest {

public static final String PAY_BILL_RESULT_ALL_CONTENT = "交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,微信退款单号,商户退款单号,退款金额,充值券退款金额,退款类型,退款状态,商品名称,商户数据包,手续费,费率,订单金额,申请退款金额,费率备注\n" +
private static final String PAY_BILL_RESULT_ALL_CONTENT = "交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,微信退款单号,商户退款单号,退款金额,充值券退款金额,退款类型,退款状态,商品名称,商户数据包,手续费,费率,订单金额,申请退款金额,费率备注\n" +
"`2019-07-25 08:35:41,`WWWW,`XXXXXXXX,`0,`,`XXXXXXXXXXXXX,`XXXXXXXXXX,`XXXXXXXXXXX,`JSAPI,`SUCCESS,`PSBC_DEBIT,`CNY,`6.00,`0.00,`0,`0,`0.00,`0.00,`,`,`XXXXXX,`XXXXXXX,`0.04000,`0.60%,`6.00,`0.00,`\n" +
"总交易单数,应结订单总金额,退款总金额,充值券退款总金额,手续费总金额,订单总金额,申请退款总金额\n" +
"`48,`5.76,`1.42,`0.00,`0.01000,`5.76,`1.42\n";
public static final String PAY_BILL_RESULT_SUCCESS_CONTENT = "交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,商品名称,商户数据包,手续费,费率,订单金额,费率备注\n" +
private static final String PAY_BILL_RESULT_ALL_CONTENT_1 = "交易时间,公众账号ID,商户号,子商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,总金额,代金券或立减优惠金额,微信退款单号,商户退款单号,退款金额,代金券或立减优惠退款金额,退款类型,退款状态,商品名称,商户数据包,手续费,费率\n" +
"`2014-11-10 16：33：45,`wx2421b1c4370ec43b,`10000100,`0,`1000,`1001690740201411100005734289,`1415640626,`085e9858e3ba5186aafcbaed1,`MICROPAY,`SUCCESS,`OTHERS,`CNY,`0.01,`0.0,`0,`0,`0,`0,`,`,`被扫支付测试,`订单额外描述,`0,`0.60%\n" +
"`2014-11-10 16：46：14,`wx2421b1c4370ec43b,`10000100,`0,`1000,`1002780740201411100005729794,`1415635270,`085e9858e90ca40c0b5aee463,`MICROPAY,`SUCCESS,`OTHERS,`CNY,`0.01,`0.0,`0,`0,`0,`0,`,`,`被扫支付测试,`订单额外描述,`0,`0.60%\n" +
"总交易单数,总交易额,总退款金额,总代金券或立减优惠退款金额,手续费总金额\n" +
"`2,`0.02,`0.0,`0.0,`0";

private static final String PAY_BILL_RESULT_SUCCESS_CONTENT = "交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,商品名称,商户数据包,手续费,费率,订单金额,费率备注\n" +
"`2019-07-23 18:46:41,`XXXX,`XXX,`XXX,`,`XXX,`XXX,`XXX,`JSAPI,`SUCCESS,`CFT,`CNY,`0.01,`0.00,`XXX,`XXXX,`0.00000,`0.60%,`0.01,`\n" +
"总交易单数,应结订单总金额,退款总金额,充值券退款总金额,手续费总金额,订单总金额,申请退款总金额\n" +
"`31,`3.05,`0.00,`0.00,`0.02000,`3.05,`0.00";
public static final String PAY_BILL_RESULT_REFUND_CONTENT = "交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,退款申请时间,退款成功时间,微信退款单号,商户退款单号,退款金额,充值券退款金额,退款类型,退款状态,商品名称,商户数据包,手续费,费率,订单金额,申请退款金额,费率备注\n" +
private static final String PAY_BILL_RESULT_REFUND_CONTENT = "交易时间,公众账号ID,商户号,特约商户号,设备号,微信订单号,商户订单号,用户标识,交易类型,交易状态,付款银行,货币种类,应结订单金额,代金券金额,退款申请时间,退款成功时间,微信退款单号,商户退款单号,退款金额,充值券退款金额,退款类型,退款状态,商品名称,商户数据包,手续费,费率,订单金额,申请退款金额,费率备注\n" +
"`2019-07-23 20:53:36,`xxx,`xxx,`xxx,`,`xxx,`xxxx,`xxxxx,`JSAPI,`REFUND,`CFT,`CNY,`0.00,`0.00,`2019-07-23 20:53:36,`2019-07-23 20:53:40,`xxxx,`xxx,`0.01,`0.00,`ORIGINAL,`SUCCESS,`xxxx,`xxxx,`0.00000,`0.60%,`0.00,`0.01,`\n" +
"总交易单数,应结订单总金额,退款总金额,充值券退款总金额,手续费总金额,订单总金额,申请退款总金额\n" +
"`4,`0.00,`2.02,`0.00,`-0.02000,`0.00,`2.02";


/**
* 测试微信返回类型为ALL时，解析结果是否正确
*/
@Test
public void testFromRawBillResultStringAll() {
WxPayBillResult result = WxPayBillResult.fromRawBillResultString(PAY_BILL_RESULT_ALL_CONTENT, WxPayConstants.BillType.ALL);

Assert.assertEquals(result.getTotalRecord(), "48");
Assert.assertEquals(result.getTotalFee(), "5.76");
Assert.assertEquals(result.getTotalRefundFee(), "1.42");
Assert.assertEquals(result.getTotalCouponFee(), "0.00");
Assert.assertEquals(result.getTotalPoundageFee(), "0.01000");
Assert.assertEquals(result.getTotalAmount(), "5.76");
Assert.assertEquals(result.getTotalAppliedRefundFee(), "1.42");
Assert.assertEquals(result.getBillInfoList().get(0).getTotalAmount(), "6.00");
Assert.assertEquals(result.getBillInfoList().get(0).getAppliedRefundAmount(), "0.00");
Assert.assertEquals(result.getBillInfoList().get(0).getFeeRemark(), "");
assertEquals(result.getTotalRecord(), "48");
assertEquals(result.getTotalFee(), "5.76");
assertEquals(result.getTotalRefundFee(), "1.42");
assertEquals(result.getTotalCouponFee(), "0.00");
assertEquals(result.getTotalPoundageFee(), "0.01000");
assertEquals(result.getTotalAmount(), "5.76");
assertEquals(result.getTotalAppliedRefundFee(), "1.42");
assertEquals(result.getBillInfoList().get(0).getTotalAmount(), "6.00");
assertEquals(result.getBillInfoList().get(0).getAppliedRefundAmount(), "0.00");
assertEquals(result.getBillInfoList().get(0).getFeeRemark(), "");

result = WxPayBillResult.fromRawBillResultString(PAY_BILL_RESULT_ALL_CONTENT_1, WxPayConstants.BillType.ALL);

assertEquals(result.getTotalRecord(), "2");
assertEquals(result.getTotalFee(), "0.02");
assertEquals(result.getTotalRefundFee(), "0.0");
assertEquals(result.getTotalCouponFee(), "0.0");
assertEquals(result.getTotalPoundageFee(), "0");
assertNull(result.getTotalAmount());
assertNull(result.getTotalAppliedRefundFee());
assertNull(result.getBillInfoList().get(0).getTotalAmount());
assertNull(result.getBillInfoList().get(0).getAppliedRefundAmount());
assertNull(result.getBillInfoList().get(0).getFeeRemark());

}

Expand All @@ -50,15 +70,15 @@ public void testFromRawBillResultStringAll() {
public void testFromRawBillResultStringSuccess() {
WxPayBillResult result = WxPayBillResult.fromRawBillResultString(PAY_BILL_RESULT_SUCCESS_CONTENT, WxPayConstants.BillType.SUCCESS);

Assert.assertEquals(result.getTotalRecord(), "31");
Assert.assertEquals(result.getTotalFee(), "3.05");
Assert.assertEquals(result.getTotalRefundFee(), "0.00");
Assert.assertEquals(result.getTotalCouponFee(), "0.00");
Assert.assertEquals(result.getTotalPoundageFee(), "0.02000");
Assert.assertEquals(result.getTotalAmount(), "3.05");
Assert.assertEquals(result.getTotalAppliedRefundFee(), "0.00");
Assert.assertEquals(result.getBillInfoList().get(0).getTotalAmount(), "0.01");
Assert.assertEquals(result.getBillInfoList().get(0).getFeeRemark(), "");
assertEquals(result.getTotalRecord(), "31");
assertEquals(result.getTotalFee(), "3.05");
assertEquals(result.getTotalRefundFee(), "0.00");
assertEquals(result.getTotalCouponFee(), "0.00");
assertEquals(result.getTotalPoundageFee(), "0.02000");
assertEquals(result.getTotalAmount(), "3.05");
assertEquals(result.getTotalAppliedRefundFee(), "0.00");
assertEquals(result.getBillInfoList().get(0).getTotalAmount(), "0.01");
assertEquals(result.getBillInfoList().get(0).getFeeRemark(), "");

}
}

0 comments on commit 79f8517

Please sign in to comment.