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

BBWY.Server.API/Controllers/PurchaseOrderController.cs

@@ -68,7 +68,6 @@ namespace BBWY.Server.API.Controllers
         /// </summary>
         /// <param name="message"></param>
         /// <param name="_aop_signature"></param>
-        [Consumes("application/x-www-form-urlencoded")]
         [HttpPost]
         public void DeliveryCallbackFrom1688([FromForm] string message,[FromForm] string _aop_signature)
         {

BBWY.Server.Business/PlatformSDK/_1688Business.cs

@@ -63,7 +63,7 @@ namespace BBWY.Server.Business
                 request.AccessToken = queryOrderWayBillNoRequest.AppToken;
             var result = client.NewRequest(request, reqPolicy);
             if (result.Value<bool>("success") != true)
-                throw new BusinessException(result.Value<string>("errorMsg")) { Code = 0 };
+                throw new BusinessException(result.Value<string>("errorMessage")) { Code = 0 };
 
             var firstJToken = result["result"].FirstOrDefault();
             return new WayBillNoResponse()

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -222,6 +222,7 @@ namespace BBWY.Server.Business
 
         public void DeliveryCallbackFrom1688(string jsonStr)
         {
+            logger.Info(jsonStr);
             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);
@@ -253,10 +254,8 @@ namespace BBWY.Server.Business
 
                 #region 查询采购账号
                 currentProgress = "查询采购账号";
-                var purchaseAccountExp = orderDropshipping.PurchaseAccountId != 0 ? 
-                                         new Func<PurchaseAccount, bool>(pa => pa.Id == orderDropshipping.PurchaseAccountId) :
-                                         new Func<PurchaseAccount, bool>(pa => pa.AccountName == orderDropshipping.BuyerAccount);
-                var purchaseAccount = fsql.Select<PurchaseAccount>().Where(pa => purchaseAccountExp(pa))
+                var purchaseAccount = fsql.Select<PurchaseAccount>().WhereIf(orderDropshipping.PurchaseAccountId != 0, pa => pa.Id == orderDropshipping.PurchaseAccountId)
+                                                                    .WhereIf(orderDropshipping.PurchaseAccountId == 0, pa => pa.AccountName == orderDropshipping.BuyerAccount)
                                                                     .Where(pa => pa.PurchasePlatformId == callbackPlatform).ToOne();
                 if (purchaseAccount == null)
                     throw new Exception($"未查询到采购账号{orderDropshipping.BuyerAccount}");