lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-05-05 05:07:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 规范优化部分代码

Browse Source
This commit is contained in:
Binary Wang 2020-05-28 22:32:18 +08:00
parent b95045b3a7
commit eb6a578e1e
33 changed files with 301 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java
View File

@ -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");
}
}

18
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java
View File

@ -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");
}
}

26
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java
View File

@ -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");
}
}

20
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java
View File

@ -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");
}
}

8
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java
View File

@ -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");
}
}

20
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java
View File

@ -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");
}
}

34
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java
View File

@ -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");
}
}

16
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java
View File

@ -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");
}
}

12
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java
View File

@ -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");
}
}

4
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java
View File

@ -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");
}
}

44
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java
View File

@ -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();
}

28
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java
View File

@ -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");
}
}

6
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java
View File

@ -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");
}
}

16
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
View File

@ -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

3
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReceiverResult.java
View File

@ -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");
}
}

6
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingResult.java
View File

@ -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");
}
}

22
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReturnResult.java
View File

@ -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");
}
}

52
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java
View File

@ -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);
}

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java
View File

@ -38,7 +38,7 @@ public class WxPayAuthcode2OpenidResult extends BaseWxPayResult {
*/
@Override
protected void loadXML(Document d) {
openid = readXMLString(d, "openid");
openid = readXmlString(d, "openid");
}
}

4
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java
View File

@ -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");
}
}

34
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFacepayResult.java
View File

@ -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");
}
}

30
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java
View File

@ -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");
}
}

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java
View File

@ -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");
}
}

38
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
View File

@ -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");
}
/**

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java
View File

@ -40,7 +40,7 @@ public class WxPayOrderReverseResult extends BaseWxPayResult {
*/
@Override
protected void loadXML(Document d) {
isRecall = readXMLString(d, "recall");
isRecall = readXmlString(d, "recall");
}
}

34
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
View File

@ -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<RedpackInfo> 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);
}

16
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java
View File

@ -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");
}
/**

28
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java
View File

@ -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");
}
}

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java
View File

@ -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");
}
}

12
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendMiniProgramRedpackResult.java
View File

@ -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");
}
}

12
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java
View File

@ -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");
}
}

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java
View File

@ -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");
}
}

8
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java
View File

@ -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");
}
}