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

优化代码

Browse Source
This commit is contained in:
Binary Wang 2017-10-30 10:52:54 +08:00
parent 05a680c98b
commit 5231f8c969
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,14 +213,13 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
String timestamp = String.valueOf(System.currentTimeMillis() / 1000); String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
String nonceStr = String.valueOf(System.currentTimeMillis()); String nonceStr = String.valueOf(System.currentTimeMillis());
Object payResult = null;
switch (request.getTradeType()) { switch (request.getTradeType()) {
case TradeType.NATIVE: { case TradeType.NATIVE: {
payResult = WxPayNativeOrderResult.builder() return (T) WxPayNativeOrderResult.builder()
.codeUrl(unifiedOrderResult.getCodeURL()) .codeUrl(unifiedOrderResult.getCodeURL())
.build(); .build();
break;
} }
case TradeType.APP: { case TradeType.APP: {
// APP支付绑定的是微信开放平台上的账号，APPID为开放平台上绑定APP后发放的参数 // APP支付绑定的是微信开放平台上的账号，APPID为开放平台上绑定APP后发放的参数
String appId = this.getConfig().getAppId(); String appId = this.getConfig().getAppId();
@ -235,7 +234,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
configMap.put("noncestr", nonceStr); configMap.put("noncestr", nonceStr);
configMap.put("appid", appId); configMap.put("appid", appId);
payResult = WxPayAppOrderResult.builder() return (T) WxPayAppOrderResult.builder()
.sign(SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), false)) .sign(SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), false))
.prepayId(prepayId) .prepayId(prepayId)
.partnerId(partnerId) .partnerId(partnerId)
@ -244,26 +243,33 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService {
.timeStamp(timestamp) .timeStamp(timestamp)
.nonceStr(nonceStr) .nonceStr(nonceStr)
.build(); .build();
break;
} }
case TradeType.JSAPI: { case TradeType.JSAPI: {
payResult = WxPayMpOrderResult.builder() String signType = SignType.MD5;
WxPayMpOrderResult payResult = WxPayMpOrderResult.builder()
.appId(unifiedOrderResult.getAppid()) .appId(unifiedOrderResult.getAppid())
.timeStamp(timestamp) .timeStamp(timestamp)
.nonceStr(nonceStr) .nonceStr(nonceStr)
.packageValue("prepay_id=" + prepayId) .packageValue("prepay_id=" + prepayId)
.signType(SignType.MD5) .signType(signType)
.build(); .build();
((WxPayMpOrderResult) payResult)
.setPaySign(SignUtils.createSign(payResult, null, this.getConfig().getMchKey(), false)); payResult.setPaySign(
break; SignUtils.createSign(
payResult,
signType,
this.getConfig().getMchKey(),
false)
);
return (T) payResult;
} }
default: { default: {
throw new WxPayException("该交易类型暂不支持"); throw new WxPayException("该交易类型暂不支持");
} }
} }
return (T) payResult;
} }
@Override @Override