From 01b4e7b237f494ff62c32729651afd2d18059bcf Mon Sep 17 00:00:00 2001
From: zzs <zzs@192.168.1.69>
Date: Tue, 7 Mar 2017 20:35:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E8=BE=85=E5=8A=A9=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../in/egan/pay/demo/controller/PayController.java  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java b/pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java
index 8df7906..2329a03 100644
--- a/pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java
+++ b/pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java
@@ -9,16 +9,13 @@ import com.alipay.api.request.AlipayTradeQueryRequest;
 import com.alipay.api.response.AlipayTradeQueryResponse;
 import in.egan.pay.ali.before.bean.AliTransactionType;
 import in.egan.pay.common.api.Callback;
+import in.egan.pay.common.bean.*;
 import in.egan.pay.common.util.str.StringUtils;
 import in.egan.pay.demo.entity.ApyAccount;
 import in.egan.pay.demo.entity.PayType;
 import in.egan.pay.demo.service.ApyAccountService;
 import in.egan.pay.demo.service.PayResponse;
 import in.egan.pay.common.api.PayConfigStorage;
-import in.egan.pay.common.bean.MethodType;
-import in.egan.pay.common.bean.PayMessage;
-import in.egan.pay.common.bean.PayOrder;
-import in.egan.pay.common.bean.PayOutMessage;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -169,15 +166,15 @@ public class PayController{
     }
 
     /**
-     * 查询
+     * 通用接口，根据 TransactionType 类型进行实现
      * @param payId
      * @return
      */
     @RequestMapping("query1")
-    public Map<String, Object> query1(Integer payId) {
+    public Map<String, Object> query1(Integer payId,  String transactionType) {
         PayResponse payResponse = service.getPayResponse(payId);
-
-        return payResponse.getService().secondaryInterface("2017012921001004530273937216", "8a2950f959cf08740159ea0666fc04bd", AliTransactionType.QUERY, new Callback<Map<String, Object>>() {
+        TransactionType type = PayType.valueOf(payResponse.getStorage().getPayType()).getTransactionType(transactionType);
+        return payResponse.getService().secondaryInterface("2017012921001004530273937216", "8a2950f959cf08740159ea0666fc04bd", type, new Callback<Map<String, Object>>() {
             @Override
             public Map<String, Object> perform(Map<String, Object> map) {
                 return map;