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

优化微信支付代码，避免过度检查

Browse Source
This commit is contained in:
Binary Wang 2017-09-25 15:38:40 +08:00
parent 6cabfc3e12
commit 57eab45c81
2 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,8 +215,10 @@ public abstract class WxPayBaseResult {
/** /**
* 校验返回结果签名 * 校验返回结果签名
*
* @param checkSuccess 是否同时检查结果是否成功
*/ */
public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayException { public void checkResult(WxPayServiceAbstractImpl wxPayService, boolean checkSuccess) throws WxPayException {
//校验返回结果签名 //校验返回结果签名
Map<String, String> map = toMap(); Map<String, String> map = toMap();
if (getSign() != null && !SignUtils.checkSign(map, wxPayService.getConfig().getMchKey())) { if (getSign() != null && !SignUtils.checkSign(map, wxPayService.getConfig().getMchKey())) {
@ -224,29 +226,31 @@ public abstract class WxPayBaseResult {
throw new WxPayException("参数格式校验错误！"); throw new WxPayException("参数格式校验错误！");
} }
List<String> successStrings = Lists.newArrayList("SUCCESS", "");
//校验结果是否成功 //校验结果是否成功
if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase()) if (checkSuccess) {
|| !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) { List<String> successStrings = Lists.newArrayList("SUCCESS", "");
StringBuilder errorMsg = new StringBuilder(); if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase())
if (getReturnCode() != null) { || !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) {
errorMsg.append("返回代码：").append(getReturnCode()); StringBuilder errorMsg = new StringBuilder();
} if (getReturnCode() != null) {
if (getReturnMsg() != null) { errorMsg.append("返回代码：").append(getReturnCode());
errorMsg.append("，返回信息：").append(getReturnMsg()); }
} if (getReturnMsg() != null) {
if (getResultCode() != null) { errorMsg.append("，返回信息：").append(getReturnMsg());
errorMsg.append("，结果代码：").append(getResultCode()); }
} if (getResultCode() != null) {
if (getErrCode() != null) { errorMsg.append("，结果代码：").append(getResultCode());
errorMsg.append("，错误代码：").append(getErrCode()); }
} if (getErrCode() != null) {
if (getErrCodeDes() != null) { errorMsg.append("，错误代码：").append(getErrCode());
errorMsg.append("，错误详情：").append(getErrCodeDes()); }
} if (getErrCodeDes() != null) {
errorMsg.append("，错误详情：").append(getErrCodeDes());
}
this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}", map, errorMsg.toString()); this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}", map, errorMsg.toString());
throw WxPayException.from(this); throw WxPayException.from(this);
}
} }
} }
} }

37
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
View File

