携程支付查询

src/main/java/com/ctrip/fun/golf/dao/payment/PaymentResponseDao.java

@@ -3,9 +3,11 @@
  */
  */
 package com.ctrip.fun.golf.dao.payment;
 package com.ctrip.fun.golf.dao.payment;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import org.hibernate.Criteria;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.criterion.Restrictions;
 
 
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
@@ -44,7 +46,15 @@ public class PaymentResponseDao extends GenericHibernateDao<PaymentResult, Integ
     public List<PaymentResult> queryServiceName(String outTradeId, String serviceName) {
     public List<PaymentResult> queryServiceName(String outTradeId, String serviceName) {
         Criteria criteria = this.getCriteria();
         Criteria criteria = this.getCriteria();
         criteria.add(Restrictions.eq("outTradeId", outTradeId));
         criteria.add(Restrictions.eq("outTradeId", outTradeId));
-        criteria.add(Restrictions.eq("serviceName", serviceName));
+        if("".equals(serviceName)){
+        	List<String> list =  new ArrayList<String>();
+        	list.add("PaymentRequest");
+        	list.add("Refund");
+        	criteria.add(Restrictions.in("serviceName", list));
+        	criteria.addOrder(Order.desc("id"));
+        }else{
+        	criteria.add(Restrictions.eq("serviceName", serviceName));
+        }
         return criteria.list();
         return criteria.list();
     }
     }
     /**
     /**

src/main/java/com/ctrip/fun/golf/service/payment/AbstractPaymentService.java

@@ -333,7 +333,7 @@ public abstract class AbstractPaymentService<T extends AbstractOrder> extends Co
             queryServiceName = PREAUTH_FINISH;
             queryServiceName = PREAUTH_FINISH;
         } else if (QUERY_PAY_STATUS.equals(serviceName)) {
         } else if (QUERY_PAY_STATUS.equals(serviceName)) {
         	//TODO 当前 使用的查询接口是老的接口
         	//TODO 当前 使用的查询接口是老的接口
-        	queryServiceName = PAYMENT_REQUEST;
+        	queryServiceName = "";
         } else if (CANCEL_ORDER.equals(serviceName)) {
         } else if (CANCEL_ORDER.equals(serviceName)) {
         	queryServiceName = PAYMENT_REQUEST;
         	queryServiceName = PAYMENT_REQUEST;
         }
         }