类预订单泛型约束本版本暂时移除

This commit is contained in:
egzosn
2019-11-25 20:10:03 +08:00
parent 5e7e9a95ad
commit b38c2b7f2a
13 changed files with 50 additions and 46 deletions

View File

@@ -26,7 +26,7 @@ import java.util.*;
* date 2017/3/5 20:36
* </pre>
*/
public abstract class BasePayService<PC extends PayConfigStorage, O extends PayOrder> implements PayService<PC, O> {
public abstract class BasePayService<PC extends PayConfigStorage> implements PayService<PC> {
protected final Log LOG = LogFactory.getLog(getClass());
protected PC payConfigStorage;
@@ -138,7 +138,7 @@ public abstract class BasePayService<PC extends PayConfigStorage, O extends PayO
* @return 对应页面重定向信息
*/
@Override
public String toPay(O order) {
public <O extends PayOrder> String toPay(O order) {
Map orderInfo = orderInfo(order);
return buildRequest(orderInfo, MethodType.POST);
}
@@ -150,7 +150,7 @@ public abstract class BasePayService<PC extends PayConfigStorage, O extends PayO
* @return 返回图片信息,支付时需要的
*/
@Override
public BufferedImage genQrPay(O order) {
public <O extends PayOrder> BufferedImage genQrPay(O order) {
return MatrixToImageWriter.writeInfoToJpgBuff(getQrPay(order));
}
@@ -463,7 +463,7 @@ public abstract class BasePayService<PC extends PayConfigStorage, O extends PayO
* @param orderInfo 订单信息
* @return 处理后订单信息
*/
public Map<String, Object> preOrderHandler(Map<String, Object> orderInfo, O payOrder){
public <O extends PayOrder> Map<String, Object> preOrderHandler(Map<String, Object> orderInfo, O payOrder){
return orderInfo;
}

View File

@@ -20,7 +20,7 @@ import java.util.Map;
* date 2016-5-18 14:09:01
* </pre>
*/
public interface PayService<PC extends PayConfigStorage, O extends PayOrder> {
public interface PayService<PC extends PayConfigStorage> {
/**
@@ -88,7 +88,7 @@ public interface PayService<PC extends PayConfigStorage, O extends PayOrder> {
* @return 订单信息
* @see PayOrder 支付订单信息
*/
Map<String, Object> orderInfo(O order);
<O extends PayOrder>Map<String, Object> orderInfo(O order);
/**
* 页面转跳支付, 返回对应页面重定向信息
@@ -96,7 +96,7 @@ public interface PayService<PC extends PayConfigStorage, O extends PayOrder> {
* @param order 订单信息
* @return 对应页面重定向信息
*/
String toPay(O order);
<O extends PayOrder>String toPay(O order);
/**
* 创建签名
@@ -160,14 +160,14 @@ public interface PayService<PC extends PayConfigStorage, O extends PayOrder> {
* @param order 发起支付的订单信息
* @return 返回图片信息,支付时需要的
*/
BufferedImage genQrPay(O order);
<O extends PayOrder>BufferedImage genQrPay(O order);
/**
* 获取输出二维码信息,
*
* @param order 发起支付的订单信息
* @return 返回二维码信息,,支付时需要的
*/
String getQrPay(O order);
<O extends PayOrder>String getQrPay(O order);
/**
* 刷卡付,pos主动扫码付款(条码付)
@@ -175,7 +175,7 @@ public interface PayService<PC extends PayConfigStorage, O extends PayOrder> {
* @param order 发起支付的订单信息
* @return 返回支付结果
*/
Map<String, Object> microPay(O order);
<O extends PayOrder>Map<String, Object> microPay(O order);
/**
* 交易查询接口
@@ -462,6 +462,6 @@ public interface PayService<PC extends PayConfigStorage, O extends PayOrder> {
* @param payOrder 订单信息
* @return 处理后订单信息
*/
Map<String, Object> preOrderHandler(Map<String, Object> orderInfo, O payOrder);
<O extends PayOrder>Map<String, Object> preOrderHandler(Map<String, Object> orderInfo, O payOrder);
}