From eb6a578e1e07afc94652baee8e4ef1b4e86e5bb8 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 28 May 2020 22:32:18 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=A7=84=E8=8C=83=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coupon/WxPayCouponInfoQueryResult.java | 32 ++++++------ .../bean/coupon/WxPayCouponSendResult.java | 18 +++---- .../coupon/WxPayCouponStockQueryResult.java | 26 +++++----- .../bean/entpay/EntPayBankQueryResult.java | 20 +++---- .../wxpay/bean/entpay/EntPayBankResult.java | 8 +-- .../wxpay/bean/entpay/EntPayQueryResult.java | 20 +++---- .../bean/entpay/EntPayRedpackQueryResult.java | 34 ++++++------ .../bean/entpay/EntPayRedpackResult.java | 16 +++--- .../wxpay/bean/entpay/EntPayResult.java | 12 ++--- .../wxpay/bean/entpay/GetPublicKeyResult.java | 4 +- .../bean/notify/WxPayOrderNotifyResult.java | 44 ++++++++-------- .../bean/notify/WxPayRefundNotifyResult.java | 28 +++++----- .../bean/notify/WxScanPayNotifyResult.java | 6 +-- .../ProfitSharingQueryResult.java | 16 +++--- .../ProfitSharingReceiverResult.java | 3 +- .../profitsharing/ProfitSharingResult.java | 6 +-- .../ProfitSharingReturnResult.java | 22 ++++---- .../wxpay/bean/result/BaseWxPayResult.java | 52 +++++++++++-------- .../result/WxPayAuthcode2OpenidResult.java | 2 +- .../bean/result/WxPayFaceAuthInfoResult.java | 4 +- .../wxpay/bean/result/WxPayFacepayResult.java | 34 ++++++------ .../bean/result/WxPayMicropayResult.java | 30 +++++------ .../bean/result/WxPayOrderCloseResult.java | 2 +- .../bean/result/WxPayOrderQueryResult.java | 38 +++++++------- .../bean/result/WxPayOrderReverseResult.java | 2 +- .../bean/result/WxPayRedpackQueryResult.java | 34 ++++++------ .../bean/result/WxPayRefundQueryResult.java | 16 +++--- .../wxpay/bean/result/WxPayRefundResult.java | 28 +++++----- .../result/WxPaySandboxSignKeyResult.java | 2 +- .../WxPaySendMiniProgramRedpackResult.java | 12 ++--- .../bean/result/WxPaySendRedpackResult.java | 12 ++--- .../bean/result/WxPayShorturlResult.java | 2 +- .../bean/result/WxPayUnifiedOrderResult.java | 8 +-- 33 files changed, 301 insertions(+), 292 deletions(-) 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 9001541b7..4c349206f 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 @@ -230,21 +230,21 @@ public class WxPayCouponInfoQueryResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - deviceInfo = readXMLString(d, "device_info"); - couponStockId = readXMLString(d, "coupon_stock_id"); - couponId = readXMLString(d, "coupon_id"); - couponValue = readXMLInteger(d, "coupon_value"); - couponMinimum = readXMLInteger(d, "coupon_minimum"); - couponName = readXMLString(d, "coupon_name"); - couponState = readXMLString(d, "coupon_state"); - couponDesc = readXMLString(d, "coupon_desc"); - couponUseValue = readXMLInteger(d, "coupon_use_value"); - couponRemainValue = readXMLInteger(d, "coupon_remain_value"); - beginTime = readXMLString(d, "begin_time"); - endTime = readXMLString(d, "end_time"); - sendTime = readXMLString(d, "send_time"); - consumerMchId = readXMLString(d, "consumer_mch_id"); - sendSource = readXMLString(d, "send_source"); - isPartialUse = readXMLString(d, "is_partial_use"); + deviceInfo = readXmlString(d, "device_info"); + couponStockId = readXmlString(d, "coupon_stock_id"); + couponId = readXmlString(d, "coupon_id"); + couponValue = readXmlInteger(d, "coupon_value"); + couponMinimum = readXmlInteger(d, "coupon_minimum"); + couponName = readXmlString(d, "coupon_name"); + couponState = readXmlString(d, "coupon_state"); + couponDesc = readXmlString(d, "coupon_desc"); + couponUseValue = readXmlInteger(d, "coupon_use_value"); + couponRemainValue = readXmlInteger(d, "coupon_remain_value"); + beginTime = readXmlString(d, "begin_time"); + endTime = readXmlString(d, "end_time"); + sendTime = readXmlString(d, "send_time"); + consumerMchId = readXmlString(d, "consumer_mch_id"); + sendSource = readXmlString(d, "send_source"); + isPartialUse = readXmlString(d, "is_partial_use"); } } 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 9350e5884..e6b40a6fa 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 @@ -139,14 +139,14 @@ public class WxPayCouponSendResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - deviceInfo = readXMLString(d, "device_info"); - couponStockId = readXMLString(d, "coupon_stock_id"); - respCount = readXMLInteger(d, "resp_count"); - successCount = readXMLInteger(d, "success_count"); - failedCount = readXMLInteger(d, "failed_count"); - openid = readXMLString(d, "openid"); - retCode = readXMLString(d, "ret_code"); - couponId = readXMLString(d, "coupon_id"); - retMsg = readXMLString(d, "ret_msg"); + deviceInfo = readXmlString(d, "device_info"); + couponStockId = readXmlString(d, "coupon_stock_id"); + respCount = readXmlInteger(d, "resp_count"); + successCount = readXmlInteger(d, "success_count"); + failedCount = readXmlInteger(d, "failed_count"); + openid = readXmlString(d, "openid"); + retCode = readXmlString(d, "ret_code"); + couponId = readXmlString(d, "coupon_id"); + retMsg = readXmlString(d, "ret_msg"); } } 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 b338f4081..9de99ffd2 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 @@ -194,18 +194,18 @@ public class WxPayCouponStockQueryResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - deviceInfo = readXMLString(d, "device_info"); - couponStockId = readXMLString(d, "coupon_stock_id"); - couponName = readXMLString(d, "coupon_name"); - couponValue = readXMLInteger(d, "coupon_value"); - couponMinimum = readXMLInteger(d, "coupon_mininumn"); - couponStockStatus = readXMLInteger(d, "coupon_stock_status"); - couponTotal = readXMLInteger(d, "coupon_total"); - maxQuota = readXMLInteger(d, "max_quota"); - isSendNum = readXMLInteger(d, "is_send_num"); - beginTime = readXMLString(d, "begin_time"); - endTime = readXMLString(d, "end_time"); - createTime = readXMLString(d, "create_time"); - couponBudget = readXMLInteger(d, "coupon_budget"); + deviceInfo = readXmlString(d, "device_info"); + couponStockId = readXmlString(d, "coupon_stock_id"); + couponName = readXmlString(d, "coupon_name"); + couponValue = readXmlInteger(d, "coupon_value"); + couponMinimum = readXmlInteger(d, "coupon_mininumn"); + couponStockStatus = readXmlInteger(d, "coupon_stock_status"); + couponTotal = readXmlInteger(d, "coupon_total"); + maxQuota = readXmlInteger(d, "max_quota"); + isSendNum = readXmlInteger(d, "is_send_num"); + beginTime = readXmlString(d, "begin_time"); + endTime = readXmlString(d, "end_time"); + createTime = readXmlString(d, "create_time"); + couponBudget = readXmlInteger(d, "coupon_budget"); } } 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 72adc1c9a..98438334f 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 @@ -96,15 +96,15 @@ public class EntPayBankQueryResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - partnerTradeNo = readXMLString(d, "partner_trade_no"); - paymentNo = readXMLString(d, "payment_no"); - bankNoMd5 = readXMLString(d, "bank_no_md5"); - trueNameMd5 = readXMLString(d, "true_name_md5"); - amount = readXMLInteger(d, "amount"); - status = readXMLString(d, "status"); - cmmsAmount = readXMLInteger(d, "cmms_amt"); - createTime = readXMLString(d, "create_time"); - paySuccessTime = readXMLString(d, "pay_succ_time"); - failReason = readXMLString(d, "reason"); + partnerTradeNo = readXmlString(d, "partner_trade_no"); + paymentNo = readXmlString(d, "payment_no"); + bankNoMd5 = readXmlString(d, "bank_no_md5"); + trueNameMd5 = readXmlString(d, "true_name_md5"); + amount = readXmlInteger(d, "amount"); + status = readXmlString(d, "status"); + cmmsAmount = readXmlInteger(d, "cmms_amt"); + createTime = readXmlString(d, "create_time"); + paySuccessTime = readXmlString(d, "pay_succ_time"); + failReason = readXmlString(d, "reason"); } } 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 0d38645af..fae51d0aa 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 @@ -51,9 +51,9 @@ public class EntPayBankResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - amount = readXMLInteger(d, "amount"); - partnerTradeNo = readXMLString(d, "partner_trade_no"); - paymentNo = readXMLString(d, "payment_no"); - cmmsAmount = readXMLInteger(d, "cmms_amt"); + amount = readXmlInteger(d, "amount"); + partnerTradeNo = readXmlString(d, "partner_trade_no"); + paymentNo = readXmlString(d, "payment_no"); + cmmsAmount = readXmlInteger(d, "cmms_amt"); } } 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 6dee1d091..bf4efac5d 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 @@ -84,15 +84,15 @@ public class EntPayQueryResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - partnerTradeNo = readXMLString(d, "partner_trade_no"); - detailId = readXMLString(d, "detail_id"); - status = readXMLString(d, "status"); - reason = readXMLString(d, "reason"); - openid = readXMLString(d, "openid"); - transferName = readXMLString(d, "transfer_name"); - paymentAmount = readXMLInteger(d, "payment_amount"); - transferTime = readXMLString(d, "transfer_time"); - paymentTime = readXMLString(d, "payment_time"); - desc = readXMLString(d, "desc"); + partnerTradeNo = readXmlString(d, "partner_trade_no"); + detailId = readXmlString(d, "detail_id"); + status = readXmlString(d, "status"); + reason = readXmlString(d, "reason"); + openid = readXmlString(d, "openid"); + transferName = readXmlString(d, "transfer_name"); + paymentAmount = readXmlInteger(d, "payment_amount"); + transferTime = readXmlString(d, "transfer_time"); + paymentTime = readXmlString(d, "payment_time"); + desc = readXmlString(d, "desc"); } } 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 000498519..9488c32aa 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 @@ -133,22 +133,22 @@ public class EntPayRedpackQueryResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - mchBillNo = readXMLString(d, "mch_billno"); - detailId = readXMLString(d, "detailId"); - status = readXMLString(d, "status"); - sendType = readXMLString(d, "send_type"); - totalAmount = readXMLInteger(d, "total_amount"); - reason = readXMLInteger(d, "reason"); - sendTime = readXMLString(d, "send_time"); - refundTime = readXMLString(d, "refund_time"); - refundAmount = readXMLInteger(d, "refund_amount"); - wishing = readXMLString(d, "wishing"); - remark = readXMLString(d, "remark"); - actName = readXMLString(d, "act_name"); - openid = readXMLString(d, "openid"); - amount = readXMLInteger(d, "amount"); - rcvTime = readXMLInteger(d, "rcv_time"); - senderName = readXMLInteger(d, "sender_name"); - senderHeaderMediaId = readXMLInteger(d, "sender_header_media_id"); + mchBillNo = readXmlString(d, "mch_billno"); + detailId = readXmlString(d, "detailId"); + status = readXmlString(d, "status"); + sendType = readXmlString(d, "send_type"); + totalAmount = readXmlInteger(d, "total_amount"); + reason = readXmlInteger(d, "reason"); + sendTime = readXmlString(d, "send_time"); + refundTime = readXmlString(d, "refund_time"); + refundAmount = readXmlInteger(d, "refund_amount"); + wishing = readXmlString(d, "wishing"); + remark = readXmlString(d, "remark"); + actName = readXmlString(d, "act_name"); + openid = readXmlString(d, "openid"); + amount = readXmlInteger(d, "amount"); + rcvTime = readXmlInteger(d, "rcv_time"); + senderName = readXmlInteger(d, "sender_name"); + senderHeaderMediaId = readXmlInteger(d, "sender_header_media_id"); } } 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 98cce357c..a2bf3df7e 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 @@ -81,13 +81,13 @@ public class EntPayRedpackResult extends BaseWxPayResult implements Serializable @Override protected void loadXML(Document d) { - mchBillNo = readXMLString(d, "mch_billno"); - mchId = readXMLString(d, "mch_id"); - wxAppId = readXMLString(d, "wxappid"); - reOpenid = readXMLString(d, "re_openid"); - totalAmount = readXMLString(d, "totalAmount"); - sendListId = readXMLString(d, "sendListid"); - senderName = readXMLString(d, "sender_name"); - senderHeaderMediaId = readXMLString(d, "sender_header_media_id"); + mchBillNo = readXmlString(d, "mch_billno"); + mchId = readXmlString(d, "mch_id"); + wxAppId = readXmlString(d, "wxappid"); + reOpenid = readXmlString(d, "re_openid"); + totalAmount = readXmlString(d, "totalAmount"); + sendListId = readXmlString(d, "sendListid"); + senderName = readXmlString(d, "sender_name"); + senderHeaderMediaId = readXmlString(d, "sender_header_media_id"); } } 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 23a3cb7f2..7691e4d4a 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 @@ -61,11 +61,11 @@ public class EntPayResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - mchId = readXMLString(d, "mchid"); - mchAppid = readXMLString(d, "mch_appid"); - deviceInfo = readXMLString(d, "device_info"); - partnerTradeNo = readXMLString(d, "partner_trade_no"); - paymentNo = readXMLString(d, "payment_no"); - paymentTime = readXMLString(d, "payment_time"); + mchId = readXmlString(d, "mchid"); + mchAppid = readXmlString(d, "mch_appid"); + deviceInfo = readXmlString(d, "device_info"); + partnerTradeNo = readXmlString(d, "partner_trade_no"); + paymentNo = readXmlString(d, "payment_no"); + paymentTime = readXmlString(d, "payment_time"); } } 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 2a9cc8c6a..7e793bbf0 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 @@ -32,7 +32,7 @@ public class GetPublicKeyResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - mchId = readXMLString(d, "mch_id"); - pubKey = readXMLString(d, "pub_key"); + 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 b1a8fe9d2..976bf12bb 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 @@ -353,28 +353,28 @@ public class WxPayOrderNotifyResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - promotionDetail = readXMLString(d, "promotion_detail"); - deviceInfo = readXMLString(d, "device_info"); - openid = readXMLString(d, "openid"); - isSubscribe = readXMLString(d, "is_subscribe"); - subOpenid = readXMLString(d, "sub_openid"); - subIsSubscribe = readXMLString(d, "sub_is_subscribe"); - tradeType = readXMLString(d, "trade_type"); - bankType = readXMLString(d, "bank_type"); - totalFee = readXMLInteger(d, "total_fee"); - settlementTotalFee = readXMLInteger(d, "settlement_total_fee"); - feeType = readXMLString(d, "fee_type"); - cashFee = readXMLInteger(d, "cash_fee"); - cashFeeType = readXMLString(d, "cash_fee_type"); - couponFee = readXMLInteger(d, "coupon_fee"); - couponCount = readXMLInteger(d, "coupon_count"); - transactionId = readXMLString(d, "transaction_id"); - outTradeNo = readXMLString(d, "out_trade_no"); - attach = readXMLString(d, "attach"); - timeEnd = readXMLString(d, "time_end"); - version = readXMLString(d, "version"); - rateValue = readXMLString(d, "rate_value"); - signType = readXMLString(d, "sign_type"); + promotionDetail = readXmlString(d, "promotion_detail"); + deviceInfo = readXmlString(d, "device_info"); + openid = readXmlString(d, "openid"); + isSubscribe = readXmlString(d, "is_subscribe"); + subOpenid = readXmlString(d, "sub_openid"); + subIsSubscribe = readXmlString(d, "sub_is_subscribe"); + tradeType = readXmlString(d, "trade_type"); + bankType = readXmlString(d, "bank_type"); + totalFee = readXmlInteger(d, "total_fee"); + settlementTotalFee = readXmlInteger(d, "settlement_total_fee"); + feeType = readXmlString(d, "fee_type"); + cashFee = readXmlInteger(d, "cash_fee"); + cashFeeType = readXmlString(d, "cash_fee_type"); + couponFee = readXmlInteger(d, "coupon_fee"); + couponCount = readXmlInteger(d, "coupon_count"); + transactionId = readXmlString(d, "transaction_id"); + outTradeNo = readXmlString(d, "out_trade_no"); + attach = readXmlString(d, "attach"); + timeEnd = readXmlString(d, "time_end"); + version = readXmlString(d, "version"); + rateValue = readXmlString(d, "rate_value"); + signType = readXmlString(d, "sign_type"); composeCoupons(); } 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 d9f4cbd5f..6c650d143 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 @@ -86,7 +86,7 @@ public class WxPayRefundNotifyResult extends BaseWxPayResult implements Serializ @Override protected void loadXML(Document d) { - reqInfoString = readXMLString(d, "req_info"); + reqInfoString = readXmlString(d, "req_info"); } /** @@ -314,19 +314,19 @@ public class WxPayRefundNotifyResult extends BaseWxPayResult implements Serializ } public void loadXML(Document d) { - transactionId = readXMLString(d, "transaction_id"); - outTradeNo = readXMLString(d, "out_trade_no"); - refundId = readXMLString(d, "refund_id"); - outRefundNo = readXMLString(d, "out_refund_no"); - totalFee = readXMLInteger(d, "total_fee"); - settlementTotalFee = readXMLInteger(d, "settlement_total_fee"); - refundFee = readXMLInteger(d, "refund_fee"); - settlementRefundFee = readXMLInteger(d, "settlement_refund_fee"); - refundStatus = readXMLString(d, "refund_status"); - successTime = readXMLString(d, "success_time"); - refundRecvAccout = readXMLString(d, "refund_recv_accout"); - refundAccount = readXMLString(d, "refund_account"); - refundRequestSource = readXMLString(d, "refund_request_source"); + transactionId = readXmlString(d, "transaction_id"); + outTradeNo = readXmlString(d, "out_trade_no"); + refundId = readXmlString(d, "refund_id"); + outRefundNo = readXmlString(d, "out_refund_no"); + totalFee = readXmlInteger(d, "total_fee"); + settlementTotalFee = readXmlInteger(d, "settlement_total_fee"); + refundFee = readXmlInteger(d, "refund_fee"); + settlementRefundFee = readXmlInteger(d, "settlement_refund_fee"); + refundStatus = readXmlString(d, "refund_status"); + successTime = readXmlString(d, "success_time"); + refundRecvAccout = readXmlString(d, "refund_recv_accout"); + refundAccount = readXmlString(d, "refund_account"); + refundRequestSource = readXmlString(d, "refund_request_source"); } } 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 9c9c45137..d144a4b55 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 @@ -48,9 +48,9 @@ public class WxScanPayNotifyResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - openid = readXMLString(d, "openid"); - isSubscribe = readXMLString(d, "is_subscribe"); - productId = readXMLString(d, "product_id"); + 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 03dd6b212..5657d6ae8 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 @@ -80,14 +80,14 @@ public class ProfitSharingQueryResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - transactionId = readXMLString(d, "transaction_id"); - outOrderNo = readXMLString(d, "out_order_no"); - orderId = readXMLString(d, "order_id"); - status = readXMLString(d, "status"); - closeReason = readXMLString(d, "close_reason"); - receiversJson = readXMLString(d, "receivers"); - amount = readXMLInteger(d, "amount"); - description = readXMLString(d, "description"); + transactionId = readXmlString(d, "transaction_id"); + outOrderNo = readXmlString(d, "out_order_no"); + orderId = readXmlString(d, "order_id"); + status = readXmlString(d, "status"); + closeReason = readXmlString(d, "close_reason"); + receiversJson = readXmlString(d, "receivers"); + amount = readXmlInteger(d, "amount"); + description = readXmlString(d, "description"); } @Data 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 806632fe5..1a048df36 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 @@ -1,6 +1,5 @@ package com.github.binarywang.wxpay.bean.profitsharing; -import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest; import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; @@ -26,6 +25,6 @@ public class ProfitSharingReceiverResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - receiver = readXMLString(d, "receiver"); + 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 daea0e64d..0ca430ab3 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 @@ -34,8 +34,8 @@ public class ProfitSharingResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - transactionId = readXMLString(d, "transaction_id"); - outOrderNo = readXMLString(d, "out_order_no"); - orderId = readXMLString(d, "order_id"); + 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 2828d4ab8..d0531b61e 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 @@ -75,16 +75,16 @@ public class ProfitSharingReturnResult extends BaseWxPayResult { @Override protected void loadXML(Document d) { - orderId = readXMLString(d, "order_id"); - outOrderNo = readXMLString(d, "out_order_no"); - outReturnNo = readXMLString(d, "out_return_no"); - returnNo = readXMLString(d, "return_no"); - returnAccountType = readXMLString(d, "return_account_type"); - returnAccount = readXMLString(d, "return_account"); - returnAmount = readXMLInteger(d, "return_amount"); - description = readXMLString(d, "description"); - result = readXMLString(d, "result"); - failReason = readXMLString(d, "fail_reason"); - finishTime = readXMLString(d, "finish_time"); + orderId = readXmlString(d, "order_id"); + outOrderNo = readXmlString(d, "out_order_no"); + outReturnNo = readXmlString(d, "out_return_no"); + returnNo = readXmlString(d, "return_no"); + returnAccountType = readXmlString(d, "return_account_type"); + returnAccount = readXmlString(d, "return_account"); + returnAmount = readXmlInteger(d, "return_amount"); + description = readXmlString(d, "description"); + result = readXmlString(d, "result"); + failReason = readXmlString(d, "fail_reason"); + finishTime = readXmlString(d, "finish_time"); } } 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 d58f20fb1..bbba01bff 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 @@ -43,6 +43,8 @@ import org.w3c.dom.*; */ @Data public abstract class BaseWxPayResult implements Serializable { + private static final long serialVersionUID = -3559552761816864481L; + /** * 返回状态码. */ @@ -165,39 +167,45 @@ public abstract class BaseWxPayResult implements Serializable { * @param d Document */ private void loadBasicXML(Document d) { - returnCode = readXMLString(d, "return_code"); - returnMsg = readXMLString(d, "return_msg"); - resultCode = readXMLString(d, "result_code"); - errCode = readXMLString(d, "err_code"); - errCodeDes = readXMLString(d, "err_code_des"); - appid = readXMLString(d, "appid"); - mchId = readXMLString(d, "mch_id"); - subAppId = readXMLString(d, "sub_appid"); - subMchId = readXMLString(d, "sub_mch_id"); - nonceStr = readXMLString(d, "nonce_str"); - sign = readXMLString(d, "sign"); + returnCode = readXmlString(d, "return_code"); + returnMsg = readXmlString(d, "return_msg"); + resultCode = readXmlString(d, "result_code"); + errCode = readXmlString(d, "err_code"); + errCodeDes = readXmlString(d, "err_code_des"); + appid = readXmlString(d, "appid"); + mchId = readXmlString(d, "mch_id"); + subAppId = readXmlString(d, "sub_appid"); + subMchId = readXmlString(d, "sub_mch_id"); + nonceStr = readXmlString(d, "nonce_str"); + sign = readXmlString(d, "sign"); } - public static Integer readXMLInteger(Node d, String tagName) { - String content = readXMLString(d, tagName); - if (content == null || content.trim().length() == 0) return null; + protected static Integer readXmlInteger(Node d, String tagName) { + String content = readXmlString(d, tagName); + if (content == null || content.trim().length() == 0) { + return null; + } return Integer.parseInt(content); } - public static String readXMLString(Node d, String tagName) { - if (!d.hasChildNodes()) return null; + protected static String readXmlString(Node d, String tagName) { + if (!d.hasChildNodes()) { + return null; + } NodeList childNodes = d.getChildNodes(); for (int i = 0, j = childNodes.getLength(); i < j; i++) { Node node = childNodes.item(i); if (tagName.equals(node.getNodeName())) { - if (!node.hasChildNodes()) return null; + if (!node.hasChildNodes()) { + return null; + } return node.getFirstChild().getNodeValue(); } } return null; } - public static String readXMLString(Document d, String tagName) { + public static String readXmlString(Document d, String tagName) { NodeList elements = d.getElementsByTagName(tagName); if (elements == null || elements.getLength() == 0) { return null; @@ -210,9 +218,11 @@ public abstract class BaseWxPayResult implements Serializable { return node.getNodeValue(); } - public static Integer readXMLInteger(Document d, String tagName) { - String content = readXMLString(d, tagName); - if (content == null || content.trim().length() == 0) return null; + protected static Integer readXmlInteger(Document d, String tagName) { + String content = readXmlString(d, tagName); + 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 76526ff68..5bcc77d40 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 @@ -38,7 +38,7 @@ public class WxPayAuthcode2OpenidResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - openid = readXMLString(d, "openid"); + openid = readXmlString(d, "openid"); } } 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 53adb40d7..3a8ab40ea 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 @@ -42,8 +42,8 @@ public class WxPayFaceAuthInfoResult extends BaseWxPayResult implements Serializ */ @Override protected void loadXML(Document d) { - authinfo = readXMLString(d, "authinfo"); - expiresIn = readXMLString(d, "expires_in"); + 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 c19a92c48..989ba7f0c 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 @@ -250,23 +250,23 @@ public class WxPayFacepayResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - deviceInfo = readXMLString(d, "device_info"); - openid = readXMLString(d, "openid"); - isSubscribe = readXMLString(d, "is_subscribe"); - subOpenid = readXMLString(d, "sub_openid"); - subsSubscribe = readXMLString(d, "sub_is_subscribe"); - tradeType = readXMLString(d, "trade_type"); - bankType = readXMLString(d, "bank_type"); - feeType = readXMLString(d, "fee_type"); - totalFee = readXMLInteger(d, "total_fee"); - cashFeeType = readXMLString(d, "cash_fee_type"); - cashFee = readXMLInteger(d, "cash_fee"); - transactionId = readXMLString(d, "transaction_id"); - outTradeNo = readXMLString(d, "out_trade_no"); - detail = readXMLString(d, "detail"); - attach = readXMLString(d, "attach"); - promotionDetail = readXMLString(d, "promotion_detail"); - timeEnd = readXMLString(d, "time_end"); + deviceInfo = readXmlString(d, "device_info"); + openid = readXmlString(d, "openid"); + isSubscribe = readXmlString(d, "is_subscribe"); + subOpenid = readXmlString(d, "sub_openid"); + subsSubscribe = readXmlString(d, "sub_is_subscribe"); + tradeType = readXmlString(d, "trade_type"); + bankType = readXmlString(d, "bank_type"); + feeType = readXmlString(d, "fee_type"); + totalFee = readXmlInteger(d, "total_fee"); + cashFeeType = readXmlString(d, "cash_fee_type"); + cashFee = readXmlInteger(d, "cash_fee"); + transactionId = readXmlString(d, "transaction_id"); + outTradeNo = readXmlString(d, "out_trade_no"); + detail = readXmlString(d, "detail"); + attach = readXmlString(d, "attach"); + promotionDetail = readXmlString(d, "promotion_detail"); + timeEnd = readXmlString(d, "time_end"); } } 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 b7de7ffec..6a2a0630f 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 @@ -223,21 +223,21 @@ public class WxPayMicropayResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - openid = readXMLString(d, "openid"); - isSubscribe = readXMLString(d, "is_subscribe"); - tradeType = readXMLString(d, "trade_type"); - bankType = readXMLString(d, "bank_type"); - feeType = readXMLString(d, "fee_type"); - totalFee = readXMLInteger(d, "total_fee"); - settlementTotalFee = readXMLInteger(d, "settlement_total_fee"); - couponFee = readXMLInteger(d, "coupon_fee"); - cashFeeType = readXMLString(d, "cash_fee_type"); - cashFee = readXMLInteger(d, "cash_fee"); - transactionId = readXMLString(d, "transaction_id"); - outTradeNo = readXMLString(d, "out_trade_no"); - attach = readXMLString(d, "attach"); - timeEnd = readXMLString(d, "time_end"); - promotionDetail = readXMLString(d, "promotion_detail"); + openid = readXmlString(d, "openid"); + isSubscribe = readXmlString(d, "is_subscribe"); + tradeType = readXmlString(d, "trade_type"); + bankType = readXmlString(d, "bank_type"); + feeType = readXmlString(d, "fee_type"); + totalFee = readXmlInteger(d, "total_fee"); + settlementTotalFee = readXmlInteger(d, "settlement_total_fee"); + couponFee = readXmlInteger(d, "coupon_fee"); + cashFeeType = readXmlString(d, "cash_fee_type"); + cashFee = readXmlInteger(d, "cash_fee"); + transactionId = readXmlString(d, "transaction_id"); + outTradeNo = readXmlString(d, "out_trade_no"); + attach = readXmlString(d, "attach"); + timeEnd = readXmlString(d, "time_end"); + promotionDetail = readXmlString(d, "promotion_detail"); } } 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 a098cbb5f..0810816c1 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 @@ -33,7 +33,7 @@ public class WxPayOrderCloseResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - resultMsg = readXMLString(d, "result_msg"); + 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 2737dc2a6..2bc97ff08 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 @@ -342,25 +342,25 @@ public class WxPayOrderQueryResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - promotionDetail = readXMLString(d, "promotion_detail"); - deviceInfo = readXMLString(d, "device_info"); - openid = readXMLString(d, "openid"); - isSubscribe = readXMLString(d, "is_subscribe"); - tradeType = readXMLString(d, "trade_type"); - tradeState = readXMLString(d, "trade_state"); - bankType = readXMLString(d, "bank_type"); - totalFee = readXMLInteger(d, "total_fee"); - settlementTotalFee = readXMLInteger(d, "settlement_total_fee"); - feeType = readXMLString(d, "fee_type"); - cashFee = readXMLInteger(d, "cash_fee"); - cashFeeType = readXMLString(d, "cash_fee_type"); - couponFee = readXMLInteger(d, "coupon_fee"); - couponCount = readXMLInteger(d, "coupon_count"); - this.transactionId = readXMLString(d, "transaction_id"); - this.outTradeNo = readXMLString(d, "out_trade_no"); - this.attach = readXMLString(d, "attach"); - this.timeEnd = readXMLString(d, "time_end"); - this.tradeStateDesc = readXMLString(d, "trade_state_desc"); + promotionDetail = readXmlString(d, "promotion_detail"); + deviceInfo = readXmlString(d, "device_info"); + openid = readXmlString(d, "openid"); + isSubscribe = readXmlString(d, "is_subscribe"); + tradeType = readXmlString(d, "trade_type"); + tradeState = readXmlString(d, "trade_state"); + bankType = readXmlString(d, "bank_type"); + totalFee = readXmlInteger(d, "total_fee"); + settlementTotalFee = readXmlInteger(d, "settlement_total_fee"); + feeType = readXmlString(d, "fee_type"); + cashFee = readXmlInteger(d, "cash_fee"); + cashFeeType = readXmlString(d, "cash_fee_type"); + couponFee = readXmlInteger(d, "coupon_fee"); + couponCount = readXmlInteger(d, "coupon_count"); + this.transactionId = readXmlString(d, "transaction_id"); + this.outTradeNo = readXmlString(d, "out_trade_no"); + this.attach = readXmlString(d, "attach"); + this.timeEnd = readXmlString(d, "time_end"); + this.tradeStateDesc = readXmlString(d, "trade_state_desc"); } /** 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 210e9e4aa..77ad086be 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 @@ -40,7 +40,7 @@ public class WxPayOrderReverseResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - isRecall = readXMLString(d, "recall"); + isRecall = readXmlString(d, "recall"); } } 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 669e01f7f..0f4e5a91f 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 @@ -234,20 +234,20 @@ public class WxPayRedpackQueryResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - mchBillNo = readXMLString(d, "mch_billno"); - detailId = readXMLString(d, "detail_id"); - status = readXMLString(d, "status"); - sendType = readXMLString(d, "send_type"); - hbType = readXMLString(d, "hb_type"); - totalNum = readXMLInteger(d, "total_num"); - totalAmount = readXMLInteger(d, "total_amount"); - reason = readXMLString(d, "reason"); - sendTime = readXMLString(d, "send_time"); - refundTime = readXMLString(d, "refund_time"); - refundAmount = readXMLInteger(d, "refund_amount"); - wishing = readXMLString(d, "wishing"); - remark = readXMLString(d, "remark"); - actName = readXMLString(d, "act_name"); + mchBillNo = readXmlString(d, "mch_billno"); + detailId = readXmlString(d, "detail_id"); + status = readXmlString(d, "status"); + sendType = readXmlString(d, "send_type"); + hbType = readXmlString(d, "hb_type"); + totalNum = readXmlInteger(d, "total_num"); + totalAmount = readXmlInteger(d, "total_amount"); + reason = readXmlString(d, "reason"); + sendTime = readXmlString(d, "send_time"); + refundTime = readXmlString(d, "refund_time"); + refundAmount = readXmlInteger(d, "refund_amount"); + wishing = readXmlString(d, "wishing"); + remark = readXmlString(d, "remark"); + actName = readXmlString(d, "act_name"); NodeList nodeList = d.getElementsByTagName("hbinfo"); List list = new ArrayList<>(nodeList.getLength()); @@ -255,9 +255,9 @@ public class WxPayRedpackQueryResult extends BaseWxPayResult { for (int i = 0, j = nodeList.getLength(); i < j; i++) { Node node = nodeList.item(i); RedpackInfo rp = new RedpackInfo(); - rp.amount = readXMLInteger(node, "amount"); - rp.openid = readXMLString(node, "openid"); - rp.receiveTime = readXMLString(node, "rcv_time"); + rp.amount = readXmlInteger(node, "amount"); + rp.openid = readXmlString(node, "openid"); + rp.receiveTime = readXmlString(node, "rcv_time"); list.add(rp); } 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 ecdf933b6..9a60368f1 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 @@ -180,14 +180,14 @@ public class WxPayRefundQueryResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - deviceInfo = readXMLString(d, "device_info"); - transactionId = readXMLString(d, "transaction_id"); - outTradeNo = readXMLString(d, "out_trade_no"); - totalFee = readXMLInteger(d, "total_fee"); - settlementTotalFee = readXMLInteger(d, "settlement_total_fee"); - feeType = readXMLString(d, "fee_type"); - cashFee = readXMLInteger(d, "cash_fee"); - refundCount = readXMLInteger(d, "refund_count"); + deviceInfo = readXmlString(d, "device_info"); + transactionId = readXmlString(d, "transaction_id"); + outTradeNo = readXmlString(d, "out_trade_no"); + totalFee = readXmlInteger(d, "total_fee"); + settlementTotalFee = readXmlInteger(d, "settlement_total_fee"); + feeType = readXmlString(d, "fee_type"); + cashFee = readXmlInteger(d, "cash_fee"); + refundCount = readXmlInteger(d, "refund_count"); } /** 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 57fb33359..cdb9fc70e 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 @@ -148,20 +148,20 @@ public class WxPayRefundResult extends BaseWxPayResult implements Serializable { */ @Override protected void loadXML(Document d) { - transactionId = readXMLString(d, "transaction_id"); - outTradeNo = readXMLString(d, "out_trade_no"); - outRefundNo = readXMLString(d, "out_refund_no"); - refundId = readXMLString(d, "refund_id"); - refundFee = readXMLInteger(d, "refund_fee"); - settlementRefundFee = readXMLInteger(d, "settlement_refund_fee"); - totalFee = readXMLInteger(d, "total_fee"); - settlementTotalFee = readXMLInteger(d, "settlement_total_fee"); - feeType = readXMLString(d, "fee_type"); - cashFee = readXMLInteger(d, "cash_fee"); - cashFeeType = readXMLString(d, "cash_fee_type"); - cashRefundFee = readXMLInteger(d, "cash_refund_fee"); - couponRefundCount = readXMLInteger(d, "coupon_refund_count"); - couponRefundFee = readXMLInteger(d, "coupon_refund_fee"); + transactionId = readXmlString(d, "transaction_id"); + outTradeNo = readXmlString(d, "out_trade_no"); + outRefundNo = readXmlString(d, "out_refund_no"); + refundId = readXmlString(d, "refund_id"); + refundFee = readXmlInteger(d, "refund_fee"); + settlementRefundFee = readXmlInteger(d, "settlement_refund_fee"); + totalFee = readXmlInteger(d, "total_fee"); + settlementTotalFee = readXmlInteger(d, "settlement_total_fee"); + feeType = readXmlString(d, "fee_type"); + cashFee = readXmlInteger(d, "cash_fee"); + cashFeeType = readXmlString(d, "cash_fee_type"); + cashRefundFee = readXmlInteger(d, "cash_refund_fee"); + couponRefundCount = readXmlInteger(d, "coupon_refund_count"); + couponRefundFee = readXmlInteger(d, "coupon_refund_fee"); } } 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 b1af69c6b..dfa604ddf 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 @@ -39,7 +39,7 @@ public class WxPaySandboxSignKeyResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - sandboxSignKey = readXMLString(d, "sandbox_signkey"); + 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 c707fee7f..c58e1c02a 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 @@ -56,11 +56,11 @@ public class WxPaySendMiniProgramRedpackResult extends BaseWxPayResult implement @Override protected void loadXML(Document d) { - mchBillNo = readXMLString(d, "mch_billno"); - wxAppid = readXMLString(d, "wxappid"); - reOpenid = readXMLString(d, "re_openid"); - totalAmount = readXMLInteger(d, "total_amount"); - packageName = readXMLString(d, "package"); - sendListId = readXMLString(d, "send_listid"); + mchBillNo = readXmlString(d, "mch_billno"); + wxAppid = readXmlString(d, "wxappid"); + reOpenid = readXmlString(d, "re_openid"); + totalAmount = readXmlInteger(d, "total_amount"); + packageName = readXmlString(d, "package"); + sendListId = readXmlString(d, "send_listid"); } } 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 49390da89..fd786d9f2 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 @@ -46,12 +46,12 @@ public class WxPaySendRedpackResult extends BaseWxPayResult implements Serializa */ @Override 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"); + 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"); } } 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 b213024ed..55463d655 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 @@ -39,7 +39,7 @@ public class WxPayShorturlResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - shortUrl = readXMLString(d, "short_url"); + 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 3345f0c0f..19e8be1cb 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 @@ -51,10 +51,10 @@ public class WxPayUnifiedOrderResult extends BaseWxPayResult { */ @Override protected void loadXML(Document d) { - prepayId = readXMLString(d, "prepay_id"); - tradeType = readXMLString(d, "trade_type"); - mwebUrl = readXMLString(d, "mweb_url"); - codeURL = readXMLString(d, "code_url"); + prepayId = readXmlString(d, "prepay_id"); + tradeType = readXmlString(d, "trade_type"); + mwebUrl = readXmlString(d, "mweb_url"); + codeURL = readXmlString(d, "code_url"); } }