Merge branch '1688purchase' of http://code.qiyue666.com/pengcong001/bbwy into 1688purchase

BBWY.Server.API/Controllers/PurchaseOrderController.cs

@@ -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);
         }
     }
 }

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -220,10 +220,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);
         }
 

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; }
+    }
+}