From afb17abbf28e1e83a2113e287862bd0b308a5725 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Tue, 15 Mar 2022 17:47:40 +0800
Subject: [PATCH] =?UTF-8?q?1688=E5=9B=9E=E8=B0=83=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PurchaseOrderController.cs          | 10 ++++++----
 .../PurchaseOrder/PurchaseOrderBusiness.cs          |  6 +++---
 .../Callback/_1688DeliveryCallbackRequest.cs        | 13 +++++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 BBWY.Server.Model/Dto/Request/PurchaseOrder/Callback/_1688DeliveryCallbackRequest.cs

diff --git a/BBWY.Server.API/Controllers/PurchaseOrderController.cs b/BBWY.Server.API/Controllers/PurchaseOrderController.cs
index 7b39553e..afd02293 100644
--- a/BBWY.Server.API/Controllers/PurchaseOrderController.cs
+++ b/BBWY.Server.API/Controllers/PurchaseOrderController.cs
@@ -58,7 +58,7 @@ namespace BBWY.Server.API.Controllers
         /// </summary>
         /// <param name="createOnlinePurchaseOrderRequest"></param>
         [HttpPost]
-        public void FastCreateOrder([FromBody]CreateOnlinePurchaseOrderRequest createOnlinePurchaseOrderRequest)
+        public void FastCreateOrder([FromBody] CreateOnlinePurchaseOrderRequest createOnlinePurchaseOrderRequest)
         {
             purchaseOrderBusiness.FastCreateOrder(createOnlinePurchaseOrderRequest);
         }
@@ -66,11 +66,13 @@ namespace BBWY.Server.API.Controllers
         /// <summary>
         /// 1688发货回调
         /// </summary>
-        /// <param name="param"></param>
+        /// <param name="message"></param>
+        /// <param name="_aop_signature"></param>
+        [Consumes("application/x-www-form-urlencoded")]
         [HttpPost]
-        public void DeliveryCallbackFrom1688([FromBody]object param)
+        public void DeliveryCallbackFrom1688([FromForm] string message,[FromForm] string _aop_signature)
         {
-            purchaseOrderBusiness.DeliveryCallbackFrom1688(param);
+            purchaseOrderBusiness.DeliveryCallbackFrom1688(message);
         }
     }
 }
diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 5526daae..076fc9da 100644
--- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -218,10 +218,10 @@ namespace BBWY.Server.Business
             });
         }
 
-        public void DeliveryCallbackFrom1688(object param)
+        public void DeliveryCallbackFrom1688(string jsonStr)
         {
-            var orderJObject = JObject.Parse(param.ToString());
-            var purchaseOrderId = orderJObject.Value<string>("orderId");
+            var orderJObject = JObject.Parse(jsonStr);
+            var purchaseOrderId = orderJObject["data"].Value<string>("orderId");
             Task.Factory.StartNew(() => DeliveryCallback(purchaseOrderId, Enums.Platform.阿里巴巴), CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
         }
 
diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/Callback/_1688DeliveryCallbackRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/Callback/_1688DeliveryCallbackRequest.cs
new file mode 100644
index 00000000..ff20979f
--- /dev/null
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/Callback/_1688DeliveryCallbackRequest.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Server.Model.Dto
+{
+    public class _1688DeliveryCallbackRequest
+    {
+        public string message { get; set; }
+
+        public string _aop_signature { get; set; }
+    }
+}