Skip to content

Commit 2d072e9

Browse files
binarywangbinarywang
committed
重构简化方法命名
1 parent 8500368 commit 2d072e9

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public Map<String, String> toMap() {
207207
return result;
208208
}
209209

210-
private String getXmlValueIfExists(XmlPath xmlPath, String path) {
210+
private String getXmlValue(XmlPath xmlPath, String path) {
211211
if (xmlPath.get(path) instanceof NodeChildrenImpl) {
212212
if (((NodeChildrenImpl) xmlPath.get(path)).size() == 0) {
213213
return null;
@@ -217,8 +217,8 @@ private String getXmlValueIfExists(XmlPath xmlPath, String path) {
217217
return xmlPath.getString(path);
218218
}
219219

220-
protected <T> T getXmlValueIfExists(XmlPath xmlPath, String path, Class<T> clz) {
221-
String value = this.getXmlValueIfExists(xmlPath, path);
220+
protected <T> T getXmlValue(XmlPath xmlPath, String path, Class<T> clz) {
221+
String value = this.getXmlValue(xmlPath, path);
222222
if (value == null) {
223223
return null;
224224
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderQueryResult.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,9 @@ public void composeCoupons() {
397397
this.coupons = Lists.newArrayList();
398398
XmlPath xmlPath = new XmlPath(this.getXmlString());
399399
for (int i = 0; i < this.couponCount; i++){
400-
this.coupons.add(new Coupon(this.getXmlValueIfExists(xmlPath, "xml.coupon_type_" + i, String.class),
401-
this.getXmlValueIfExists(xmlPath, "xml.coupon_id_" + i, String.class),
402-
this.getXmlValueIfExists(xmlPath, "xml.coupon_fee_" + i, Integer.class)));
400+
this.coupons.add(new Coupon(this.getXmlValue(xmlPath, "xml.coupon_type_" + i, String.class),
401+
this.getXmlValue(xmlPath, "xml.coupon_id_" + i, String.class),
402+
this.getXmlValue(xmlPath, "xml.coupon_fee_" + i, Integer.class)));
403403
}
404404
}
405405
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResult.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,16 @@ public void composeRefundRecords() {
196196
RefundRecord refundRecord = new RefundRecord();
197197
this.refundRecords.add(refundRecord);
198198

199-
refundRecord.setOutRefundNo(this.getXmlValueIfExists(xmlPath, "xml.out_refund_no_" + i, String.class));
200-
refundRecord.setRefundId(this.getXmlValueIfExists(xmlPath, "xml.refund_id_" + i, String.class));
201-
refundRecord.setRefundChannel(this.getXmlValueIfExists(xmlPath, "xml.refund_channel_" + i, String.class));
202-
refundRecord.setRefundFee(this.getXmlValueIfExists(xmlPath, "xml.refund_fee_" + i, Integer.class));
203-
refundRecord.setSettlementRefundFee(this.getXmlValueIfExists(xmlPath, "xml.settlement_refund_fee_" + i, Integer.class));
204-
refundRecord.setCouponType(this.getXmlValueIfExists(xmlPath, "xml.coupon_type_" + i, String.class));
205-
refundRecord.setCouponRefundFee(this.getXmlValueIfExists(xmlPath, "xml.coupon_refund_fee_" + i, Integer.class));
206-
refundRecord.setCouponRefundCount(this.getXmlValueIfExists(xmlPath, "xml.coupon_refund_count_" + i, Integer.class));
207-
refundRecord.setRefundStatus(this.getXmlValueIfExists(xmlPath, "xml.refund_status_" + i, String.class));
208-
refundRecord.setRefundRecvAccout(this.getXmlValueIfExists(xmlPath, "xml.refund_recv_accout_" + i, String.class));
199+
refundRecord.setOutRefundNo(this.getXmlValue(xmlPath, "xml.out_refund_no_" + i, String.class));
200+
refundRecord.setRefundId(this.getXmlValue(xmlPath, "xml.refund_id_" + i, String.class));
201+
refundRecord.setRefundChannel(this.getXmlValue(xmlPath, "xml.refund_channel_" + i, String.class));
202+
refundRecord.setRefundFee(this.getXmlValue(xmlPath, "xml.refund_fee_" + i, Integer.class));
203+
refundRecord.setSettlementRefundFee(this.getXmlValue(xmlPath, "xml.settlement_refund_fee_" + i, Integer.class));
204+
refundRecord.setCouponType(this.getXmlValue(xmlPath, "xml.coupon_type_" + i, String.class));
205+
refundRecord.setCouponRefundFee(this.getXmlValue(xmlPath, "xml.coupon_refund_fee_" + i, Integer.class));
206+
refundRecord.setCouponRefundCount(this.getXmlValue(xmlPath, "xml.coupon_refund_count_" + i, Integer.class));
207+
refundRecord.setRefundStatus(this.getXmlValue(xmlPath, "xml.refund_status_" + i, String.class));
208+
refundRecord.setRefundRecvAccout(this.getXmlValue(xmlPath, "xml.refund_recv_accout_" + i, String.class));
209209

210210
if (refundRecord.getCouponRefundCount() == null || refundRecord.getCouponRefundCount() == 0) {
211211
continue;
@@ -215,8 +215,8 @@ public void composeRefundRecords() {
215215
for (int j = 0; j < refundRecord.getCouponRefundCount(); j++) {
216216
coupons.add(
217217
new RefundRecord.RefundCoupon(
218-
this.getXmlValueIfExists(xmlPath, "xml.coupon_refund_id_" + i + "_" + j, String.class),
219-
this.getXmlValueIfExists(xmlPath, "xml.coupon_refund_fee_" + i + "_" + j, Integer.class)
218+
this.getXmlValue(xmlPath, "xml.coupon_refund_id_" + i + "_" + j, String.class),
219+
this.getXmlValue(xmlPath, "xml.coupon_refund_fee_" + i + "_" + j, Integer.class)
220220
)
221221
);
222222
}

0 commit comments

Comments
 (0)