From 8f244747b55ef07759fce304567053522e187242 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 4 Jul 2023 14:37:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/PurchaseExpressOrderExtension.cs | 4 ++-- .../PurchaseOrder/PurchaseOrderBusiness.cs | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/BBWYB.Server.Business/Extensions/PurchaseExpressOrderExtension.cs b/BBWYB.Server.Business/Extensions/PurchaseExpressOrderExtension.cs index 382eb6b..ad26a54 100644 --- a/BBWYB.Server.Business/Extensions/PurchaseExpressOrderExtension.cs +++ b/BBWYB.Server.Business/Extensions/PurchaseExpressOrderExtension.cs @@ -31,7 +31,7 @@ namespace BBWYB.Server.Business.Extensions .Select(ori => ori.BelongSkuId) .Distinct() .ToList(); - purchaseOrder.BelongSkuIds = string.Join(",", orderSkuIds); + purchaseExpressOrder.BelongSkuIds = string.Join(",", orderSkuIds); //var currentOrderSkuList = orderSkuList.Where(osku => osku.OrderId == purchaseOrder.OrderId && // orderSkuIds.Contains(osku.SkuId)).ToList(); @@ -44,7 +44,7 @@ namespace BBWYB.Server.Business.Extensions } else { - purchaseOrder.BelongSkuIds = purchaseOrder.BelongSkuIds; + purchaseExpressOrder.BelongSkuIds = purchaseOrder.BelongSkuIds; //var currentOrderSkuList = orderSkuList.Where(osku => osku.OrderId == purchaseOrder.OrderId && // purchaseOrder.BelongSkuIds.Contains(osku.SkuId)).ToList(); //foreach (var osku in currentOrderSkuList) diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 1f8dcbd..ce91d6f 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -1020,17 +1020,6 @@ namespace BBWYB.Server.Business var dbOrderCost = fsql.Select(request.OrderId).ToOne(); var dbOrder = fsql.Select(request.OrderId).ToOne(); - //try - //{ - // dbOrderCost.PurchaseAmount = dbOrderCostDetailList.Where(ocd => ocd.PurchaseOrderId != request.PurchaseOrderId).Sum(ocd => ocd.TotalCost); - //} - //catch - //{ - // dbOrderCost.PurchaseAmount = 0; - //} - //dbOrderCost.Profit = dbOrder.OrderTotalPrice - - // dbOrderCost.PurchaseAmount - - // dbOrderCost.DeliveryExpressFreight; // -orderCost.PlatformCommissionAmount var purchaseProductAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.SkuAmount) ?? 0M; var purchaseFreight = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.PurchaseFreight) ?? 0M; var outPackAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.OutPackAmount) ?? 0M;