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();
}
- ///
- /// 消费走势
- ///
- ///
- [HttpGet("consumptiontrends")]
- public async Task> GetConsumptionTrendsAsync([FromQuery] ConsumptionTrendRequest request)
- {
- return await _balanceService.GetConsumptionTrendsAsync(request);
- }
- ///
- /// 餐补走势
- ///
- ///
- [HttpGet("supplementtrend")]
- public async Task> GetSupplementTrendsAsync([FromQuery] ConsumptionTrendRequest request)
- {
- return await _balanceService.GetSupplementTrendsAsync(request);
- }
+
+
///
/// 电子餐券申请记录查询
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 @@
/// 人均日消费额
///
public int DailyNumber { get; set; }
+
+ ///
+ /// 日消费额走势图
+ ///
+ public List Days { get; set; }
+
+ ///
+ /// 月消费额走势图
+ ///
+ public List 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 GetConsumeNumberAsync();
- Task> GetConsumptionTrendsAsync(ConsumptionTrendRequest request);
- Task> GetSupplementTrendsAsync(ConsumptionTrendRequest request);
+
Task> 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> GetConsumptionTrendsAsync(ConsumptionTrendRequest request)
+ private async Task> GetConsumptionTrendsAsync(ConsumptionTrendEnumType type)
{
var bs = await _dbContext.Queryable()
.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();
- 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> GetSupplementTrendsAsync(ConsumptionTrendRequest request)
- {
- //todo
- return new List();
- }
public async Task> GetOaEMealVoucherAsync(OaEMealVoucherRequest request)
{