From cbb26575ac4a66dfcd9344b64a8695486ff699f6 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Fri, 23 Feb 2024 11:06:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=88=E5=B9=B6=E9=A4=90=E9=A5=AE?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Controllers/BalancesController.cs   | 20 ++-----------------
 .../Order/Response/ConsumeNumberResponse.cs   | 10 ++++++++++
 .../Order/Services/IBalanceService.cs         |  3 +--
 .../Services/Implements/BalanceService.cs     | 18 +++++++++--------
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index 8c306db1..3015ff75 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -143,25 +143,9 @@ public class BalancesController : ControllerBase
         return await _balanceService.GetConsumeNumberAsync();
     }
 
-    /// <summary>
-    /// 消费走势
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("consumptiontrends")]
-    public async Task<List<ConsumptionTrendResponse>> GetConsumptionTrendsAsync([FromQuery] ConsumptionTrendRequest request)
-    {
-        return await _balanceService.GetConsumptionTrendsAsync(request);
-    }
 
-    /// <summary>
-    /// 餐补走势
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("supplementtrend")]
-    public async Task<List<ConsumptionTrendResponse>> GetSupplementTrendsAsync([FromQuery] ConsumptionTrendRequest request)
-    {
-        return await _balanceService.GetSupplementTrendsAsync(request);
-    }
+
+
 
     /// <summary>
     /// 电子餐券申请记录查询
diff --git a/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs b/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs
index 609b1a68..130bd99b 100644
--- a/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs
@@ -26,5 +26,15 @@
         /// 人均日消费额
         /// </summary>
         public int DailyNumber { get; set; }
+
+        /// <summary>
+        /// 日消费额走势图
+        /// </summary>
+        public List<ConsumptionTrendResponse> Days { get; set; }
+
+        /// <summary>
+        /// 月消费额走势图
+        /// </summary>
+        public List<ConsumptionTrendResponse> Months { get; set; }
     }
 }
diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
index 1c02cd6f..f90026d8 100644
--- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
@@ -27,9 +27,8 @@ public interface IBalanceService : IScopeDependency
 
     Task<ConsumeNumberResponse> GetConsumeNumberAsync();
 
-    Task<List<ConsumptionTrendResponse>> GetConsumptionTrendsAsync(ConsumptionTrendRequest request);
 
-    Task<List<ConsumptionTrendResponse>> GetSupplementTrendsAsync(ConsumptionTrendRequest request);
+
 
     Task<Pagination<OaEMealVoucherResponse>> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request);
 
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 9a3f88b0..063353ca 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -575,18 +575,25 @@ public class BalanceService : IBalanceService
         var monthlySpending = monthbs.Sum(x => x.Amount);
         //当日消费人数
         var monthlyCount = monthbs.Select(x => x.UserCode).Distinct().Count();
+
+        //消费走势
+        var months = await GetConsumptionTrendsAsync(ConsumptionTrendEnumType.Month);
+        var days = await GetConsumptionTrendsAsync(ConsumptionTrendEnumType.Day);
+
         var res = new ConsumeNumberResponse
         {
             Total = devices.Count(),
             OffNumber = offCount,
             PlaceNumber = places.Count(),
             ConsumerableNumber = consumerable,
-            DailyNumber = monthlyCount != 0 ? (int)Math.Ceiling(monthlySpending / monthlyCount) : 0
+            DailyNumber = monthlyCount != 0 ? Math.Abs((int)Math.Ceiling(monthlySpending / monthlyCount)) : 0,
+            Days = days,
+            Months = months
         };
         return res;
 
     }
-    public async Task<List<ConsumptionTrendResponse>> GetConsumptionTrendsAsync(ConsumptionTrendRequest request)
+    private async Task<List<ConsumptionTrendResponse>> GetConsumptionTrendsAsync(ConsumptionTrendEnumType type)
     {
         var bs = await _dbContext.Queryable<BalanceRecordEntity>()
             .Where(x => x.Type == BalanceRecordTypeEnumType.Out)
@@ -595,7 +602,7 @@ public class BalanceService : IBalanceService
         var totalAmount = Math.Round(Math.Abs(bs.Sum(x => x.Amount)), 2);
 
         var list = new List<ConsumptionTrendResponse>();
-        if (request.Type == ConsumptionTrendEnumType.Month)
+        if (type == ConsumptionTrendEnumType.Month)
         {
             //月与总额对比
             var months = GetMonthsOfYear();
@@ -636,11 +643,6 @@ public class BalanceService : IBalanceService
         return list;
     }
 
-    public async Task<List<ConsumptionTrendResponse>> GetSupplementTrendsAsync(ConsumptionTrendRequest request)
-    {
-        //todo
-        return new List<ConsumptionTrendResponse>();
-    }
 
     public async Task<Pagination<OaEMealVoucherResponse>> GetOaEMealVoucherAsync(OaEMealVoucherRequest request)
     {