From ab35c7ea414975174158562aea643ec47a406000 Mon Sep 17 00:00:00 2001
From: varorbc <varorbc@gmail.com>
Date: Sun, 1 Apr 2018 13:54:55 +0800
Subject: [PATCH] .

---
 .../Controllers/AlipayController.cs           | 14 ++++++++++++
 sample/ICanPay.Demo/Views/Home/Index.cshtml   | 22 +++++++++++++++++++
 .../Response/BarcodePayResponse.cs            | 10 +++++++++
 src/ICanPay.Alipay/Response/BaseResponse.cs   | 10 ---------
 src/ICanPay.Alipay/Response/CancelResponse.cs | 10 +++++++++
 src/ICanPay.Alipay/Response/CloseResponse.cs  |  9 ++++++++
 src/ICanPay.Alipay/Response/QueryResponse.cs  | 10 +++++++++
 .../Response/RefundQueryResponse.cs           | 10 +++++++++
 src/ICanPay.Alipay/Response/RefundResponse.cs | 10 +++++++++
 .../Response/ScanPayResponse.cs               |  5 +++++
 10 files changed, 100 insertions(+), 10 deletions(-)

diff --git a/sample/ICanPay.Demo/Controllers/AlipayController.cs b/sample/ICanPay.Demo/Controllers/AlipayController.cs
index 85105b1..5a4853c 100644
--- a/sample/ICanPay.Demo/Controllers/AlipayController.cs
+++ b/sample/ICanPay.Demo/Controllers/AlipayController.cs
@@ -170,6 +170,20 @@ namespace ICanPay.Demo.Controllers
             return Json(response);
         }
 
