From 97dcfb06b1c6c2c3e1dfceeb3f57938317865213 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 14 Nov 2023 23:46:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E8=B1=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Statistics/StatisticsBusiness.cs | 6 +++++- .../Dto/Response/Order/XingXinagSearchResponse.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index a99d7736..3a02dccd 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -265,7 +265,11 @@ namespace BBWY.Server.Business var currentSpuCostDetailList = currentOrderCostDetailList.Where(ocd => ocd.ProductId == spuGroup.Key); var currentSkuOrderSkuList = currentOrderSkuList.Where(osku => osku.ProductId == spuGroup.Key); - var totalActualAmount = currentSkuOrderSkuList.Sum(osku => osku.ShouldPay ?? 0M); + var totalActualAmount = currentSkuOrderSkuList.Sum(osku => + { + var pingtaibutie = (osku.PingTaiChengDanYouHuiQuan ?? 0M) + (osku.SuperRedEnvelope ?? 0M) + (osku.XianPinLeiDongQuan ?? 0M); + return (((osku.ShouldPay ?? 0M) - (osku.VenderFee ?? 0M) + pingtaibutie) * osku.ItemTotal) ?? 0M; + }); var totalProfit = currentSpuCostDetailList.Sum(ocd => ocd.SkuGrossProfit); XingXiangCumulative(detailList, spuGroup.Key, false, totalProfit, totalActualAmount, 0); diff --git a/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs b/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs index bf08aee3..ef400646 100644 --- a/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs @@ -58,7 +58,7 @@ namespace BBWY.Server.Model.Dto public decimal Profit { get; set; } /// - /// 实收金额 + /// 实收货款金额 /// public decimal ActualAmount { get; set; }