From 7cc59bd0535a133f2d32c202d79d1214b0f0c892 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 16 Mar 2022 12:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=B4=A6=E5=8F=B7=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.API/Controllers/PurchaseOrderController.cs     | 1 -
 BBWY.Server.Business/PlatformSDK/_1688Business.cs          | 2 +-
 .../PurchaseOrder/PurchaseOrderBusiness.cs                 | 7 +++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/BBWY.Server.API/Controllers/PurchaseOrderController.cs b/BBWY.Server.API/Controllers/PurchaseOrderController.cs
index afd02293..ecc50e29 100644
--- a/BBWY.Server.API/Controllers/PurchaseOrderController.cs
+++ b/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)
         {
diff --git a/BBWY.Server.Business/PlatformSDK/_1688Business.cs b/BBWY.Server.Business/PlatformSDK/_1688Business.cs
index 2e5b6cf7..1725f2cf 100644
--- a/BBWY.Server.Business/PlatformSDK/_1688Business.cs
+++ b/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()
diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 521c53b9..e8538d94 100644
--- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/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}");