lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-05-10 15:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

移除过时方法，工具类迁移

Browse Source
This commit is contained in:
egan
2021-08-01 23:33:02 +08:00
parent d40efb21c5
commit 4d1ad05fa8
19 changed files with 113 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java
View File

@@ -11,11 +11,11 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSON;
import com.egzosn.pay.common.bean.BillType;
import com.egzosn.pay.common.bean.MethodType;
import com.egzosn.pay.common.bean.Order;
import com.egzosn.pay.common.bean.PayMessage;
@@ -252,7 +252,7 @@ public abstract class BasePayService<PC extends PayConfigStorage> implements Pay
*/
@Override
public <T> T cancel(String tradeNo, String outTradeNo, Callback<T> callback) {
return callback.perform(close(tradeNo, outTradeNo));
return callback.perform(cancel(tradeNo, outTradeNo));
}
/**
@@ -264,7 +264,7 @@ public abstract class BasePayService<PC extends PayConfigStorage> implements Pay
*/
@Override
public Map<String, Object> cancel(String tradeNo, String outTradeNo) {
return Collections.EMPTY_MAP;
return Collections.emptyMap();
}
@@ -297,19 +297,16 @@ public abstract class BasePayService<PC extends PayConfigStorage> implements Pay
}
/**
* 目前只支持日账单
* 下载对账单
*
* @param billDate 账单时间：具体请查看对应支付平台
* @param billType 账单类型，具体请查看对应支付平台
* @param callback 处理器
* @param <T> 返回类型
* @param billDate 账单时间：日账单格式为yyyy-MM-dd，月账单格式为yyyy-MM。
* @param billType 账单类型 内部自动转化 {@link BillType}
* @return 返回支付方下载对账单的结果
*/
@Override
public <T> T downloadbill(Date billDate, String billType, Callback<T> callback) {
return callback.perform(downloadbill(billDate, billType));
public Map<String, Object> downloadBill(Date billDate, String billType){
return Collections.emptyMap();
}
/**
* 转账
*

15
pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java
View File

@@ -276,11 +276,10 @@ public interface PayService<PC extends PayConfigStorage> {
* 下载对账单
*
* @param billDate 账单时间：日账单格式为yyyy-MM-dd，月账单格式为yyyy-MM。
* @param billType 账单类型
* @param billType 账单类型 内部自动转化 {@link BillType}
* @return 返回支付方下载对账单的结果
*/
@Deprecated
Map<String, Object> downloadbill(Date billDate, String billType);
Map<String, Object> downloadBill(Date billDate, String billType);
/**
* 下载对账单
@@ -291,16 +290,6 @@ public interface PayService<PC extends PayConfigStorage> {
*/
Map<String, Object> downloadBill(Date billDate, BillType billType);
/**
* 下载对账单
*
* @param billDate 账单时间：具体请查看对应支付平台
* @param billType 账单类型，具体请查看对应支付平台
* @param callback 处理器
* @param <T> 返回类型
* @return 返回支付方下载对账单的结果
*/
<T> T downloadbill(Date billDate, String billType, Callback<T> callback);
/**

5
pay-java-common/src/main/java/com/egzosn/pay/common/exception/PayErrorException.java
View File

@@ -18,6 +18,11 @@ public class PayErrorException extends RuntimeException {
this.error = error;
}
public PayErrorException(PayError error, Throwable throwable) {
super(error.getString(), throwable);
this.error = error;
}
public PayError getPayError() {
return error;