From 79f85176cb96c460c0da4e04820ee265b4add08c Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 26 Dec 2019 17:29:10 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20#1275=20=E5=BE=AE=E4=BF=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E4=BC=98=E5=8C=96=E5=AF=B9=E8=B4=A6=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E8=A7=A3=E6=9E=90=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=99=AE=E9=80=9A=E7=BB=93=E7=AE=97=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxpay/bean/result/WxPayBillResult.java | 26 ++++--- .../bean/result/WxPayBillResultTest.java | 68 ++++++++++++------- 2 files changed, 61 insertions(+), 33 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillResult.java index 15416b1f..84a382db 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillResult.java @@ -66,16 +66,16 @@ public class WxPayBillResult implements Serializable { */ 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: { @@ -106,7 +106,9 @@ public class WxPayBillResult implements Serializable { 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()); @@ -133,9 +135,14 @@ public class WxPayBillResult implements Serializable { 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; } @@ -181,7 +188,8 @@ public class WxPayBillResult implements Serializable { 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()); diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBillResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBillResultTest.java index 76bbf057..6d5d3226 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBillResultTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBillResultTest.java @@ -1,27 +1,35 @@ 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时,解析结果是否正确 */ @@ -29,17 +37,29 @@ public class WxPayBillResultTest { 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()); } @@ -50,15 +70,15 @@ public class WxPayBillResultTest { 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(), ""); } }