diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index 66ac0bf4..42a11be3 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -300,14 +300,6 @@ namespace BBWY.Server.Business var totalProfit = currentSpuCostDetailList.Sum(ocd => ocd.SkuGrossProfit); XingXiangCumulative(detailList, spuGroup.Key, false, totalProfit, totalActualAmount, 0); - - //var tempSpuProductAmount = spuGroup.Sum(osku => osku.Price * osku.ItemTotal) ?? 0M; - //var tempSpuCost = currentSpuCostDetailList.Count() > 0 ? currentSpuCostDetailList.Sum(ocd => ocd.TotalCost) : 0M; - //var tempSpuProfit = tempSpuProductAmount - tempSpuCost; - //var spuProfitPercent = tempOrderProfit == 0M ? 0M : tempSpuProfit / tempOrderProfit; - - //var realSpuProfit = (order.Profit ?? 0M) * spuProfitPercent; - //XingXiangCumulative(detailList, spuGroup.Key, false, realSpuProfit, tempSpuProductAmount, 0, 0); } } diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs index c96a107c..d8a38a16 100644 --- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs @@ -593,13 +593,13 @@ namespace BBWY.Server.Business ZhiFuYingXiaoYouHui = oskuCF?.ZhiFuYingXiaoYouHui ?? 0M }; - osku.ActualAmount = (osku.ShouldPay + + osku.ActualAmount = osku.ShouldPay + osku.Balance + osku.PingTaiChengDanYouHuiQuan + osku.SuperRedEnvelope + osku.XianPinLeiDongQuan + osku.JingDou + - osku.DongQuan) * osku.ItemTotal; + osku.DongQuan; insertOrderSkuList.Add(osku); //} //CumulativeSkuDailySalesDetail(skuDailySalesDetailDictionary, dbOrder.StartTime.Value, shopId, skuId, wareId, jdPrice, itemTotal);