Alawn/springboot-payment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
xiangwbs
2018-03-26 21:15:29 +08:00
parent 3cbb075e96
commit 459ab1cdf2
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-service/src/main/java/com/xwbing/service/other/WxPayService.java
+5 -5
View File
@@ -3,8 +3,8 @@ package com.xwbing.service.other;
import com.xwbing.domain.entity.wxpay.*;
import com.xwbing.exception.BusinessException;
import com.xwbing.exception.PayException;
import com.xwbing.util.RandomUtil;
import com.xwbing.util.payWxpay.ClientCustomSSL;
import com.xwbing.util.payWxpay.RandomKit;
import com.xwbing.util.payWxpay.WxSignKit;
import com.xwbing.util.payWxpay.XmlUtil;
import org.apache.commons.lang3.StringUtils;
@@ -369,7 +369,7 @@ public class WxPayService {
Map<String, String> params = new HashMap<String, String>();
params.put("appid", appId);
params.put("mch_id", mchId);
String nonce_str = RandomUtil.buildRandom(32);
String nonce_str = RandomKit.buildRandom(32);
params.put("nonce_str", nonce_str);
params.put("body", param.getBody());
params.put("out_trade_no", param.getOutTradeNo());
@@ -401,7 +401,7 @@ public class WxPayService {
Map<String, String> params = new HashMap<String, String>();
params.put("appid", appId);
params.put("mch_id", mchId);
String nonce_str = RandomUtil.buildRandom(32);
String nonce_str = RandomKit.buildRandom(32);
params.put("nonce_str", nonce_str);
if (StringUtils.isEmpty(param.getTransactionId()) && StringUtils.isEmpty(param.getOutTradeNo())) {
throw new PayException("商户订单号和微信订单号不能同时为空!");
@@ -450,7 +450,7 @@ public class WxPayService {
if (StringUtils.isNotEmpty(outTradeNo)) {
params.put("out_trade_no", outTradeNo);
}
String nonce_str = RandomUtil.buildRandom(32);
String nonce_str = RandomKit.buildRandom(32);
params.put("nonce_str", nonce_str);
//签名放最后的
String sign = WxSignKit.buildSign(params, apiKey);
@@ -494,7 +494,7 @@ public class WxPayService {
if (StringUtils.isNotEmpty(refundid)) {
params.put("refund_id", refundid);
}
String nonce_str = RandomUtil.buildRandom(32);
String nonce_str = RandomKit.buildRandom(32);
params.put("nonce_str", nonce_str);
//签名放最后的
String sign = WxSignKit.buildSign(params, apiKey);