Skip to content

Commit a81550f

Browse files
binarywangbinarywang
committed
🎨 优化部分代码
1 parent 03d9f2d commit a81550f

19 files changed

+72
-53
lines changed

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

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

3-
import java.io.ByteArrayInputStream;
4-
import java.io.Serializable;
5-
import java.math.BigDecimal;
6-
import java.nio.charset.StandardCharsets;
7-
import java.util.List;
8-
import java.util.Map;
9-
import javax.xml.parsers.DocumentBuilderFactory;
10-
import javax.xml.xpath.XPathConstants;
11-
import javax.xml.xpath.XPathExpressionException;
12-
import javax.xml.xpath.XPathFactory;
13-
14-
import com.github.binarywang.wxpay.util.XmlConfig;
15-
import org.apache.commons.lang3.StringUtils;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
18-
import org.w3c.dom.Document;
19-
import org.w3c.dom.NodeList;
20-
213
import com.github.binarywang.wxpay.constant.WxPayConstants;
224
import com.github.binarywang.wxpay.exception.WxPayException;
235
import com.github.binarywang.wxpay.service.WxPayService;
246
import com.github.binarywang.wxpay.util.SignUtils;
7+
import com.github.binarywang.wxpay.util.XmlConfig;
258
import com.google.common.base.Joiner;
269
import com.google.common.collect.Lists;
2710
import com.google.common.collect.Maps;
@@ -30,8 +13,22 @@
3013
import lombok.Data;
3114
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
3215
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
16+
import org.apache.commons.lang3.StringUtils;
17+
import org.slf4j.Logger;
18+
import org.slf4j.LoggerFactory;
19+
import org.w3c.dom.Document;
20+
import org.w3c.dom.Node;
21+
import org.w3c.dom.NodeList;
3322

34-
import org.w3c.dom.*;
23+
import javax.xml.parsers.DocumentBuilderFactory;
24+
import javax.xml.xpath.XPathConstants;
25+
import javax.xml.xpath.XPathExpressionException;
26+
import javax.xml.xpath.XPathFactory;
27+
import java.io.ByteArrayInputStream;
28+
import java.math.BigDecimal;
29+
import java.nio.charset.StandardCharsets;
30+
import java.util.List;
31+
import java.util.Map;
3532

3633
/**
3734
* <pre>
@@ -42,9 +39,7 @@
4239
* @author <a href="https://github.com/binarywang">Binary Wang</a>
4340
*/
4441
@Data
45-
public abstract class BaseWxPayResult implements Serializable {
46-
private static final long serialVersionUID = -3559552761816864481L;
47-
42+
public abstract class BaseWxPayResult {
4843
/**
4944
* 返回状态码.
5045
*/

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import lombok.NoArgsConstructor;
77
import org.w3c.dom.Document;
88

9+
import java.io.Serializable;
10+
911
/**
1012
* <pre>
1113
* 授权码查询openid接口请求结果类
@@ -18,7 +20,8 @@
1820
@EqualsAndHashCode(callSuper = true)
1921
@NoArgsConstructor
2022
@XStreamAlias("xml")
21-
public class WxPayAuthcode2OpenidResult extends BaseWxPayResult {
23+
public class WxPayAuthcode2OpenidResult extends BaseWxPayResult implements Serializable {
24+
private static final long serialVersionUID = -2409408725777108398L;
2225
/**
2326
* <pre>
2427
* 用户标识.

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

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

3-
import java.io.Serializable;
4-
53
import lombok.Data;
64
import lombok.NoArgsConstructor;
75
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
86

7+
import java.io.Serializable;
8+
99
/**
1010
* 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
1111
* 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.thoughtworks.xstream.annotations.XStreamAlias;
44
import org.w3c.dom.Document;
55

6+
import java.io.Serializable;
7+
68
/**
79
* <pre>
810
* 微信支付结果仅包含有return 和result等相关信息的的属性类
@@ -12,7 +14,9 @@
1214
* @author <a href="https://github.com/binarywang">Binary Wang</a>
1315
*/
1416
@XStreamAlias("xml")
15-
public class WxPayCommonResult extends BaseWxPayResult {
17+
public class WxPayCommonResult extends BaseWxPayResult implements Serializable {
18+
private static final long serialVersionUID = -8051324891539367420L;
19+
1620
@Override
1721
protected void loadXml(Document d) {
1822
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
@NoArgsConstructor
2020
@XStreamAlias("xml")
2121
public class WxPayFacepayResult extends BaseWxPayResult {
22-
2322
private static final long serialVersionUID = -4116580976046716911L;
2423

2524
/**

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

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

3-
import java.io.Serializable;
4-
53
import lombok.Data;
64
import lombok.NoArgsConstructor;
75
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
86

7+
import java.io.Serializable;
8+
99
/**
1010
* 记账时间:2018-02-01 04:21:23 微信支付业务单号:50000305742018020103387128253 资金流水单号:1900009231201802015884652186 业务名称:退款
1111
* 业务类型:退款 收支类型:支出 收支金额（元）:0.02 账户结余（元）:0.17 资金变更提交申请人:system 备注:缺货 业务凭证号:REF4200000068201801293084726067

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

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

3-
import java.io.Serializable;
4-
import java.util.List;
5-
63
import lombok.Data;
74
import lombok.NoArgsConstructor;
85
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
96

7+
import java.io.Serializable;
8+
import java.util.List;
9+
1010
/**
1111
* <pre>
1212
* 下载资金账单接口响应结果对象类

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import lombok.NoArgsConstructor;
77
import org.w3c.dom.Document;
88

9+
import java.io.Serializable;
10+
911
/**
1012
* <pre>
1113
* 提交刷卡支付接口响应结果对象类
@@ -18,7 +20,7 @@
1820
@EqualsAndHashCode(callSuper = true)
1921
@NoArgsConstructor
2022
@XStreamAlias("xml")
21-
public class WxPayMicropayResult extends BaseWxPayResult {
23+
public class WxPayMicropayResult extends BaseWxPayResult implements Serializable {
2224
private static final long serialVersionUID = 529670965722059189L;
2325

2426
/**

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import lombok.NoArgsConstructor;
77
import org.w3c.dom.Document;
88

9+
import java.io.Serializable;
10+
911
/**
1012
* <pre>
1113
* 关闭订单结果对象类
@@ -18,8 +20,8 @@
1820
@EqualsAndHashCode(callSuper = true)
1921
@NoArgsConstructor
2022
@XStreamAlias("xml")
21-
public class WxPayOrderCloseResult extends BaseWxPayResult {
22-
23+
public class WxPayOrderCloseResult extends BaseWxPayResult implements Serializable {
24+
private static final long serialVersionUID = 800873502890274834L;
2325
/**
2426
* 业务结果描述
2527
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@EqualsAndHashCode(callSuper = true)
2828
@NoArgsConstructor
2929
@XStreamAlias("xml")
30-
public class WxPayOrderQueryResult extends BaseWxPayResult {
30+
public class WxPayOrderQueryResult extends BaseWxPayResult implements Serializable {
3131
private static final long serialVersionUID = 8241891654782412789L;
3232

3333
/**

0 commit comments

Comments
 (0)