@ -77,7 +77,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/secapi/pay/refund"; String url = this.getPayBaseUrl() + "/secapi/pay/refund";
String responseContent = this.post(url, request.toXML(), true); String responseContent = this.post(url, request.toXML(), true);
WxPayRefundResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundResult.class); WxPayRefundResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -96,7 +96,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayRefundQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundQueryResult.class); WxPayRefundQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundQueryResult.class);
result.composeRefundRecords(); result.composeRefundRecords();
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -112,7 +112,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
log.debug("微信支付异步通知请求参数：{}", xmlData); log.debug("微信支付异步通知请求参数：{}", xmlData);
WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData); WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
log.debug("微信支付异步通知请求解析后的对象：{}", result); log.debug("微信支付异步通知请求解析后的对象：{}", result);
result.checkResult(this); result.checkResult(this, false);
return result; return result;
} catch (WxPayException e) { } catch (WxPayException e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -163,7 +163,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo"; String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo";
String responseContent = this.post(url, request.toXML(), true); String responseContent = this.post(url, request.toXML(), true);
WxPayRedpackQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRedpackQueryResult.class); WxPayRedpackQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRedpackQueryResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -182,7 +182,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
WxPayOrderQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderQueryResult.class); WxPayOrderQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderQueryResult.class);
result.composeCoupons(); result.composeCoupons();
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -199,7 +199,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/pay/closeorder"; String url = this.getPayBaseUrl() + "/pay/closeorder";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayOrderCloseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderCloseResult.class); WxPayOrderCloseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderCloseResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -272,11 +272,12 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/pay/unifiedorder"; String url = this.getPayBaseUrl() + "/pay/unifiedorder";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayUnifiedOrderResult result = WxPayBaseResult.fromXML(responseContent, WxPayUnifiedOrderResult.class); WxPayUnifiedOrderResult result = WxPayBaseResult.fromXML(responseContent, WxPayUnifiedOrderResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@Override @Override
@Deprecated
public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws WxPayException { public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws WxPayException {
WxPayUnifiedOrderResult unifiedOrderResult = this.unifiedOrder(request); WxPayUnifiedOrderResult unifiedOrderResult = this.unifiedOrder(request);
String prepayId = unifiedOrderResult.getPrepayId(); String prepayId = unifiedOrderResult.getPrepayId();
@ -331,7 +332,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String responseContent = this.post(url, request.toXML(), true); String responseContent = this.post(url, request.toXML(), true);
WxEntPayResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayResult.class); WxEntPayResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -344,7 +345,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gettransferinfo"; String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gettransferinfo";
String responseContent = this.post(url, request.toXML(), true); String responseContent = this.post(url, request.toXML(), true);
WxEntPayQueryResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayQueryResult.class); WxEntPayQueryResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayQueryResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -396,7 +397,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/payitil/report"; String url = this.getPayBaseUrl() + "/payitil/report";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class); WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
result.checkResult(this); result.checkResult(this, true);
} }
@Override @Override
@ -494,7 +495,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/pay/micropay"; String url = this.getPayBaseUrl() + "/pay/micropay";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayMicropayResult result = WxPayBaseResult.fromXML(responseContent, WxPayMicropayResult.class); WxPayMicropayResult result = WxPayBaseResult.fromXML(responseContent, WxPayMicropayResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -505,7 +506,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/secapi/pay/reverse"; String url = this.getPayBaseUrl() + "/secapi/pay/reverse";
String responseContent = this.post(url, request.toXML(), true); String responseContent = this.post(url, request.toXML(), true);
WxPayOrderReverseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderReverseResult.class); WxPayOrderReverseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderReverseResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -516,7 +517,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/tools/shorturl"; String url = this.getPayBaseUrl() + "/tools/shorturl";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class); WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class);
result.checkResult(this); result.checkResult(this, true);
return result.getShortUrl(); return result.getShortUrl();
} }
@ -532,7 +533,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/tools/authcodetoopenid"; String url = this.getPayBaseUrl() + "/tools/authcodetoopenid";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayAuthcode2OpenidResult result = WxPayBaseResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class); WxPayAuthcode2OpenidResult result = WxPayBaseResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class);
result.checkResult(this); result.checkResult(this, true);
return result.getOpenid(); return result.getOpenid();
} }
@ -549,7 +550,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey"; String url = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPaySandboxSignKeyResult result = WxPayBaseResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class); WxPaySandboxSignKeyResult result = WxPayBaseResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class);
result.checkResult(this); result.checkResult(this, true);
return result.getSandboxSignKey(); return result.getSandboxSignKey();
} }
@ -560,7 +561,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/mmpaymkttransfers/send_coupon"; String url = this.getPayBaseUrl() + "/mmpaymkttransfers/send_coupon";
String responseContent = this.post(url, request.toXML(), true); String responseContent = this.post(url, request.toXML(), true);
WxPayCouponSendResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponSendResult.class); WxPayCouponSendResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponSendResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -571,7 +572,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/mmpaymkttransfers/query_coupon_stock"; String url = this.getPayBaseUrl() + "/mmpaymkttransfers/query_coupon_stock";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayCouponStockQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponStockQueryResult.class); WxPayCouponStockQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponStockQueryResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }
@ -582,7 +583,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String url = this.getPayBaseUrl() + "/mmpaymkttransfers/querycouponsinfo"; String url = this.getPayBaseUrl() + "/mmpaymkttransfers/querycouponsinfo";
String responseContent = this.post(url, request.toXML(), false); String responseContent = this.post(url, request.toXML(), false);
WxPayCouponInfoQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponInfoQueryResult.class); WxPayCouponInfoQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponInfoQueryResult.class);
result.checkResult(this); result.checkResult(this, true);
return result; return result;
} }