统计修改

Mall.WebApi/Controllers/User/TenantController.cs

@@ -1394,7 +1394,7 @@ namespace Mall.WebApi.Controllers.User
         #region 商城首页统计
 
         /// <summary>
-        /// 首页基础数据统计
+        /// 首页数据统计
         /// </summary>
         /// <returns></returns>
         public ApiResult MallIndexStatistics()
@@ -1402,36 +1402,24 @@ namespace Mall.WebApi.Controllers.User
             var query = JsonConvert.DeserializeObject<StatisticsQuery>(RequestParm.msg.ToString());
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = programModule.MallIndexStatisticsModule(query);
-            return ApiResult.Success(data: list);
-        }
-
-        /// <summary>
-        /// 销售情况统计
-        /// </summary>
-        /// <returns></returns>
-        public ApiResult MallIndexSalesStatistics()
-        {
-            var query = JsonConvert.DeserializeObject<StatisticsQuery>(RequestParm.msg.ToString());
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
-            var list = programModule.MallIndexSalesStatisticsModule(query);
-            return ApiResult.Success(data: list);
-        }
-
-        /// <summary>
-        /// 商品购买力TOP排行
-        /// </summary>
-        /// <returns></returns>
-        public ApiResult MallIndesSalesIncomeStatistics()
-        {
-            var query = JsonConvert.DeserializeObject<StatisticsQuery>(RequestParm.msg.ToString());
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
-            var list = programModule.MallIndesSalesIncomeStatisticsModule(query);
-            return ApiResult.Success(data: list);
+            //首页基础数据统计
+            var basicData = programModule.MallIndexStatisticsModule(query);
+            //销售情况统计
+            var salesData = programModule.MallIndexSalesStatisticsModule(query);
+            //商品购买力TOP排行
+            var saleIncomeData = programModule.MallIndesSalesIncomeStatisticsModule(query);
+            //用户购买力TOP排行
+            var saleUserData = programModule.MallIndesSalesUserStatisticsModule(query);
+            var obj = new
+            {
+                basicData,
+                salesData,
+                saleIncomeData,
+                saleUserData
+            };
+            return ApiResult.Success(data: obj);
         }
-
+ 
         /// <summary>
         /// 下载商品购买力TOP排行
         /// </summary>
@@ -1498,19 +1486,6 @@ namespace Mall.WebApi.Controllers.User
             return fileStream;
         }
 
-        /// <summary>
-        /// 用户购买力TOP排行
-        /// </summary>
-        /// <returns></returns>
-        public ApiResult MallIndesSalesUserStatistics()
-        {
-            var query = JsonConvert.DeserializeObject<StatisticsQuery>(RequestParm.msg.ToString());
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
-            var list = programModule.MallIndesSalesUserStatisticsModule(query);
-            return ApiResult.Success(data: list);
-        }
-
         /// <summary>
         /// 用户购买力TOP排行
         /// </summary>