+        [HttpPost]
+        public IActionResult Cancel(string out_trade_no, string trade_no)
+        {
+            var request = new CancelRequest();
+            request.AddGatewayData(new CancelModel()
+            {
+                TradeNo = trade_no,
+                OutTradeNo = out_trade_no
+            });
+
+            var response = _baseGateway.Execute(request);
+            return Json(response);
+        }
+
         [HttpPost]
         public IActionResult Close(string out_trade_no, string trade_no)
         {
diff --git a/sample/ICanPay.Demo/Views/Home/Index.cshtml b/sample/ICanPay.Demo/Views/Home/Index.cshtml
index f3a71d2..5140b77 100644
--- a/sample/ICanPay.Demo/Views/Home/Index.cshtml
+++ b/sample/ICanPay.Demo/Views/Home/Index.cshtml
@@ -40,6 +40,7 @@
                     <li><a href="#tabs-purchase-5">交易查询</a></li>
                     <li><a href="#tabs-purchase-6">交易退款</a></li>
                     <li><a href="#tabs-purchase-7">退款查询</a></li>
+                    <li><a href="#tabs-purchase-14">交易撤销</a></li>
                     <li><a href="#tabs-purchase-8">交易关闭</a></li>
                     <li><a href="#tabs-purchase-9">单笔转账</a></li>
                     <li><a href="#tabs-purchase-10">转账查询</a></li>
@@ -303,6 +304,27 @@
                     </p>
                 </div>
 
+                <div id="tabs-purchase-14">
+                    <form class="api-form" asp-controller="Alipay" asp-action="Cancel" method="post" target="_blank">
+                        <p>
+                            <label>订单号：</label>
+                            <input type="text" name="out_trade_no">
+                        </p>
+                        <p>
+                            <label>支付宝订单号：</label>
+                            <input type="text" name="trade_no">
+                        </p>
+                        <p>
+                            <label>&nbsp;</label>
+                            <input type="submit" class="button" value="提交">
+                        </p>
+                    </form>
+                    <hr />
+                    <p class="faq">
+                        <a href="https://docs.open.alipay.com/api_1/alipay.trade.cancel/" target="_blank">* 查看接口 请求参数、响应参数</a>
+                    </p>
+                </div>
+
                 <div id="tabs-purchase-8">
                     <form class="api-form" asp-controller="Alipay" asp-action="Close" method="post" target="_blank">
                         <p>
diff --git a/src/ICanPay.Alipay/Response/BarcodePayResponse.cs b/src/ICanPay.Alipay/Response/BarcodePayResponse.cs
index 0058747..f275694 100644
--- a/src/ICanPay.Alipay/Response/BarcodePayResponse.cs
+++ b/src/ICanPay.Alipay/Response/BarcodePayResponse.cs
@@ -6,6 +6,16 @@ namespace ICanPay.Alipay.Response
 {
     public class BarcodePayResponse : BaseResponse
     {
+        /// <summary>
+        /// 支付宝交易号
+        /// </summary>
+        public string TradeNo { get; set; }
+
+        /// <summary>
+        /// 商户订单号
+        /// </summary>
+        public string OutTradeNo { get; set; }
+
         /// <summary>
         /// 买家支付宝账号
         /// </summary>
diff --git a/src/ICanPay.Alipay/Response/BaseResponse.cs b/src/ICanPay.Alipay/Response/BaseResponse.cs
index affa652..8a2cb37 100644
--- a/src/ICanPay.Alipay/Response/BaseResponse.cs
+++ b/src/ICanPay.Alipay/Response/BaseResponse.cs
@@ -42,15 +42,5 @@ namespace ICanPay.Alipay.Response
         /// 原始值
         /// </summary>
         public string Body { get; set; }
-
-        /// <summary>
-        /// 支付宝交易号
-        /// </summary>
-        public string TradeNo { get; set; }
-
-        /// <summary>
-        /// 商户订单号
-        /// </summary>
-        public string OutTradeNo { get; set; }
     }
 }
diff --git a/src/ICanPay.Alipay/Response/CancelResponse.cs b/src/ICanPay.Alipay/Response/CancelResponse.cs
index 6f68e93..7eca323 100644
--- a/src/ICanPay.Alipay/Response/CancelResponse.cs
+++ b/src/ICanPay.Alipay/Response/CancelResponse.cs
@@ -2,6 +2,16 @@
 {
     public class CancelResponse : BaseResponse
     {
+        /// <summary>
+        /// 支付宝交易号
+        /// </summary>
+        public string TradeNo { get; set; }
+
+        /// <summary>
+        /// 商户订单号
+        /// </summary>
+        public string OutTradeNo { get; set; }
+
         /// <summary>
         /// 是否需要重试
         /// </summary>
diff --git a/src/ICanPay.Alipay/Response/CloseResponse.cs b/src/ICanPay.Alipay/Response/CloseResponse.cs
index 6c0663a..948d8ee 100644
--- a/src/ICanPay.Alipay/Response/CloseResponse.cs
+++ b/src/ICanPay.Alipay/Response/CloseResponse.cs
@@ -2,5 +2,14 @@
 {
     public class CloseResponse : BaseResponse
     {
+        /// <summary>
+        /// 支付宝交易号
+        /// </summary>
+        public string TradeNo { get; set; }
+
+        /// <summary>
+        /// 商户订单号
+        /// </summary>
+        public string OutTradeNo { get; set; }
     }
 }
diff --git a/src/ICanPay.Alipay/Response/QueryResponse.cs b/src/ICanPay.Alipay/Response/QueryResponse.cs
index f2be3ec..00d997c 100644
--- a/src/ICanPay.Alipay/Response/QueryResponse.cs
+++ b/src/ICanPay.Alipay/Response/QueryResponse.cs
@@ -6,6 +6,16 @@ namespace ICanPay.Alipay.Response
 {
     public class QueryResponse : BaseResponse
     {
+        /// <summary>
+        /// 支付宝交易号
+        /// </summary>
+        public string TradeNo { get; set; }
+
+        /// <summary>
+        /// 商户订单号
+        /// </summary>
+        public string OutTradeNo { get; set; }
+
         /// <summary>
         /// 买家支付宝账号
         /// </summary>
diff --git a/src/ICanPay.Alipay/Response/RefundQueryResponse.cs b/src/ICanPay.Alipay/Response/RefundQueryResponse.cs
index 9680a78..5d985df 100644
--- a/src/ICanPay.Alipay/Response/RefundQueryResponse.cs
+++ b/src/ICanPay.Alipay/Response/RefundQueryResponse.cs
@@ -4,6 +4,16 @@ namespace ICanPay.Alipay.Response
 {
     public class RefundQueryResponse : BaseResponse
     {
+        /// <summary>
+        /// 支付宝交易号
+        /// </summary>
+        public string TradeNo { get; set; }
+
+        /// <summary>
+        /// 商户订单号
+        /// </summary>
+        public string OutTradeNo { get; set; }
+
         /// <summary>
         /// 本笔退款对应的退款请求号
         /// </summary>
diff --git a/src/ICanPay.Alipay/Response/RefundResponse.cs b/src/ICanPay.Alipay/Response/RefundResponse.cs
index 371e08b..be356c6 100644
--- a/src/ICanPay.Alipay/Response/RefundResponse.cs
+++ b/src/ICanPay.Alipay/Response/RefundResponse.cs
@@ -7,6 +7,16 @@ namespace ICanPay.Alipay.Response
 {
     public class RefundResponse : BaseResponse
     {
+        /// <summary>
+        /// 支付宝交易号
+        /// </summary>
+        public string TradeNo { get; set; }
+
+        /// <summary>
+        /// 商户订单号
+        /// </summary>
+        public string OutTradeNo { get; set; }
+
         /// <summary>
         /// 买家支付宝账号
         /// </summary>
diff --git a/src/ICanPay.Alipay/Response/ScanPayResponse.cs b/src/ICanPay.Alipay/Response/ScanPayResponse.cs
index fd0d877..6153be0 100644
--- a/src/ICanPay.Alipay/Response/ScanPayResponse.cs
+++ b/src/ICanPay.Alipay/Response/ScanPayResponse.cs
@@ -2,6 +2,11 @@
 {
     public class ScanPayResponse : BaseResponse
     {
+        /// <summary>
+        /// 商户订单号
+        /// </summary>
+        public string OutTradeNo { get; set; }
+
         /// <summary>
         /// 当前预下单请求生成的二维码码串，可以用二维码生成工具根据该码串值生成对应的二维码
         /// </summary>