From 4a80fc27ca704936638feacf15439427a8bf2d08 Mon Sep 17 00:00:00 2001 From: zpc Date: Mon, 8 Dec 2025 00:12:17 +0800 Subject: [PATCH] 321 --- .../Entities/SQ/SQReservationParticipants.cs | 7 + .../Entities/SQ/SQReservations.cs | 12 - .../User/CoreCmsUserRepository.cs | 8 +- .../wwwroot/views/user/sqearnings/add.html | 24 +- .../wwwroot/views/user/sqearnings/index.html | 51 ++-- .../wwwroot/views/user/sqwithdraw/index.html | 83 +++--- .../wwwroot/views/user/userInfo/index.html | 218 ++++++-------- .../Controllers/SQController.cs | 5 +- server/鸽子费审核功能需求文档.md | 266 ++++++++++++++++++ 9 files changed, 447 insertions(+), 227 deletions(-) create mode 100644 server/鸽子费审核功能需求文档.md diff --git a/server/CoreCms.Net.Model/Entities/SQ/SQReservationParticipants.cs b/server/CoreCms.Net.Model/Entities/SQ/SQReservationParticipants.cs index 43dfb23..3b38635 100644 --- a/server/CoreCms.Net.Model/Entities/SQ/SQReservationParticipants.cs +++ b/server/CoreCms.Net.Model/Entities/SQ/SQReservationParticipants.cs @@ -151,5 +151,12 @@ namespace CoreCms.Net.Model.Entities /// [Display(Name = "订单id")] public string paymentId { get; set; } + + /// + /// 签到时间 + /// + [Display(Name = "签到时间")] + public System.DateTime? check_reservation { get; set; } + } } diff --git a/server/CoreCms.Net.Model/Entities/SQ/SQReservations.cs b/server/CoreCms.Net.Model/Entities/SQ/SQReservations.cs index 9ffe173..94c75c0 100644 --- a/server/CoreCms.Net.Model/Entities/SQ/SQReservations.cs +++ b/server/CoreCms.Net.Model/Entities/SQ/SQReservations.cs @@ -164,9 +164,6 @@ namespace CoreCms.Net.Model.Entities [Display(Name = "是否禁烟:0=不限制,1=禁烟,2=不禁烟")] [Required(ErrorMessage = "请输入{0}")] - - - public System.Int32 is_smoking { get; set; } @@ -174,11 +171,7 @@ namespace CoreCms.Net.Model.Entities /// 性别限制:0=不限,1=男,2=女 /// [Display(Name = "性别限制:0=不限,1=男,2=女")] - [Required(ErrorMessage = "请输入{0}")] - - - public System.Int32 gender_limit { get; set; } @@ -186,11 +179,6 @@ namespace CoreCms.Net.Model.Entities /// 最低信誉分 /// [Display(Name = "最低信誉分")] - - - - - public System.Decimal? credit_limit { get; set; } diff --git a/server/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs b/server/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs index 0fc8bb9..09c76a7 100644 --- a/server/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs +++ b/server/CoreCms.Net.Repository/User/CoreCmsUserRepository.cs @@ -1,4 +1,4 @@ -/*********************************************************************** +/*********************************************************************** * Project: CoreCms * ProjectName: 核心内容管理系统 * Web: https://www.corecms.net @@ -133,6 +133,12 @@ namespace CoreCms.Net.Repository isDelete = p.isDelete, type = (int)sWeChatInfo.type, parentNickName = sParentUser.nickName, + dove_count=p.dove_count, + credit_score=p.credit_score, + pending_earnings=p.pending_earnings, + play_level=p.play_level, + skills_level=p.skills_level, + withdrawn_earnings=p.withdrawn_earnings, childNum = SqlFunc.Subqueryable().Where(o => o.parentId == p.id).Count() }) .MergeTable().With(SqlWith.Null) diff --git a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/add.html b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/add.html index 16d83ef..eda90b1 100644 --- a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/add.html +++ b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/add.html @@ -33,7 +33,10 @@
- +
+ + +
@@ -57,12 +60,9 @@
-
-
- - - -
+ +
+
@@ -133,6 +133,16 @@ var form = layui.form; var coreHelper = layui.coreHelper; + // 检查是否有预选的用户信息(从用户列表页面传入) + if (d && d.data && d.data.preSelectedUser) { + var preUser = d.data.preSelectedUser; + $('#user_id').val(preUser.id); + $('#user_display').val(preUser.displayName); + // 默认设置为佣金类型 + $('select[name="type"]').val('1'); + form.render('select'); + } + // 加载房间列表 coreHelper.Post('Api/SQEarnings/GetRoomList', {}, function (res) { if (res.code === 0 && res.data) { diff --git a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/index.html b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/index.html index a454a43..2f5df97 100644 --- a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/index.html +++ b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqearnings/index.html @@ -82,13 +82,15 @@ diff --git a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqwithdraw/index.html b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqwithdraw/index.html index 7f5fe39..6d41c9d 100644 --- a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqwithdraw/index.html +++ b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/sqwithdraw/index.html @@ -88,12 +88,14 @@ diff --git a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html index 094252a..6d1e06c 100644 --- a/server/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html +++ b/server/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html @@ -106,8 +106,7 @@