Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

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);

BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs

@@ -58,7 +58,7 @@ namespace BBWY.Server.Model.Dto
         public decimal Profit { get; set; }
 
         /// <summary>
-        /// 实收金额
+        /// 实收货款金额
         /// </summary>
         public decimal ActualAmount { get; set; }