lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-06-05 16:09:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
cnzzs
2017-07-29 18:08:58 -07:00
parent cb895448a6 f9e779f596
commit 033327cbd2
32 changed files with 196 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java
View File

@@ -20,10 +20,7 @@ public class WxPayConfigStorage extends BasePayConfigStorage {
public String mchId;
@Override
public String getSecretKey() {
return appSecret;
}
public void setAppSecret(String appSecret) {
this.appSecret = appSecret;

7
pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
View File

@@ -1,6 +1,5 @@
package com.egzosn.pay.wx.api;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.egzosn.pay.common.api.BasePayService;
import com.egzosn.pay.common.api.Callback;
@@ -566,10 +565,10 @@ public class WxPayService extends BasePayService {
//获取公共参数
Map<String, Object> parameters = getPublicParameters();
if (null != transactionIdOrBillDate){
parameters.put("transaction_id", transactionIdOrBillDate);
}else {
if (null == transactionIdOrBillDate || "".equals(transactionIdOrBillDate)){
parameters.put("out_trade_no", outTradeNoBillType);
}else {
parameters.put("transaction_id", transactionIdOrBillDate);
}
//设置签名
setSign(parameters);