diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java index 4c349206f..51362a416 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java @@ -229,7 +229,7 @@ public class WxPayCouponInfoQueryResult extends BaseWxPayResult { private String isPartialUse; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { deviceInfo = readXmlString(d, "device_info"); couponStockId = readXmlString(d, "coupon_stock_id"); couponId = readXmlString(d, "coupon_id"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java index e6b40a6fa..c7e970ad9 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java @@ -138,7 +138,7 @@ public class WxPayCouponSendResult extends BaseWxPayResult { private String retMsg; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { deviceInfo = readXmlString(d, "device_info"); couponStockId = readXmlString(d, "coupon_stock_id"); respCount = readXmlInteger(d, "resp_count"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java index 9de99ffd2..a683a850b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java @@ -193,7 +193,7 @@ public class WxPayCouponStockQueryResult extends BaseWxPayResult { private Integer couponBudget; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { deviceInfo = readXmlString(d, "device_info"); couponStockId = readXmlString(d, "coupon_stock_id"); couponName = readXmlString(d, "coupon_name"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java index 98438334f..b7666a545 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java @@ -95,7 +95,7 @@ public class EntPayBankQueryResult extends BaseWxPayResult { private String failReason; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { partnerTradeNo = readXmlString(d, "partner_trade_no"); paymentNo = readXmlString(d, "payment_no"); bankNoMd5 = readXmlString(d, "bank_no_md5"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java index fae51d0aa..44fc6fa7c 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java @@ -50,7 +50,7 @@ public class EntPayBankResult extends BaseWxPayResult { private Integer cmmsAmount; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { amount = readXmlInteger(d, "amount"); partnerTradeNo = readXmlString(d, "partner_trade_no"); paymentNo = readXmlString(d, "payment_no"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java index bf4efac5d..5fe7e05ba 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java @@ -83,7 +83,7 @@ public class EntPayQueryResult extends BaseWxPayResult { private String desc; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { partnerTradeNo = readXmlString(d, "partner_trade_no"); detailId = readXmlString(d, "detail_id"); status = readXmlString(d, "status"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java index 9488c32aa..6e970e3fe 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java @@ -132,7 +132,7 @@ public class EntPayRedpackQueryResult extends BaseWxPayResult { private Integer senderHeaderMediaId; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { mchBillNo = readXmlString(d, "mch_billno"); detailId = readXmlString(d, "detailId"); status = readXmlString(d, "status"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java index a2bf3df7e..8086ef960 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java @@ -80,7 +80,7 @@ public class EntPayRedpackResult extends BaseWxPayResult implements Serializable private String senderHeaderMediaId; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { mchBillNo = readXmlString(d, "mch_billno"); mchId = readXmlString(d, "mch_id"); wxAppId = readXmlString(d, "wxappid"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java index 7691e4d4a..7c09caea2 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java @@ -60,7 +60,7 @@ public class EntPayResult extends BaseWxPayResult { private String paymentTime; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { mchId = readXmlString(d, "mchid"); mchAppid = readXmlString(d, "mch_appid"); deviceInfo = readXmlString(d, "device_info"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java index 7e793bbf0..7a1f51840 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java @@ -31,7 +31,7 @@ public class GetPublicKeyResult extends BaseWxPayResult { private String pubKey; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { mchId = readXmlString(d, "mch_id"); pubKey = readXmlString(d, "pub_key"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java index 976bf12bb..03e4b359b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java @@ -352,7 +352,7 @@ public class WxPayOrderNotifyResult extends BaseWxPayResult { } @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { promotionDetail = readXmlString(d, "promotion_detail"); deviceInfo = readXmlString(d, "device_info"); openid = readXmlString(d, "openid"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java index 6c650d143..ae86b8c85 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java @@ -85,7 +85,7 @@ public class WxPayRefundNotifyResult extends BaseWxPayResult implements Serializ private transient String decryptedReqInfo; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { reqInfoString = readXmlString(d, "req_info"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java index d144a4b55..f2081f9a2 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java @@ -47,7 +47,7 @@ public class WxScanPayNotifyResult extends BaseWxPayResult { private String productId; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { openid = readXmlString(d, "openid"); isSubscribe = readXmlString(d, "is_subscribe"); productId = readXmlString(d, "product_id"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java index 5657d6ae8..9d0d78e59 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java @@ -79,7 +79,7 @@ public class ProfitSharingQueryResult extends BaseWxPayResult { } @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { transactionId = readXmlString(d, "transaction_id"); outOrderNo = readXmlString(d, "out_order_no"); orderId = readXmlString(d, "order_id"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReceiverResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReceiverResult.java index 1a048df36..278c2d7d0 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReceiverResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReceiverResult.java @@ -24,7 +24,7 @@ public class ProfitSharingReceiverResult extends BaseWxPayResult { private String receiver; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { receiver = readXmlString(d, "receiver"); } } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingResult.java index 0ca430ab3..312845022 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingResult.java @@ -33,7 +33,7 @@ public class ProfitSharingResult extends BaseWxPayResult { private String orderId; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { transactionId = readXmlString(d, "transaction_id"); outOrderNo = readXmlString(d, "out_order_no"); orderId = readXmlString(d, "order_id"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReturnResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReturnResult.java index d0531b61e..bfa735329 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReturnResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReturnResult.java @@ -74,7 +74,7 @@ public class ProfitSharingReturnResult extends BaseWxPayResult { private String finishTime; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { orderId = readXmlString(d, "order_id"); outOrderNo = readXmlString(d, "out_order_no"); outReturnNo = readXmlString(d, "out_return_no"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java index bbba01bff..1f6eba15c 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java @@ -44,7 +44,7 @@ import org.w3c.dom.*; @Data public abstract class BaseWxPayResult implements Serializable { private static final long serialVersionUID = -3559552761816864481L; - + /** * 返回状态码. */ @@ -141,7 +141,7 @@ public abstract class BaseWxPayResult implements Serializable { t.setXmlString(xmlString); Document doc = t.getXmlDoc(); t.loadBasicXML(doc); - t.loadXML(doc); + t.loadXml(doc); return (T) t; } catch (Exception e) { throw new RuntimeException("parse xml error", e); @@ -159,7 +159,7 @@ public abstract class BaseWxPayResult implements Serializable { * * @param d Document */ - protected abstract void loadXML(Document d); + protected abstract void loadXml(Document d); /** * 从XML文档中加载基础属性 @@ -223,6 +223,7 @@ public abstract class BaseWxPayResult implements Serializable { if (content == null || content.trim().length() == 0) { return null; } + return Integer.parseInt(content); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java index 5bcc77d40..03e35b1c9 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java @@ -37,7 +37,7 @@ public class WxPayAuthcode2OpenidResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { openid = readXmlString(d, "openid"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java index 1dda6483b..614bdc2a3 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java @@ -14,6 +14,6 @@ import org.w3c.dom.Document; @XStreamAlias("xml") public class WxPayCommonResult extends BaseWxPayResult { @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { } } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java index 3a8ab40ea..7cdd210d3 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java @@ -41,7 +41,7 @@ public class WxPayFaceAuthInfoResult extends BaseWxPayResult implements Serializ * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { authinfo = readXmlString(d, "authinfo"); expiresIn = readXmlString(d, "expires_in"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFacepayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFacepayResult.java index 989ba7f0c..1b100ac4f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFacepayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFacepayResult.java @@ -249,7 +249,7 @@ public class WxPayFacepayResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { deviceInfo = readXmlString(d, "device_info"); openid = readXmlString(d, "openid"); isSubscribe = readXmlString(d, "is_subscribe"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java index 6a2a0630f..678916d88 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java @@ -222,7 +222,7 @@ public class WxPayMicropayResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { openid = readXmlString(d, "openid"); isSubscribe = readXmlString(d, "is_subscribe"); tradeType = readXmlString(d, "trade_type"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java index 0810816c1..a98fec86a 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java @@ -32,7 +32,7 @@ public class WxPayOrderCloseResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { resultMsg = readXmlString(d, "result_msg"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java index 2bc97ff08..d21e1375d 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java @@ -341,7 +341,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { promotionDetail = readXmlString(d, "promotion_detail"); deviceInfo = readXmlString(d, "device_info"); openid = readXmlString(d, "openid"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java index 77ad086be..0f9abd3a7 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java @@ -39,7 +39,7 @@ public class WxPayOrderReverseResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { isRecall = readXmlString(d, "recall"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java index d44d282e0..957547e1b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java @@ -52,7 +52,7 @@ public class WxPayQueryExchangeRateResult extends BaseWxPayResult { private String rate; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { } } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java index 0f4e5a91f..90f9a70e4 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java @@ -233,7 +233,7 @@ public class WxPayRedpackQueryResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { mchBillNo = readXmlString(d, "mch_billno"); detailId = readXmlString(d, "detail_id"); status = readXmlString(d, "status"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java index 9a60368f1..54fc8d4e1 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java @@ -179,7 +179,7 @@ public class WxPayRefundQueryResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { deviceInfo = readXmlString(d, "device_info"); transactionId = readXmlString(d, "transaction_id"); outTradeNo = readXmlString(d, "out_trade_no"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java index cdb9fc70e..fa971ffe1 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java @@ -147,7 +147,7 @@ public class WxPayRefundResult extends BaseWxPayResult implements Serializable { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { transactionId = readXmlString(d, "transaction_id"); outTradeNo = readXmlString(d, "out_trade_no"); outRefundNo = readXmlString(d, "out_refund_no"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java index dfa604ddf..afc8a94e0 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java @@ -38,7 +38,7 @@ public class WxPaySandboxSignKeyResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { sandboxSignKey = readXmlString(d, "sandbox_signkey"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendMiniProgramRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendMiniProgramRedpackResult.java index c58e1c02a..a3ac787cf 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendMiniProgramRedpackResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendMiniProgramRedpackResult.java @@ -55,7 +55,7 @@ public class WxPaySendMiniProgramRedpackResult extends BaseWxPayResult implement private String sendListId; @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { mchBillNo = readXmlString(d, "mch_billno"); wxAppid = readXmlString(d, "wxappid"); reOpenid = readXmlString(d, "re_openid"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java index f6293c07c..2002fd5b1 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java @@ -22,24 +22,25 @@ import java.io.Serializable; @XStreamAlias("xml") public class WxPaySendRedpackResult extends BaseWxPayResult implements Serializable { private static final long serialVersionUID = -4837415036337132073L; + private static final String PROCESSING = "PROCESSING"; @XStreamAlias("mch_billno") - private String mchBillno; + private String mchBillNo; @XStreamAlias("wxappid") - private String wxappid; + private String wxAppId; @XStreamAlias("re_openid") private String reOpenid; @XStreamAlias("total_amount") - private int totalAmount; + private Integer totalAmount; @XStreamAlias("send_time") private String sendTime; @XStreamAlias("send_listid") - private String sendListid; + private String sendListId; /** * 从XML结构中加载额外的熟悉 @@ -47,13 +48,13 @@ public class WxPaySendRedpackResult extends BaseWxPayResult implements Serializa * @param d Document */ @Override - protected void loadXML(Document d) { - mchBillno = readXmlString(d, "mch_billno"); - wxappid = readXmlString(d, "wxappid"); + protected void loadXml(Document d) { + mchBillNo = readXmlString(d, "mch_billno"); + wxAppId = readXmlString(d, "wxappid"); reOpenid = readXmlString(d, "re_openid"); totalAmount = readXmlInteger(d, "total_amount"); sendTime = readXmlString(d, "send_time"); - sendListid = readXmlString(d, "send_listid"); + sendListId = readXmlString(d, "send_listid"); } @Override @@ -61,7 +62,7 @@ public class WxPaySendRedpackResult extends BaseWxPayResult implements Serializa try { super.checkResult(wxPayService, signType, checkSuccess); } catch (WxPayException e) { - if (!"PROCESSING".equals(e.getErrCode())) { + if (!PROCESSING.equals(e.getErrCode())) { throw e; } } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java index 55463d655..6b692ec08 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java @@ -38,7 +38,7 @@ public class WxPayShorturlResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { shortUrl = readXmlString(d, "short_url"); } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java index 19e8be1cb..60d7e7f01 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java @@ -50,7 +50,7 @@ public class WxPayUnifiedOrderResult extends BaseWxPayResult { * @param d Document */ @Override - protected void loadXML(Document d) { + protected void loadXml(Document d) { prepayId = readXmlString(d, "prepay_id"); tradeType = readXmlString(d, "trade_type"); mwebUrl = readXmlString(d, "mweb_url");