lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-06-04 07:36:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

移除已废弃的字段与方法

Browse Source
This commit is contained in:
egzosn
2021-01-17 22:38:11 +08:00
parent 0f9439fd4e
commit c6cfd2e8d1
39 changed files with 1099 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java
View File

@@ -3,51 +3,61 @@ package com.egzosn.pay.baidu.api;
import com.egzosn.pay.common.api.BasePayConfigStorage;
public class BaiduPayConfigStorage extends BasePayConfigStorage {
private String appid;
private String appId;
private String dealId;
@Override
@Deprecated
public String getAppid() {
return this.appid;
return this.appId;
}
@Override
public String getPid() {
return getDealId();
}
@Override
public String getSeller() {
throw new UnsupportedOperationException("不支持");
}
public String getDealId() {
return dealId;
}
public void setDealId(String dealId) {
this.dealId = dealId;
}
public String getAppKey() {
return this.getKeyPrivate();
}
public void setAppKey(String appKey) {
setKeyPrivate(appKey);
}
@Override
public String getKeyPublic() {
return super.getKeyPrivate();
}
@Override
public void setKeyPublic(String keyPublic) {
super.setKeyPublic(keyPublic);
}
public void setAppid(String appid) {
this.appid = appid;
public void setAppid(String appId) {
this.appId = appId;
}
@Override
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
}

28
pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java
View File

@@ -1,14 +1,25 @@
package com.egzosn.pay.baidu.api;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.egzosn.pay.baidu.bean.BaiduPayOrder;
import com.egzosn.pay.baidu.bean.BaiduRefundOrder;
import com.egzosn.pay.baidu.bean.BaiduTransactionType;
import com.egzosn.pay.baidu.bean.type.AuditStatus;
import com.egzosn.pay.baidu.util.Asserts;
import com.egzosn.pay.common.api.BasePayService;
import com.egzosn.pay.common.bean.*;
import com.egzosn.pay.common.bean.BaseRefundResult;
import com.egzosn.pay.common.bean.CurType;
import com.egzosn.pay.common.bean.MethodType;
import com.egzosn.pay.common.bean.PayMessage;
import com.egzosn.pay.common.bean.PayOrder;
import com.egzosn.pay.common.bean.PayOutMessage;
import com.egzosn.pay.common.bean.RefundOrder;
import com.egzosn.pay.common.bean.TransactionType;
import com.egzosn.pay.common.http.HttpConfigStorage;
import com.egzosn.pay.common.http.UriVariables;
import com.egzosn.pay.common.util.DateUtils;
@@ -16,11 +27,6 @@ import com.egzosn.pay.common.util.Util;
import com.egzosn.pay.common.util.sign.SignUtils;
import com.egzosn.pay.common.util.str.StringUtils;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
public class BaiduPayService extends BasePayService<BaiduPayConfigStorage> {
public static final String APP_KEY = "appKey";
@@ -63,7 +69,7 @@ public class BaiduPayService extends BasePayService<BaiduPayConfigStorage> {
if (!RESPONSE_SUCCESS.equals(params.get(RESPONSE_STATUS))) {
return false;
}
return signVerify(params, String.valueOf(params.get(RSA_SIGN))) && verifySource(String.valueOf(params.get(TP_ORDER_ID)));
return signVerify(params, String.valueOf(params.get(RSA_SIGN)));
}
/**
@@ -73,7 +79,6 @@ public class BaiduPayService extends BasePayService<BaiduPayConfigStorage> {
* @param sign 签名原文
* @return 结果
*/
@Override
public boolean signVerify(Map<String, Object> params, String sign) {
String rsaSign = String.valueOf(params.get(RSA_SIGN));
String targetRsaSign = getRsaSign(params, RSA_SIGN);
@@ -81,10 +86,6 @@ public class BaiduPayService extends BasePayService<BaiduPayConfigStorage> {
return StringUtils.equals(rsaSign, targetRsaSign);
}
@Override
public boolean verifySource(String id) {
return true;
}
/**
* 返回创建的订单信息
@@ -439,7 +440,6 @@ public class BaiduPayService extends BasePayService<BaiduPayConfigStorage> {
* @param transactionType 交易类型
* @return 结果
*/
@Override
public Map<String, Object> secondaryInterface(Object orderId,
String siteId,
TransactionType transactionType) {