lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-05-31 12:59:35 +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

26
pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java
View File

@@ -28,7 +28,7 @@ public class AliPayConfigStorage extends BasePayConfigStorage {
/**
* 商户应用id
*/
private String appid;
private String appId;
/**
* 商户签约拿到的pid,partner_id的简称，合作伙伴身份等同于 partner
*/
@@ -73,15 +73,30 @@ public class AliPayConfigStorage extends BasePayConfigStorage {
this.appAuthToken = appAuthToken;
}
public void setAppid(String appid) {
this.appid = appid;
public void setAppid(String appId) {
this.appId = appId;
}
@Override
@Deprecated
public String getAppid() {
return appid;
return appId;
}
/**
* 应用id
* 纠正名称
*
* @return 应用id
*/
@Override
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
@Override
public String getPid() {
@@ -152,7 +167,8 @@ public class AliPayConfigStorage extends BasePayConfigStorage {
InputStream aliPayCertStream = certStoreType.getInputStream(aliPayCert);
InputStream aliPayRootCertStream = certStoreType.getInputStream(aliPayRootCert)) {
this.certEnvironment = new CertEnvironment(merchantCertStream, aliPayCertStream, aliPayRootCertStream);
} catch (IOException e) {
}
catch (IOException e) {
throw new PayErrorException(new PayException("读取证书异常", e.getMessage()));
}
}

11
pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
View File

@@ -123,7 +123,6 @@ public class AliPayService extends BasePayService<AliPayConfigStorage> {
* @param sign 比对的签名结果
* @return 生成的签名结果
*/
@Override
public boolean signVerify(Map<String, Object> params, String sign) {
if (params instanceof JSONObject) {
@@ -171,7 +170,6 @@ public class AliPayService extends BasePayService<AliPayConfigStorage> {
* @param id 业务id, 数据的真实性.
* @return true通过
*/
@Override
public boolean verifySource(String id) {
return true;
}
@@ -281,10 +279,11 @@ public class AliPayService extends BasePayService<AliPayConfigStorage> {
switch ((AliTransactionType) order.getTransactionType()) {
case SWEEPPAY:
bizContent.put("qr_code_timeout_express", DateUtils.minutesRemaining(order.getExpirationTime()) + "m");
break;
case PAGE:
case WAP:
case APP:
bizContent.put("time_expire", DateUtils.formatDate(order.getExpirationTime(), "yyyy-MM-dd HH:mm"));
bizContent.put("time_expire", DateUtils.formatDate(order.getExpirationTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
break;
default:
}
@@ -526,7 +525,9 @@ public class AliPayService extends BasePayService<AliPayConfigStorage> {
parameters.put(BIZ_CONTENT, JSON.toJSONString(bizContent));
//设置签名
setSign(parameters);
final AliRefundResult refundResult = AliRefundResult.create(requestTemplate.getForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(parameters), JSONObject.class));
JSONObject result = requestTemplate.getForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(parameters), JSONObject.class);
JSONObject refundResponse = result.getJSONObject("alipay_trade_refund_response");
AliRefundResult refundResult = AliRefundResult.create(refundResponse);
refundResult.setOutRequestNo(refundOrder.getRefundNo());
return refundResult;
}
@@ -587,8 +588,6 @@ public class AliPayService extends BasePayService<AliPayConfigStorage> {
* @param transactionType 交易类型
* @return 返回支付方对应接口的结果
*/
@Override
public Map<String, Object> secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType) {
if (transactionType == AliTransactionType.REFUND) {