From 69e6d358ee7e77f76a35141c9ca40da3b16340cc Mon Sep 17 00:00:00 2001
From: egan <egzosn@gmail.com>
Date: Sun, 28 Apr 2019 21:41:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B6=E5=8D=95=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E7=BB=93=E7=AE=97=E6=8E=A5=E5=8F=A3=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=95=99=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pay-java-ali/README.md                        | 15 ++++++++++++++-
 .../pay/demo/controller/AliPayController.java | 19 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/pay-java-ali/README.md b/pay-java-ali/README.md
index d9e927b..68a10ee 100644
--- a/pay-java-ali/README.md
+++ b/pay-java-ali/README.md
@@ -63,7 +63,7 @@
 
 ```java
     //支付服务
-     PayService service = new AliPayService(aliPayConfigStorage);
+     AliPayService service = new AliPayService(aliPayConfigStorage);
 
      //设置网络请求配置根据需求进行设置
      //service.setRequestTemplateConfigStorage(httpConfigStorage)
@@ -179,6 +179,19 @@
 
 
 
+#### 统一收单交易结算接口
+
+```java
+        OrderSettle order = new OrderSettle();
+        order.setTradeNo("支付宝单号");
+        order.setOutRequestNo("商户单号");
+        order.setAmount(new BigDecimal(100));
+        order.setDesc("线下转账");
+        Map result = service.settle(order);
+
+```
+
+
 #### 支付订单查询
 
 ```java
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java
index 625afa4..52bd299 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java
@@ -6,6 +6,7 @@ import com.egzosn.pay.ali.api.AliPayConfigStorage;
 import com.egzosn.pay.ali.api.AliPayService;
 import com.egzosn.pay.ali.bean.AliTransactionType;
 import com.egzosn.pay.ali.bean.AliTransferType;
+import com.egzosn.pay.ali.bean.OrderSettle;
 import com.egzosn.pay.common.api.PayService;
 import com.egzosn.pay.common.bean.*;
 import com.egzosn.pay.common.http.HttpConfigStorage;
@@ -40,7 +41,7 @@ import java.util.UUID;
 @RequestMapping("ali")
 public class AliPayController {
 
-    private PayService service = null;
+    private AliPayService service = null;
     @Resource
     private AutowireCapableBeanFactory spring;
 
@@ -219,6 +220,22 @@ public class AliPayController {
         return service.query(order.getTradeNo(), order.getOutTradeNo());
     }
 
+    /**
+     * 统一收单交易结算接口
+     *
+     * @param order 订单的请求体
+     * @return 返回查询回来的结果集，支付方原值返回
+     */
+    @RequestMapping("settle")
+    public Map<String, Object> settle(OrderSettle order) {
+       /* OrderSettle order = new OrderSettle();
+        order.setTradeNo("支付宝单号");
+        order.setOutRequestNo("商户单号");
+        order.setAmount(new BigDecimal(100));
+        order.setDesc("线下转账");*/
+        return service.settle(order);
+    }
+
 
     /**
      * 交易关闭接口