commitee0ee9b167Merge:e78ab0bcd4888dAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 12:07:22 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commite78ab0baeaAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 12:06:13 2024 +0800 fix 增加权限控制 commit793a3325f2Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:24:41 2024 +0800 Squashed commit of the following: commit d4ab7d407a141b80024f85eeaab0062bea016051 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:23:30 2024 +0800 merge error commit 6204fa4ed15e0be303f7eb62307476725b8e7e36 Merge: 7290f0b aaeacf4 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:19:41 2024 +0800 Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commit aaeacf4ffa778eb6a6104e2349357644d038151b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa Author: cheche <717840555@qq.com> Date: Tue Mar 12 14:00:53 2024 +0800 fix 营业点配置权限 commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920 Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commit153f0ecd2aAuthor: cheche <717840555@qq.com> Date: Tue Mar 19 09:58:31 2024 +0800 fix 返回支付方式中文描述 commite548c780b8Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:59:45 2024 +0800 fix 优化送餐 commitfa376f7671Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:11:45 2024 +0800 fix 参数结构调整 commit1b58ca69bfAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:57:18 2024 +0800 fix 餐次数据补充 commite8a98c614cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:56 2024 +0800 add 补充实体变更 commit4651adedc3Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:38 2024 +0800 fix 优化查询,增加详情接口 commitad48e37273Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:09:16 2024 +0800 fix 枚举code过滤 commitabf2e2ed29Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:44:15 2024 +0800 fix 获取订餐最晚时间 commit00869111dfAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 14:21:19 2024 +0800 fix 检验权限修改 commit7b83014119Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 13:42:35 2024 +0800 fix 优化菜品保存和分页 commitfefc785b66Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:17:19 2024 +0800 fix 修改营业点返回体 commit3b7874a2a0Author: cheche <717840555@qq.com> Date: Mon Mar 18 12:14:06 2024 +0800 fix currentUser commitc825531fdaAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 11:03:43 2024 +0800 fix 提交可编译版本 commit8f430bccd3Author: cheche <717840555@qq.com> Date: Mon Mar 18 11:48:38 2024 +0800 fix GetDishesMenusBookingResponse修改字段 commit69c60dc459Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:59:52 2024 +0800 fix 增加日期返回 commitfadee3861aAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 11:01:31 2024 +0800 fix GetDishesMenusBookingSetting返回体修改 commit058b989eadAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 10:54:28 2024 +0800 fix 获取营业点下面餐次 commita82e7ff798Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:28:56 2024 +0800 fix 命名空间调整 commit9acdab4e01Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:27:46 2024 +0800 fix 更新控制器名称 commit3005443392Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:01:03 2024 +0800 feat 菜品/菜单配置 commita59404711cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 21:26:16 2024 +0800 feat 获取服务时间 commitba0fe3e67fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 20:58:11 2024 +0800 fix 处理next空数组 commit97fb157c9fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 20:49:44 2024 +0800 fix 营业点权限调整 commit70420b9668Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:54:15 2024 +0800 fix 修改IBusinessPlacePermissionsService commit6f2383c663Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:47:33 2024 +0800 fix api commit99e1c8f125Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 18:03:09 2024 +0800 fix 实体变更 commitd327e9e3aaAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 16:06:17 2024 +0800 fix 临时修改送餐代码 commit4825648e41Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 15:13:53 2024 +0800 fix 按基地分配获取值错误 commit8ed8addbf3Author: cheche <717840555@qq.com> Date: Fri Mar 15 15:10:55 2024 +0800 fix 表增加ITenantid commitcd4888d900Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 12:06:13 2024 +0800 fix 增加权限控制 commit1cd9b2467eAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:24:41 2024 +0800 Squashed commit of the following: commit d4ab7d407a141b80024f85eeaab0062bea016051 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:23:30 2024 +0800 merge error commit 6204fa4ed15e0be303f7eb62307476725b8e7e36 Merge: 7290f0b aaeacf4 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:19:41 2024 +0800 Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commit aaeacf4ffa778eb6a6104e2349357644d038151b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa Author: cheche <717840555@qq.com> Date: Tue Mar 12 14:00:53 2024 +0800 fix 营业点配置权限 commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920 Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commited25ab626aAuthor: cheche <717840555@qq.com> Date: Tue Mar 19 09:58:31 2024 +0800 fix 返回支付方式中文描述 commitc4b48131d2Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:59:45 2024 +0800 fix 优化送餐 commit8f26e7e84bAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:11:45 2024 +0800 fix 参数结构调整 commit8307d1d941Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:57:18 2024 +0800 fix 餐次数据补充 commit068a5b9507Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:56 2024 +0800 add 补充实体变更 commit805f0f83d1Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:38 2024 +0800 fix 优化查询,增加详情接口 commit9ef57fba55Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:09:16 2024 +0800 fix 枚举code过滤 commit0124fa4bc9Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:44:15 2024 +0800 fix 获取订餐最晚时间 commitfd4a925b4aAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 14:21:19 2024 +0800 fix 检验权限修改 commite6dee2d504Merge:2cbf894b3b9962Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:18:15 2024 +0800 fix 解决dishersservice冲突 commit2cbf894ea8Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:17:19 2024 +0800 fix 修改营业点返回体 commitb3b99623e3Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 13:42:35 2024 +0800 fix 优化菜品保存和分页 commitfcc1f134edAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 12:14:06 2024 +0800 fix currentUser commit253caf26c1Merge:c743d2d63ded81Author: cheche <717840555@qq.com> Date: Mon Mar 18 11:48:41 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commitc743d2d1c5Author: cheche <717840555@qq.com> Date: Mon Mar 18 11:48:38 2024 +0800 fix GetDishesMenusBookingResponse修改字段 commit63ded819c5Merge:5fe41043b46ac2Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 11:03:45 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit5fe4104ff6Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 11:03:43 2024 +0800 fix 提交可编译版本 commit3b46ac25a7Merge:11a3a0aa2eca2cAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 11:01:33 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit11a3a0adedAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 11:01:31 2024 +0800 fix GetDishesMenusBookingSetting返回体修改 commita2eca2cdebAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:59:52 2024 +0800 fix 增加日期返回 commit0bed0bc97bAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 10:54:28 2024 +0800 fix 获取营业点下面餐次 commitc1d84ae1c6Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:28:56 2024 +0800 fix 命名空间调整 commite2cc31003fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:27:46 2024 +0800 fix 更新控制器名称 commitab406adecfAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:01:03 2024 +0800 feat 菜品/菜单配置 commit6ba2d7d6a2Author: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 21:26:16 2024 +0800 feat 获取服务时间 commit6872518b65Author: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 20:58:11 2024 +0800 fix 处理next空数组 commit423d90bf3dAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 20:49:44 2024 +0800 fix 营业点权限调整 commit220ff2d963Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:54:15 2024 +0800 fix 修改IBusinessPlacePermissionsService commit72f93a59a6Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:47:33 2024 +0800 fix api commit149660ca0fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 18:03:09 2024 +0800 fix 实体变更 commit9a84143315Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 16:06:17 2024 +0800 fix 临时修改送餐代码 commit328ef5f42cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 15:13:53 2024 +0800 fix 按基地分配获取值错误 commitea4a15c44bMerge:a3112eb255f4b4Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 15:13:37 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit255f4b4a13Author: cheche <717840555@qq.com> Date: Fri Mar 15 15:10:55 2024 +0800 fix 表增加ITenantid
208 lines
6.5 KiB
C#
208 lines
6.5 KiB
C#
using Dlhis.Canteen.Dishes.Request;
|
|
using Dlhis.Canteen.Order.Request;
|
|
using Dlhis.Canteen.Order.Response;
|
|
using Dlhis.Canteen.Order.Services;
|
|
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
|
|
using Kurisu.Core.DataAccess.Dto;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
namespace Dlhis.Canteen.Dishes.Controllers;
|
|
|
|
/// <summary>
|
|
/// 充值/消费
|
|
/// </summary>
|
|
[Authorize]
|
|
[Route("api/[controller]")]
|
|
[ApiController]
|
|
public class BalancesController : ControllerBase
|
|
{
|
|
private readonly IBalanceService _balanceService;
|
|
|
|
public BalancesController(IBalanceService balanceService)
|
|
{
|
|
_balanceService = balanceService;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 获取记录分页
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[DataPermission]
|
|
[HttpGet]
|
|
public async Task<Pagination<BalanceRecordResponse>> GetPageAsync([FromQuery] BalanceRecordPageRequest request)
|
|
{
|
|
return await _balanceService.GetPageAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 设备消费记录
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("device/page")]
|
|
[IgnoreTenant]
|
|
public async Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoGetAsync([FromQuery] BalanceRecordPageByDeviceUniqueNoRequest request)
|
|
{
|
|
return await _balanceService.GetPageByDeviceUniqueNoAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 设备消费记录
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("device/page")]
|
|
[IgnoreTenant]
|
|
public async Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoPostAsync(BalanceRecordPageByDeviceUniqueNoRequest request)
|
|
{
|
|
return await _balanceService.GetPageByDeviceUniqueNoAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 用户消费记录
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("user/page")]
|
|
public async Task<Pagination<BalanceRecordUserResponse>> GetPageByUserAsync([FromQuery] BalanceRecordUserPageRequest request)
|
|
{
|
|
return await _balanceService.GetPageByUserAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 作废消费明细
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("obsoluteOutRecord")]
|
|
[Transactional]
|
|
public async Task ObsoluteAsync(BalanceRecordObsoluteRequest request)
|
|
{
|
|
await _balanceService.ObsoluteAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 根据成本中心
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("recordByCostId")]
|
|
public async Task<Pagination<BalanceRecordCostIdResponse>> RecordByCostIdAsync([FromQuery] BalanceRecordPageByCostIdRequest request)
|
|
{
|
|
return await _balanceService.RecordByCostIdAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 消费明细
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("recordPageDetails")]
|
|
public async Task<Pagination<BalanceRecordResponse>> RecordPageDetailsAsync([FromQuery] BalanceRecordPageDetailsRequest request)
|
|
{
|
|
return await _balanceService.RecordPageDetailsAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 消费汇总 根据部门号
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("recordSummaryByNo")]
|
|
public async Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByNoAsync([FromQuery] BalanceRecordSummaryRequest request)
|
|
{
|
|
return await _balanceService.BalanceRecordSummaryByNoAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 消费汇总 根据人事范围
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("recordSummaryByTid")]
|
|
public async Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByTidAsync([FromQuery] BalanceRecordSummaryRequest request)
|
|
{
|
|
return await _balanceService.BalanceRecordSummaryByTidAsync(request);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// 用餐分析
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("BalanceRecordSummaryAsync")]
|
|
public async Task<Pagination<BalanceRecordAnalysisRespones>> BalanceRecordAnalysisAsync([FromQuery] BalanceRecordAnalysisRequest request)
|
|
{
|
|
return await _balanceService.BalanceRecordAnalysisAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 获取消费机总数、离线设备数量、营业点数量、可消费人数、人均日消费额
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
[HttpGet("consumenumbers")]
|
|
public async Task<ConsumeNumberResponse> GetConsumeNumberAsync()
|
|
{
|
|
return await _balanceService.GetConsumeNumberAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// 消费人数详情
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
[HttpGet("spendingDetails")]
|
|
public async Task<Pagination<SpendingDetailResponse>> GetSpendingDetailsAsync([FromQuery]SpendingDetailRequest request)
|
|
{
|
|
return await _balanceService.GetSpendingDetailsAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 日消费均额
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("averageDaily")]
|
|
public async Task<Pagination<AverageDailyResponse>> AverageDailyAsync([FromQuery] AverageDailyRequest request)
|
|
{
|
|
return await _balanceService.AverageDailyAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 获取消费机详情
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("consumeDevices")]
|
|
public async Task<Pagination<DevicePageResponse>> GetConsumeDeviceAsync([FromQuery] GetConsumeDeviceRequest request)
|
|
{
|
|
return await _balanceService.GetConsumeDeviceAsync(request);
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// 电子餐券申请记录查询
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
[HttpGet("oaemealvoucher")]
|
|
public async Task<Pagination<OaEMealVoucherResponse>> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request)
|
|
{
|
|
return await _balanceService.GetOaEMealVoucherAsync(request);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 电子餐券使用记录查询
|
|
/// </summary>
|
|
/// <param name="request"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("oaemealvoucherdetail")]
|
|
public async Task<Pagination<OaEMealVoucherDetailResponse>> GetOaEMealVoucherDetailAsync([FromQuery] OaEMealVoucherDetailRequest request)
|
|
{
|
|
return await _balanceService.GetOaEMealVoucherDetailAsync(request);
|
|
}
|
|
|
|
}
|