From 86da0e8c6eefe28c2693b7e3b1401a74cbd99233 Mon Sep 17 00:00:00 2001
From: "egzosn@gmail.com" <930928lI1>
Date: Thu, 11 May 2017 09:22:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=88=B7=E5=8D=A1=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/egzosn/pay/wx/api/WxPayService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
index bdaeebb..ff9b8b2 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
@@ -146,13 +146,13 @@ public class WxPayService extends BasePayService {
             parameters.put("auth_code", order.getAuthCode());
         } else {
             parameters.put("notify_url", payConfigStorage.getNotifyUrl());
-
+            parameters.put("trade_type", order.getTransactionType().getType());
         }
 
         parameters.put("out_trade_no", order.getOutTradeNo());// 订单号
         parameters.put("spbill_create_ip", "192.168.1.150");
         parameters.put("total_fee", order.getPrice().multiply(new BigDecimal(100)).intValue());// 总金额单位为分
-        parameters.put("trade_type", order.getTransactionType().getType());
+
         parameters.put("attach", order.getBody());
         if (WxTransactionType.NATIVE == order.getTransactionType()) {
             parameters.put("product_id", order.getOutTradeNo());

From 38eb071d351383d40b7b15dae5a61a20bc7ac7ac Mon Sep 17 00:00:00 2001
From: "egzosn@gmail.com" <930928lI1>
Date: Thu, 11 May 2017 10:16:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E4=BB=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/egzosn/pay/ali/api/AliPayService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
index 5bb2217..e4ee094 100644
--- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
+++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
@@ -379,7 +379,7 @@ public class AliPayService extends BasePayService {
 //        content.put("biz_content", orderInfo.remove("biz_content"));
         //预订单
         JSONObject result = getHttpRequestTemplate().postForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(orderInfo), null, JSONObject.class);
-        JSONObject response = result.getJSONObject("alipay_trade_precreate_response");
+        JSONObject response = result.getJSONObject("alipay_trade_pay_response");
         if ("10000".equals(response.getString("code"))){
             return response;
         }

From 7c5c89521eb5ecccc5cc258723f4fa9a6ead2538 Mon Sep 17 00:00:00 2001
From: "egzosn@gmail.com" <930928lI1>
Date: Thu, 11 May 2017 10:28:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E4=BB=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/egzosn/pay/ali/api/AliPayService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
index e4ee094..f4842c6 100644
--- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
+++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
@@ -75,7 +75,7 @@ public class AliPayService extends BasePayService {
     public boolean verify(Map<String, Object> params) {
 
 
-        if (params.get("sign") == null || params.get("notify_id") == null) {
+        if (params.get("sign") == null) {
             log.debug("支付宝支付异常：params：" + params);
             return false;
         }

From 5d2c5a42e2f23b1724af73c8f9435fcb986806ed Mon Sep 17 00:00:00 2001
From: "egzosn@gmail.com" <930928lI1>
Date: Thu, 11 May 2017 10:57:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E4=BB=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/egzosn/pay/ali/api/AliPayService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
index f4842c6..952df78 100644
--- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
+++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
@@ -381,7 +381,7 @@ public class AliPayService extends BasePayService {
         JSONObject result = getHttpRequestTemplate().postForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(orderInfo), null, JSONObject.class);
         JSONObject response = result.getJSONObject("alipay_trade_pay_response");
         if ("10000".equals(response.getString("code"))){
-            return response;
+            return result;
         }
         throw new PayErrorException(new PayException(response.getString("code"), response.getString("msg"), result.toJSONString()));
     }