From 8696e588980ea0f8c011610f1d45aadfd7418b19 Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 3 Sep 2025 04:28:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SQ/SQReservationParticipantsRepository.cs | 49 +++++----- .../SQ/SQReservationsRepository.cs | 96 +++++++++---------- .../sq/sqreservationparticipants/index.html | 10 ++ 3 files changed, 85 insertions(+), 70 deletions(-) diff --git a/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs b/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs index 9170e7d..0030488 100644 --- a/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs +++ b/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs @@ -34,7 +34,7 @@ namespace CoreCms.Net.Repository _unitOfWork = unitOfWork; } - #region 实现重写增删改查操作========================================================== + #region 实现重写增删改查操作========================================================== /// /// 重写异步插入方法 @@ -68,18 +68,18 @@ namespace CoreCms.Net.Repository var oldModel = await DbClient.Queryable().In(entity.id).SingleAsync(); if (oldModel == null) { - jm.msg = "不存在此信息"; - return jm; + jm.msg = "不存在此信息"; + return jm; } //事物处理过程开始 - oldModel.id = entity.id; + oldModel.id = entity.id; oldModel.reservation_id = entity.reservation_id; oldModel.user_id = entity.user_id; oldModel.role = entity.role; oldModel.join_time = entity.join_time; oldModel.quit_time = entity.quit_time; oldModel.status = entity.status; - + //事物处理过程结束 var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync(); jm.code = bl ? 0 : 1; @@ -154,7 +154,7 @@ namespace CoreCms.Net.Repository #endregion - #region 获取缓存的所有数据========================================================== + #region 获取缓存的所有数据========================================================== /// /// 获取缓存的所有数据 @@ -206,14 +206,17 @@ namespace CoreCms.Net.Repository .OrderByIF(orderByExpression != null, orderByExpression, orderByType) .WhereIF(predicate != null, predicate).Select(p => new SQReservationParticipants { - id = p.id, - reservation_id = p.reservation_id, - user_id = p.user_id, - role = p.role, - join_time = p.join_time, - quit_time = p.quit_time, - status = p.status, - + id = p.id, + reservation_id = p.reservation_id, + user_id = p.user_id, + role = p.role, + join_time = p.join_time, + quit_time = p.quit_time, + status = p.status, + important_data = p.important_data, + is_refund = p.is_refund, + remarks = p.remarks, + }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount); } else @@ -222,14 +225,16 @@ namespace CoreCms.Net.Repository .OrderByIF(orderByExpression != null, orderByExpression, orderByType) .WhereIF(predicate != null, predicate).Select(p => new SQReservationParticipants { - id = p.id, - reservation_id = p.reservation_id, - user_id = p.user_id, - role = p.role, - join_time = p.join_time, - quit_time = p.quit_time, - status = p.status, - + id = p.id, + reservation_id = p.reservation_id, + user_id = p.user_id, + role = p.role, + join_time = p.join_time, + quit_time = p.quit_time, + status = p.status, + important_data = p.important_data, + is_refund = p.is_refund, + remarks = p.remarks, }).ToPageListAsync(pageIndex, pageSize, totalCount); } var list = new PageList(page, pageIndex, pageSize, totalCount); diff --git a/CoreCms.Net.Repository/SQ/SQReservationsRepository.cs b/CoreCms.Net.Repository/SQ/SQReservationsRepository.cs index f27e5b4..4065c8d 100644 --- a/CoreCms.Net.Repository/SQ/SQReservationsRepository.cs +++ b/CoreCms.Net.Repository/SQ/SQReservationsRepository.cs @@ -34,7 +34,7 @@ namespace CoreCms.Net.Repository _unitOfWork = unitOfWork; } - #region 实现重写增删改查操作========================================================== + #region 实现重写增删改查操作========================================================== /// /// 重写异步插入方法 @@ -68,11 +68,11 @@ namespace CoreCms.Net.Repository var oldModel = await DbClient.Queryable().In(entity.id).SingleAsync(); if (oldModel == null) { - jm.msg = "不存在此信息"; - return jm; + jm.msg = "不存在此信息"; + return jm; } //事物处理过程开始 - oldModel.id = entity.id; + oldModel.id = entity.id; oldModel.title = entity.title; oldModel.room_id = entity.room_id; oldModel.room_name = entity.room_name; @@ -92,7 +92,7 @@ namespace CoreCms.Net.Repository oldModel.status = entity.status; oldModel.created_at = entity.created_at; oldModel.updated_at = entity.updated_at; - + //事物处理过程结束 var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync(); jm.code = bl ? 0 : 1; @@ -167,7 +167,7 @@ namespace CoreCms.Net.Repository #endregion - #region 获取缓存的所有数据========================================================== + #region 获取缓存的所有数据========================================================== /// /// 获取缓存的所有数据 @@ -219,27 +219,27 @@ namespace CoreCms.Net.Repository .OrderByIF(orderByExpression != null, orderByExpression, orderByType) .WhereIF(predicate != null, predicate).Select(p => new SQReservations { - id = p.id, - title = p.title, - room_id = p.room_id, - room_name = p.room_name, - start_time = p.start_time, - end_time = p.end_time, - duration_minutes = p.duration_minutes, - player_count = p.player_count, - game_type = p.game_type, - game_rule = p.game_rule, - extra_info = p.extra_info, - is_smoking = p.is_smoking, - gender_limit = p.gender_limit, - credit_limit = p.credit_limit, - min_age = p.min_age, - max_age = p.max_age, - deposit_fee = p.deposit_fee, - status = p.status, - created_at = p.created_at, - updated_at = p.updated_at, - + id = p.id, + title = p.title, + room_id = p.room_id, + room_name = p.room_name, + start_time = p.start_time, + end_time = p.end_time, + duration_minutes = p.duration_minutes, + player_count = p.player_count, + game_type = p.game_type, + game_rule = p.game_rule, + extra_info = p.extra_info, + is_smoking = p.is_smoking, + gender_limit = p.gender_limit, + credit_limit = p.credit_limit, + min_age = p.min_age, + max_age = p.max_age, + deposit_fee = p.deposit_fee, + status = p.status, + created_at = p.created_at, + updated_at = p.updated_at, + remarks = p.remarks, }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount); } else @@ -248,27 +248,27 @@ namespace CoreCms.Net.Repository .OrderByIF(orderByExpression != null, orderByExpression, orderByType) .WhereIF(predicate != null, predicate).Select(p => new SQReservations { - id = p.id, - title = p.title, - room_id = p.room_id, - room_name = p.room_name, - start_time = p.start_time, - end_time = p.end_time, - duration_minutes = p.duration_minutes, - player_count = p.player_count, - game_type = p.game_type, - game_rule = p.game_rule, - extra_info = p.extra_info, - is_smoking = p.is_smoking, - gender_limit = p.gender_limit, - credit_limit = p.credit_limit, - min_age = p.min_age, - max_age = p.max_age, - deposit_fee = p.deposit_fee, - status = p.status, - created_at = p.created_at, - updated_at = p.updated_at, - + id = p.id, + title = p.title, + room_id = p.room_id, + room_name = p.room_name, + start_time = p.start_time, + end_time = p.end_time, + duration_minutes = p.duration_minutes, + player_count = p.player_count, + game_type = p.game_type, + game_rule = p.game_rule, + extra_info = p.extra_info, + is_smoking = p.is_smoking, + gender_limit = p.gender_limit, + credit_limit = p.credit_limit, + min_age = p.min_age, + max_age = p.max_age, + deposit_fee = p.deposit_fee, + status = p.status, + created_at = p.created_at, + updated_at = p.updated_at, + remarks = p.remarks, }).ToPageListAsync(pageIndex, pageSize, totalCount); } var list = new PageList(page, pageIndex, pageSize, totalCount); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/sq/sqreservationparticipants/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/sq/sqreservationparticipants/index.html index bdee75e..3946fbc 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/sq/sqreservationparticipants/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/sq/sqreservationparticipants/index.html @@ -160,6 +160,14 @@ if(d.role == 0) return '参与者'; if(d.role == 1) return '发起者'; return d.role; + }}, + { field: 'is_refund', title: '鸽子费状态', width: 130, sort: false, templet: function(d){ + if(d.is_refund == 0) return '未付鸽子费'; + if(d.is_refund == 1) return '已付鸽子费'; + if(d.is_refund == 2) return '退款中'; + if(d.is_refund == 3) return '退款成功'; + if(d.is_refund == 9) return '退款失败'; + return d.is_refund; }}, { field: 'join_time', title: '加入时间', width: 130, sort: false}, { field: 'quit_time', title: '退出时间', width: 130, sort: false}, @@ -168,6 +176,8 @@ if(d.status == 1) return '已退出'; return d.status; }}, + { field: 'remarks', title: '备注', width: 230, sort: false}, + // { width: 162, align: 'center', title:'操作', fixed: 'right', toolbar: '#LAY-app-SQReservationParticipants-tableBox-bar' } ] ]