diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index 0fd2515e..8e5c9b8f 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -209,7 +209,7 @@ namespace BBWY.Server.Business GOIByShop shopGoi = null; #region spu goi { - var httpResult = restApiService.SendRequest("http://snapi.qiyue666.com/api/goi/QueryPopularizeLevelGOIBySpuId", string.Empty, new + var httpResult = restApiService.SendRequest("http://snapi.qiyue666.com/", "Api/GOI/QueryPopularizeLevelGOIBySpuId", new { SpuIdList = spuIdList, StartTime = xingXiangSearchOrderRequest.SearchDate, @@ -218,14 +218,14 @@ namespace BBWY.Server.Business if (httpResult.StatusCode != System.Net.HttpStatusCode.OK) throw new BusinessException("查询spu goi失败"); - var listRes = JsonConvert.DeserializeObject>(httpResult.Content); + var listRes = JsonConvert.DeserializeObject>>(httpResult.Content)?.Data; spuGoiList = listRes.ItemList; } #endregion #region shop goi { - var httpResult = restApiService.SendRequest("http://snapi.qiyue666.com/api/goi/QueryPopularizeLevelGOIByShopId", string.Empty, new + var httpResult = restApiService.SendRequest("http://snapi.qiyue666.com/", "Api/GOI/QueryPopularizeLevelGOIByShopId", new { xingXiangSearchOrderRequest.ShopId, StartTime = xingXiangSearchOrderRequest.SearchDate, @@ -234,7 +234,7 @@ namespace BBWY.Server.Business if (httpResult.StatusCode != System.Net.HttpStatusCode.OK) throw new BusinessException("查询店铺 goi失败"); - shopGoi = JsonConvert.DeserializeObject(httpResult.Content); + shopGoi = JsonConvert.DeserializeObject>(httpResult.Content)?.Data; } #endregion @@ -280,6 +280,7 @@ namespace BBWY.Server.Business { var productAmount = orderSkuList.Where(osku => osku.ProductId == d.Spu).Sum(osku => osku.ItemTotal * osku.Price); d.SpuYingLiRatio = Math.Round((spuGoi.Profit - spuGoi.Cost) / productAmount.Value, 2); + //d.SpuYingLiRatio = Math.Round((d.Profit - spuGoi.Cost) / productAmount.Value, 2); } d.ShopYingLiRatio = shopProductAmount == 0 ? 0 : Math.Round((shopGoi.Profit - shopGoi.Cost) / shopProductAmount.Value, 2); @@ -295,7 +296,9 @@ namespace BBWY.Server.Business TotalSDOrderAmount = detailList.Sum(xx => xx.SDOrderAmount), TotalSDOrderCount = sdOrderList.Count(), TotalSDOrderCost = detailList.Sum(xx => xx.SDOrderCost), - TotalProfit = detailList.Sum(xx => xx.Profit) + TotalProfit = detailList.Sum(xx => xx.Profit), + ShopYingLiRatio = detailList.FirstOrDefault()?.ShopYingLiRatio, + ShopProfitRatio = detailList.FirstOrDefault()?.ShopProfitRatio }; } diff --git a/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs b/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs index 9a726b8b..fb790e6f 100644 --- a/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Order/XingXinagSearchResponse.cs @@ -29,6 +29,16 @@ namespace BBWY.Server.Model.Dto /// 总利润 /// public decimal TotalProfit { get; set; } + + /// + /// 店铺毛利率 + /// + public decimal? ShopProfitRatio { get; set; } + + /// + /// 店铺盈利率 + /// + public decimal? ShopYingLiRatio { get; set; } } public class XingXiangItemResponse