修复微信bug

This commit is contained in:
egzosn
2017-03-08 21:55:35 +08:00
parent fc1220cc47
commit 27daa124bb

View File

@@ -78,8 +78,8 @@ public class WxPayService extends BasePayService {
}
if(null == params.get("sign")) {
log.debug("微信支付异常签名为空out_trade_no=" + params.get("out_trade_no"));
return false;
}
try {
@@ -139,8 +139,6 @@ public class WxPayService extends BasePayService {
@Override
public Map<String, Object> orderInfo(PayOrder order) {
// Map<String, Object> results = new HashMap<String, Object>();
////统一下单
Map<String, Object> parameters = getPublicParameters();
/* parameters.put("appid", payConfigStorage.getAppid());
@@ -177,7 +175,7 @@ public class WxPayService extends BasePayService {
params.put("partnerid", payConfigStorage.getPid());
params.put("prepayid", result.get("prepay_id"));
params.put("timestamp", System.currentTimeMillis() / 1000);
params.put("noncestr", result.get("nonce_str")/*WxpayCore.genNonceStr()*/);
params.put("noncestr", result.get("nonce_str"));
if (WxTransactionType.JSAPI == order.getTransactionType()){
params.put("package", "prepay_id=" + result.get("prepay_id"));
@@ -375,6 +373,16 @@ public class WxPayService extends BasePayService {
setSign(parameters);
return callback.perform(requestTemplate.postForObject(getUrl(WxTransactionType.DOWNLOADBILL), XML.getMap2Xml(parameters), JSONObject.class));
}
/**
*
* @param transactionIdOrBillDate 支付平台订单号或者账单类型, 具体请 类型为{@link String }或者 {@link Date },类型须强制限制,类型不对应则抛出异常{@link in.egan.pay.common.exception.PayErrorException}
* @param outTradeNoBillType 商户单号或者 账单类型
* @param transactionType 交易类型
* @param callback 处理器
* @param <T>
* @return
*/
@Override
public <T> T secondaryInterface(Object transactionIdOrBillDate, String outTradeNoBillType, TransactionType transactionType, Callback<T> callback) {