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 /// /// /// - [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("success") != true) - throw new BusinessException(result.Value("errorMsg")) { Code = 0 }; + throw new BusinessException(result.Value("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("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(pa => pa.Id == orderDropshipping.PurchaseAccountId) : - new Func(pa => pa.AccountName == orderDropshipping.BuyerAccount); - var purchaseAccount = fsql.Select().Where(pa => purchaseAccountExp(pa)) + var purchaseAccount = fsql.Select().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}");