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

Author: egzosn

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

@@ -26,7 +26,7 @@
  *         email egzosn@gmail.com
  *         date 2017-2-22 20:09
  */
-public class AliPayService extends BasePayService<AliPayConfigStorage, PayOrder> {
+public class AliPayService extends BasePayService<AliPayConfigStorage> {
 
     /**
      * 正式测试环境

pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java

@@ -35,7 +35,7 @@
  * @see com.egzosn.pay.ali.api.AliPayService
  */
 @Deprecated
-public class AliPayService extends BasePayService<AliPayConfigStorage, PayOrder> {
+public class AliPayService extends BasePayService<AliPayConfigStorage> {
 
 
 

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

@@ -26,7 +26,7 @@
  *      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 String createSign(Map<String, Object> content, String characterEncoding)
      * @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 String toPay(O order) {
      * @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 PayMessage createMessage(Map<String, Object> message) {
      * @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;
     }
 

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

@@ -20,7 +20,7 @@
  *         date 2016-5-18 14:09:01
  *         </pre>
  */
-public interface PayService<PC extends PayConfigStorage, O extends PayOrder> {
+public interface PayService<PC extends PayConfigStorage> {
 
 
     /**
@@ -88,15 +88,15 @@ 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);
 
     /**
      * 页面转跳支付， 返回对应页面重定向信息
      *
      * @param order 订单信息
      * @return 对应页面重定向信息
      */
-    String toPay(O order);
+    <O extends PayOrder>String toPay(O order);
 
     /**
      * 创建签名
@@ -160,22 +160,22 @@ 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主动扫码付款(条码付)
      * 刷脸付
      * @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);
 
 }

pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java

@@ -21,7 +21,7 @@
  * create 2017 2017/1/16 0016
  * </pre>
  */
-public class FuiouPayService extends BasePayService<FuiouPayConfigStorage, PayOrder> {
+public class FuiouPayService extends BasePayService<FuiouPayConfigStorage> {
 
     /**
      * 正式域名

pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java

@@ -16,7 +16,7 @@
  * 
  */
 
-public interface AdvancedPayService extends PayService<PayoneerConfigStorage, PayOrder> {
+public interface AdvancedPayService extends PayService<PayoneerConfigStorage> {
     /**
      * 获取授权页面
      * @param payeeId 用户id

pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java

@@ -33,7 +33,7 @@
  *         create 2018-01-19
  *                 </pre>
  */
-public class PayoneerPayService extends BasePayService<PayoneerConfigStorage, PayOrder> implements AdvancedPayService {
+public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> implements AdvancedPayService {
     /**
      * 测试地址
      */

pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java

@@ -29,7 +29,7 @@
  * email egzosn@gmail.com
  * date 2018-4-8 ‏‎22:15:09
  */
-public class PayPalPayService extends BasePayService<PayPalConfigStorage, PayOrder>{
+public class PayPalPayService extends BasePayService<PayPalConfigStorage>{
 
     /**
      * 沙箱环境

pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java

@@ -38,7 +38,7 @@
  *         create 2017 2017/11/5
  *         </pre>
  */
-public class UnionPayService extends BasePayService<UnionPayConfigStorage, PayOrder> {
+public class UnionPayService extends BasePayService<UnionPayConfigStorage> {
     /**
      * 测试域名
      */

pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java

@@ -27,7 +27,7 @@
  * email egzosn@gmail.com
  * date 2017/01/12 22:58
  */
-public class WxYouDianPayService extends BasePayService<WxYouDianPayConfigStorage, PayOrder> {
+public class WxYouDianPayService extends BasePayService<WxYouDianPayConfigStorage> {
 
     private final static String URL = "http://life.51youdian.com/Api/CheckoutCounter/";