Skip to content

Commit eb6a578

Browse files
binarywangbinarywang
committed
🎨 规范优化部分代码
1 parent b95045b commit eb6a578

33 files changed

Lines changed: 301 additions & 292 deletions

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -230,21 +230,21 @@ public class WxPayCouponInfoQueryResult extends BaseWxPayResult {
230230

231231
@Override
232232
protected void loadXML(Document d) {
233-
deviceInfo = readXMLString(d, "device_info");
234-
couponStockId = readXMLString(d, "coupon_stock_id");
235-
couponId = readXMLString(d, "coupon_id");
236-
couponValue = readXMLInteger(d, "coupon_value");
237-
couponMinimum = readXMLInteger(d, "coupon_minimum");
238-
couponName = readXMLString(d, "coupon_name");
239-
couponState = readXMLString(d, "coupon_state");
240-
couponDesc = readXMLString(d, "coupon_desc");
241-
couponUseValue = readXMLInteger(d, "coupon_use_value");
242-
couponRemainValue = readXMLInteger(d, "coupon_remain_value");
243-
beginTime = readXMLString(d, "begin_time");
244-
endTime = readXMLString(d, "end_time");
245-
sendTime = readXMLString(d, "send_time");
246-
consumerMchId = readXMLString(d, "consumer_mch_id");
247-
sendSource = readXMLString(d, "send_source");
248-
isPartialUse = readXMLString(d, "is_partial_use");
233+
deviceInfo = readXmlString(d, "device_info");
234+
couponStockId = readXmlString(d, "coupon_stock_id");
235+
couponId = readXmlString(d, "coupon_id");
236+
couponValue = readXmlInteger(d, "coupon_value");
237+
couponMinimum = readXmlInteger(d, "coupon_minimum");
238+
couponName = readXmlString(d, "coupon_name");
239+
couponState = readXmlString(d, "coupon_state");
240+
couponDesc = readXmlString(d, "coupon_desc");
241+
couponUseValue = readXmlInteger(d, "coupon_use_value");
242+
couponRemainValue = readXmlInteger(d, "coupon_remain_value");
243+
beginTime = readXmlString(d, "begin_time");
244+
endTime = readXmlString(d, "end_time");
245+
sendTime = readXmlString(d, "send_time");
246+
consumerMchId = readXmlString(d, "consumer_mch_id");
247+
sendSource = readXmlString(d, "send_source");
248+
isPartialUse = readXmlString(d, "is_partial_use");
249249
}
250250
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ public class WxPayCouponSendResult extends BaseWxPayResult {
139139

140140
@Override
141141
protected void loadXML(Document d) {
142-
deviceInfo = readXMLString(d, "device_info");
143-
couponStockId = readXMLString(d, "coupon_stock_id");
144-
respCount = readXMLInteger(d, "resp_count");
145-
successCount = readXMLInteger(d, "success_count");
146-
failedCount = readXMLInteger(d, "failed_count");
147-
openid = readXMLString(d, "openid");
148-
retCode = readXMLString(d, "ret_code");
149-
couponId = readXMLString(d, "coupon_id");
150-
retMsg = readXMLString(d, "ret_msg");
142+
deviceInfo = readXmlString(d, "device_info");
143+
couponStockId = readXmlString(d, "coupon_stock_id");
144+
respCount = readXmlInteger(d, "resp_count");
145+
successCount = readXmlInteger(d, "success_count");
146+
failedCount = readXmlInteger(d, "failed_count");
147+
openid = readXmlString(d, "openid");
148+
retCode = readXmlString(d, "ret_code");
149+
couponId = readXmlString(d, "coupon_id");
150+
retMsg = readXmlString(d, "ret_msg");
151151
}
152152
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -194,18 +194,18 @@ public class WxPayCouponStockQueryResult extends BaseWxPayResult {
194194

195195
@Override
196196
protected void loadXML(Document d) {
197-
deviceInfo = readXMLString(d, "device_info");
198-
couponStockId = readXMLString(d, "coupon_stock_id");
199-
couponName = readXMLString(d, "coupon_name");
200-
couponValue = readXMLInteger(d, "coupon_value");
201-
couponMinimum = readXMLInteger(d, "coupon_mininumn");
202-
couponStockStatus = readXMLInteger(d, "coupon_stock_status");
203-
couponTotal = readXMLInteger(d, "coupon_total");
204-
maxQuota = readXMLInteger(d, "max_quota");
205-
isSendNum = readXMLInteger(d, "is_send_num");
206-
beginTime = readXMLString(d, "begin_time");
207-
endTime = readXMLString(d, "end_time");
208-
createTime = readXMLString(d, "create_time");
209-
couponBudget = readXMLInteger(d, "coupon_budget");
197+
deviceInfo = readXmlString(d, "device_info");
198+
couponStockId = readXmlString(d, "coupon_stock_id");
199+
couponName = readXmlString(d, "coupon_name");
200+
couponValue = readXmlInteger(d, "coupon_value");
201+
couponMinimum = readXmlInteger(d, "coupon_mininumn");
202+
couponStockStatus = readXmlInteger(d, "coupon_stock_status");
203+
couponTotal = readXmlInteger(d, "coupon_total");
204+
maxQuota = readXmlInteger(d, "max_quota");
205+
isSendNum = readXmlInteger(d, "is_send_num");
206+
beginTime = readXmlString(d, "begin_time");
207+
endTime = readXmlString(d, "end_time");
208+
createTime = readXmlString(d, "create_time");
209+
couponBudget = readXmlInteger(d, "coupon_budget");
210210
}
211211
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ public class EntPayBankQueryResult extends BaseWxPayResult {
9696

9797
@Override
9898
protected void loadXML(Document d) {
99-
partnerTradeNo = readXMLString(d, "partner_trade_no");
100-
paymentNo = readXMLString(d, "payment_no");
101-
bankNoMd5 = readXMLString(d, "bank_no_md5");
102-
trueNameMd5 = readXMLString(d, "true_name_md5");
103-
amount = readXMLInteger(d, "amount");
104-
status = readXMLString(d, "status");
105-
cmmsAmount = readXMLInteger(d, "cmms_amt");
106-
createTime = readXMLString(d, "create_time");
107-
paySuccessTime = readXMLString(d, "pay_succ_time");
108-
failReason = readXMLString(d, "reason");
99+
partnerTradeNo = readXmlString(d, "partner_trade_no");
100+
paymentNo = readXmlString(d, "payment_no");
101+
bankNoMd5 = readXmlString(d, "bank_no_md5");
102+
trueNameMd5 = readXmlString(d, "true_name_md5");
103+
amount = readXmlInteger(d, "amount");
104+
status = readXmlString(d, "status");
105+
cmmsAmount = readXmlInteger(d, "cmms_amt");
106+
createTime = readXmlString(d, "create_time");
107+
paySuccessTime = readXmlString(d, "pay_succ_time");
108+
failReason = readXmlString(d, "reason");
109109
}
110110
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public class EntPayBankResult extends BaseWxPayResult {
5151

5252
@Override
5353
protected void loadXML(Document d) {
54-
amount = readXMLInteger(d, "amount");
55-
partnerTradeNo = readXMLString(d, "partner_trade_no");
56-
paymentNo = readXMLString(d, "payment_no");
57-
cmmsAmount = readXMLInteger(d, "cmms_amt");
54+
amount = readXmlInteger(d, "amount");
55+
partnerTradeNo = readXmlString(d, "partner_trade_no");
56+
paymentNo = readXmlString(d, "payment_no");
57+
cmmsAmount = readXmlInteger(d, "cmms_amt");
5858
}
5959
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public class EntPayQueryResult extends BaseWxPayResult {
8484

8585
@Override
8686
protected void loadXML(Document d) {
87-
partnerTradeNo = readXMLString(d, "partner_trade_no");
88-
detailId = readXMLString(d, "detail_id");
89-
status = readXMLString(d, "status");
90-
reason = readXMLString(d, "reason");
91-
openid = readXMLString(d, "openid");
92-
transferName = readXMLString(d, "transfer_name");
93-
paymentAmount = readXMLInteger(d, "payment_amount");
94-
transferTime = readXMLString(d, "transfer_time");
95-
paymentTime = readXMLString(d, "payment_time");
96-
desc = readXMLString(d, "desc");
87+
partnerTradeNo = readXmlString(d, "partner_trade_no");
88+
detailId = readXmlString(d, "detail_id");
89+
status = readXmlString(d, "status");
90+
reason = readXmlString(d, "reason");
91+
openid = readXmlString(d, "openid");
92+
transferName = readXmlString(d, "transfer_name");
93+
paymentAmount = readXmlInteger(d, "payment_amount");
94+
transferTime = readXmlString(d, "transfer_time");
95+
paymentTime = readXmlString(d, "payment_time");
96+
desc = readXmlString(d, "desc");
9797
}
9898
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,22 @@ public class EntPayRedpackQueryResult extends BaseWxPayResult {
133133

134134
@Override
135135
protected void loadXML(Document d) {
136-
mchBillNo = readXMLString(d, "mch_billno");
137-
detailId = readXMLString(d, "detailId");
138-
status = readXMLString(d, "status");
139-
sendType = readXMLString(d, "send_type");
140-
totalAmount = readXMLInteger(d, "total_amount");
141-
reason = readXMLInteger(d, "reason");
142-
sendTime = readXMLString(d, "send_time");
143-
refundTime = readXMLString(d, "refund_time");
144-
refundAmount = readXMLInteger(d, "refund_amount");
145-
wishing = readXMLString(d, "wishing");
146-
remark = readXMLString(d, "remark");
147-
actName = readXMLString(d, "act_name");
148-
openid = readXMLString(d, "openid");
149-
amount = readXMLInteger(d, "amount");
150-
rcvTime = readXMLInteger(d, "rcv_time");
151-
senderName = readXMLInteger(d, "sender_name");
152-
senderHeaderMediaId = readXMLInteger(d, "sender_header_media_id");
136+
mchBillNo = readXmlString(d, "mch_billno");
137+
detailId = readXmlString(d, "detailId");
138+
status = readXmlString(d, "status");
139+
sendType = readXmlString(d, "send_type");
140+
totalAmount = readXmlInteger(d, "total_amount");
141+
reason = readXmlInteger(d, "reason");
142+
sendTime = readXmlString(d, "send_time");
143+
refundTime = readXmlString(d, "refund_time");
144+
refundAmount = readXmlInteger(d, "refund_amount");
145+
wishing = readXmlString(d, "wishing");
146+
remark = readXmlString(d, "remark");
147+
actName = readXmlString(d, "act_name");
148+
openid = readXmlString(d, "openid");
149+
amount = readXmlInteger(d, "amount");
150+
rcvTime = readXmlInteger(d, "rcv_time");
151+
senderName = readXmlInteger(d, "sender_name");
152+
senderHeaderMediaId = readXmlInteger(d, "sender_header_media_id");
153153
}
154154
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ public class EntPayRedpackResult extends BaseWxPayResult implements Serializable
8181

8282
@Override
8383
protected void loadXML(Document d) {
84-
mchBillNo = readXMLString(d, "mch_billno");
85-
mchId = readXMLString(d, "mch_id");
86-
wxAppId = readXMLString(d, "wxappid");
87-
reOpenid = readXMLString(d, "re_openid");
88-
totalAmount = readXMLString(d, "totalAmount");
89-
sendListId = readXMLString(d, "sendListid");
90-
senderName = readXMLString(d, "sender_name");
91-
senderHeaderMediaId = readXMLString(d, "sender_header_media_id");
84+
mchBillNo = readXmlString(d, "mch_billno");
85+
mchId = readXmlString(d, "mch_id");
86+
wxAppId = readXmlString(d, "wxappid");
87+
reOpenid = readXmlString(d, "re_openid");
88+
totalAmount = readXmlString(d, "totalAmount");
89+
sendListId = readXmlString(d, "sendListid");
90+
senderName = readXmlString(d, "sender_name");
91+
senderHeaderMediaId = readXmlString(d, "sender_header_media_id");
9292
}
9393
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public class EntPayResult extends BaseWxPayResult {
6161

6262
@Override
6363
protected void loadXML(Document d) {
64-
mchId = readXMLString(d, "mchid");
65-
mchAppid = readXMLString(d, "mch_appid");
66-
deviceInfo = readXMLString(d, "device_info");
67-
partnerTradeNo = readXMLString(d, "partner_trade_no");
68-
paymentNo = readXMLString(d, "payment_no");
69-
paymentTime = readXMLString(d, "payment_time");
64+
mchId = readXmlString(d, "mchid");
65+
mchAppid = readXmlString(d, "mch_appid");
66+
deviceInfo = readXmlString(d, "device_info");
67+
partnerTradeNo = readXmlString(d, "partner_trade_no");
68+
paymentNo = readXmlString(d, "payment_no");
69+
paymentTime = readXmlString(d, "payment_time");
7070
}
7171
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class GetPublicKeyResult extends BaseWxPayResult {
3232

3333
@Override
3434
protected void loadXML(Document d) {
35-
mchId = readXMLString(d, "mch_id");
36-
pubKey = readXMLString(d, "pub_key");
35+
mchId = readXmlString(d, "mch_id");
36+
pubKey = readXmlString(d, "pub_key");
3737
}
3838
}

0 commit comments

Comments
 (0)