1. 增加退款查询 退款单号，订单有效时间

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

@@ -224,6 +224,19 @@ public abstract class BasePayService implements PayService {
         return callback.perform(refundquery(tradeNo, outTradeNo));
     }
 
+    /**
+     * 查询退款
+     *
+     * @param refundOrder   退款订单信息
+     * @param callback 处理器
+     * @param <T> 返回类型
+     * @return 返回支付方查询退款后的结果
+     */
+    @Override
+    public <T>T refundquery(RefundOrder refundOrder, Callback<T> callback){
+        return callback.perform(refundquery(refundOrder));
+    }
+
     /**
      * 目前只支持日账单
      *

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

@@ -248,6 +248,7 @@ public interface PayService {
      * @param outTradeNo 商户单号
      * @return 返回支付方查询退款后的结果
      */
+    @Deprecated
     Map<String, Object> refundquery(String tradeNo, String outTradeNo);
     /**
      * 查询退款
@@ -258,7 +259,24 @@ public interface PayService {
      * @param <T> 返回类型
      * @return 返回支付方查询退款后的结果
      */
+    @Deprecated
     <T>T refundquery(String tradeNo, String outTradeNo, Callback<T> callback);
+    /**
+     * 查询退款
+     *
+     * @param refundOrder   退款订单单号信息
+     * @return 返回支付方查询退款后的结果
+     */
+    Map<String, Object> refundquery(RefundOrder refundOrder);
+    /**
+     * 查询退款
+     *
+     * @param refundOrder   退款订单信息
+     * @param callback 处理器
+     * @param <T> 返回类型
+     * @return 返回支付方查询退款后的结果
+     */
+    <T>T refundquery(RefundOrder refundOrder, Callback<T> callback);
 
     /**
      * 下载对账单

pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java

@@ -1,6 +1,7 @@
 package com.egzosn.pay.common.bean;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 支付订单信息
@@ -38,6 +39,10 @@ public class PayOrder {
     private TransactionType transactionType;
     //支付币种
     private CurType curType;
+    //订单过期时间
+    private Date expirationTime;
+
+
 
 
     public CurType getCurType() {
@@ -191,6 +196,14 @@ public class PayOrder {
         this.openid = openid;
     }
 
+    public Date getExpirationTime() {
+        return expirationTime;
+    }
+
+    public void setExpirationTime(Date expirationTime) {
+        this.expirationTime = expirationTime;
+    }
+
     @Override
     public String toString() {
         return "PayOrder{" +

pay-java-common/src/main/java/com/egzosn/pay/common/bean/RefundOrder.java

@@ -34,7 +34,7 @@ public class RefundOrder {
     private BigDecimal totalAmount;
 
     /**
-     * 交易日期
+     * 退款交易日期
      */
     private Date orderDate;