From 693986ae653479da21991136e80f37da47b33249 Mon Sep 17 00:00:00 2001 From: zpc Date: Tue, 24 Mar 2026 23:55:50 +0800 Subject: [PATCH] bug --- .../Entities/AssessmentRecord.cs | 2 +- .../AssessmentRecord/AssessmentRecordDto.cs | 2 +- .../AssessmentRecordQueryRequest.cs | 2 +- .../AssessmentRecord/AssessmentReportDto.cs | 2 +- .../Models/Planner/BookingDetailDto.cs | 5 ++++ .../Models/Planner/BookingDto.cs | 5 ++++ .../Services/AssessmentRecordService.cs | 1 + .../Services/PlannerService.cs | 4 +++ .../admin-web/src/api/business/planner.ts | 27 ++++++++++++++----- .../business/assessment/record/index.vue | 4 ++- .../views/business/planner/booking/index.vue | 24 ++++++++++++----- .../Services/OrderService.cs | 5 +++- .../Data/MiAssessmentDbContext.cs | 4 +-- .../Entities/AssessmentRecord.cs | 2 +- .../Models/Assessment/AssessmentHistoryDto.cs | 2 +- .../Models/Assessment/ResultStatusDto.cs | 2 +- .../Models/Order/OrderItemDto.cs | 2 +- uniapp/pages/assessment/info/index.vue | 3 ++- 18 files changed, 72 insertions(+), 26 deletions(-) diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/AssessmentRecord.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/AssessmentRecord.cs index b47005f..68318d1 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/AssessmentRecord.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/AssessmentRecord.cs @@ -82,7 +82,7 @@ public class AssessmentRecord public string District { get; set; } = null!; /// - /// 状态：1待测评 2测评中 3生成中 4已完成 + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成 /// public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordDto.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordDto.cs index bdf19de..f5da631 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordDto.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordDto.cs @@ -91,7 +91,7 @@ public class AssessmentRecordDto public string District { get; set; } = null!; /// - /// 状态：1待测评 2测评中 3生成中 4已完成 + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成 /// public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordQueryRequest.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordQueryRequest.cs index 585d94c..425a2ea 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordQueryRequest.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentRecordQueryRequest.cs @@ -16,7 +16,7 @@ public class AssessmentRecordQueryRequest : PagedRequest public long? AssessmentTypeId { get; set; } /// - /// 状态：1待测评 2测评中 3生成中 4已完成 + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成 /// public int? Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentReportDto.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentReportDto.cs index 01e3868..069caa3 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentReportDto.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/AssessmentRecord/AssessmentReportDto.cs @@ -81,7 +81,7 @@ public class AssessmentReportDto public string District { get; set; } = null!; /// - /// 状态：1待测评 2测评中 3生成中 4已完成 + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成 /// public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDetailDto.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDetailDto.cs index 87cc52c..c796713 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDetailDto.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDetailDto.cs @@ -55,6 +55,11 @@ public class BookingDetailDto : BookingDto /// public string? PlannerAvatar { get; set; } + /// + /// 规划师职称 + /// + public string? PlannerTitle { get; set; } + /// /// 规划师简介 /// diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs index afc5b1e..5b1e98a 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs @@ -15,6 +15,11 @@ public class BookingDto /// public long UserId { get; set; } + /// + /// 用户UID + /// + public string? UserUid { get; set; } + /// /// 用户昵称 /// diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs index 4aadb3f..1865ccc 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs @@ -28,6 +28,7 @@ public class AssessmentRecordService : IAssessmentRecordService /// private static readonly Dictionary StatusNames = new() { + { 0, "待支付" }, { 1, "待测评" }, { 2, "测评中" }, { 3, "生成中" }, diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/PlannerService.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/PlannerService.cs index 58583fe..7b37a3c 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/PlannerService.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/PlannerService.cs @@ -334,6 +334,7 @@ public class PlannerService : IPlannerService { Id = b.Id, UserId = b.UserId, + UserUid = b.User != null ? b.User.Uid : null, UserNickname = b.User != null ? b.User.Nickname : null, UserPhone = b.User != null ? b.User.Phone : null, OrderId = b.OrderId, @@ -377,6 +378,7 @@ public class PlannerService : IPlannerService { Id = booking.Id, UserId = booking.UserId, + UserUid = booking.User?.Uid, UserNickname = booking.User?.Nickname, UserPhone = booking.User?.Phone, OrderId = booking.OrderId, @@ -384,6 +386,7 @@ public class PlannerService : IPlannerService PlannerId = booking.PlannerId, PlannerName = booking.Planner?.Name, PlannerAvatar = booking.Planner?.Avatar, + PlannerTitle = booking.Planner?.Title, PlannerIntroduction = booking.Planner?.Introduction, BookingDate = booking.BookingDate, BookingTime = booking.BookingTime, @@ -461,6 +464,7 @@ public class PlannerService : IPlannerService { Id = b.Id, UserId = b.UserId, + UserUid = b.User != null ? b.User.Uid : null, UserNickname = b.User != null ? b.User.Nickname : null, UserPhone = b.User != null ? b.User.Phone : null, OrderId = b.OrderId, diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/planner.ts b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/planner.ts index 72420e2..e0a64b9 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/planner.ts +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/planner.ts @@ -45,14 +45,18 @@ export interface UpdatePlannerRequest extends CreatePlannerRequest { export interface BookingItem { id: number userId: number + userUid: string userNickname: string userPhone: string plannerId: number plannerName: string bookingDate: string - studentName: string - studentGrade: number - studentGradeName: string + name: string + phone: string + gender: number + genderName: string + grade: number + gradeName: string status: number statusName: string createTime: string @@ -61,11 +65,22 @@ export interface BookingItem { export interface BookingDetail extends BookingItem { plannerAvatar: string plannerTitle: string - studentSchool: string - studentScores: string - remark: string | null + majorName: string + scoreChinese: number | null + scoreMath: number | null + scoreEnglish: number | null + scorePhysics: number | null + scoreChemistry: number | null + scoreBiology: number | null + scoreGeography: number | null + scorePolitics: number | null + plannerIntroduction: string + orderAmount: number | null + orderStatus: number | null + orderStatusName: string | null orderId: number orderNo: string + updateTime: string } export interface BookingQuery extends PagedRequest { diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue index 394d6bf..0443cef 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue @@ -33,6 +33,7 @@ + @@ -483,10 +484,11 @@ const editConclusionDialogVisible = computed({ /** * 获取状态标签类型 - * 待测评=info, 测评中=primary, 生成中=warning, 已完成=success + * 待支付=info, 待测评=info, 测评中=primary, 生成中=warning, 已完成=success */ function getStatusTagType(status: number): 'info' | 'primary' | 'warning' | 'success' | 'danger' { switch (status) { + case 0: return 'info' case 1: return 'info' case 2: return 'primary' case 3: return 'warning' diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/planner/booking/index.vue b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/planner/booking/index.vue index 9e5e6bd..926ec0a 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/planner/booking/index.vue +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/planner/booking/index.vue @@ -47,6 +47,7 @@ @@ -58,8 +59,8 @@ @@ -99,6 +100,7 @@ {{ detailData.id }} {{ detailData.orderNo }} + {{ detailData.userUid }} {{ detailData.userNickname }} {{ detailData.userPhone }} @@ -111,11 +113,19 @@ {{ detailData.bookingDate }} - {{ detailData.studentName }} - {{ detailData.studentGradeName }} - {{ detailData.studentSchool || '-' }} - {{ detailData.studentScores || '-' }} - {{ detailData.remark || '-' }} + {{ detailData.name }} + {{ detailData.genderName }} + {{ detailData.gradeName }} + {{ detailData.phone }} + {{ detailData.majorName || '-' }} + {{ detailData.scoreChinese ?? '-' }} + {{ detailData.scoreMath ?? '-' }} + {{ detailData.scoreEnglish ?? '-' }} + {{ detailData.scorePhysics ?? '-' }} + {{ detailData.scoreChemistry ?? '-' }} + {{ detailData.scoreBiology ?? '-' }} + {{ detailData.scoreGeography ?? '-' }} + {{ detailData.scorePolitics ?? '-' }} {{ detailData.statusName }} diff --git a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs index 0854498..224f63b 100644 --- a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs +++ b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs @@ -479,6 +479,8 @@ public class OrderService : IOrderService if (request.OrderType == 1) { // 测评订单 - 创建测评记录（Requirements 8.1） + // 需要支付的订单，测评记录初始状态为0（待支付），支付成功后由回调设为1（待测评） + // 免支付订单（邀请码）直接设为1（待测评） var assessmentRecord = new MiAssessment.Model.Entities.AssessmentRecord { UserId = userId, @@ -492,7 +494,7 @@ public class OrderService : IOrderService Province = request.AssessmentInfo.Province, City = request.AssessmentInfo.City, District = request.AssessmentInfo.District, - Status = 1, // 待测评 + Status = needPay ? 0 : 1, // 需要支付则待支付(0)，免支付则待测评(1) CreateTime = now, UpdateTime = now, IsDeleted = false @@ -779,6 +781,7 @@ public class OrderService : IOrderService { return status switch { + 0 => "待支付", 1 => "待测评", 2 => "测评中", 3 => "生成中", diff --git a/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs b/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs index f90eaff..a664fe5 100644 --- a/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs +++ b/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs @@ -825,8 +825,8 @@ public partial class MiAssessmentDbContext : DbContext .HasMaxLength(50) .HasComment("区县"); entity.Property(e => e.Status) - .HasDefaultValue(1) - .HasComment("状态：1待测评 2测评中 3生成中 4已完成"); + .HasDefaultValue(0) + .HasComment("状态：0待支付 1待测评 2测评中 3生成中 4已完成"); entity.Property(e => e.StartTime) .HasComment("开始答题时间"); entity.Property(e => e.SubmitTime) diff --git a/server/MiAssessment/src/MiAssessment.Model/Entities/AssessmentRecord.cs b/server/MiAssessment/src/MiAssessment.Model/Entities/AssessmentRecord.cs index 39649c8..100ccb5 100644 --- a/server/MiAssessment/src/MiAssessment.Model/Entities/AssessmentRecord.cs +++ b/server/MiAssessment/src/MiAssessment.Model/Entities/AssessmentRecord.cs @@ -82,7 +82,7 @@ public class AssessmentRecord public string District { get; set; } = null!; /// - /// 状态：1待测评 2测评中 3生成中 4已完成 + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成 /// public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/AssessmentHistoryDto.cs b/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/AssessmentHistoryDto.cs index b301a68..4952910 100644 --- a/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/AssessmentHistoryDto.cs +++ b/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/AssessmentHistoryDto.cs @@ -31,7 +31,7 @@ public class AssessmentHistoryDto public long AssessmentTypeId { get; set; } /// - /// 状态：1待测评 2测评中 3生成中 4已完成 + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成 /// public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/ResultStatusDto.cs b/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/ResultStatusDto.cs index d8ddf2d..36f63b3 100644 --- a/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/ResultStatusDto.cs +++ b/server/MiAssessment/src/MiAssessment.Model/Models/Assessment/ResultStatusDto.cs @@ -6,7 +6,7 @@ namespace MiAssessment.Model.Models.Assessment; public class ResultStatusDto { /// - /// 状态：1待测评 2测评中 3生成中 4已完成 5生成失败 + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成 5生成失败 /// public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Model/Models/Order/OrderItemDto.cs b/server/MiAssessment/src/MiAssessment.Model/Models/Order/OrderItemDto.cs index 612883e..67a67e2 100644 --- a/server/MiAssessment/src/MiAssessment.Model/Models/Order/OrderItemDto.cs +++ b/server/MiAssessment/src/MiAssessment.Model/Models/Order/OrderItemDto.cs @@ -54,7 +54,7 @@ public class OrderItemDto public long? AssessmentRecordId { get; set; } /// - /// 测评记录状态：1待测评 2测评中 3生成中 4已完成（测评订单时有值） + /// 状态：0待支付 1待测评 2测评中 3生成中 4已完成（测评订单时有值） /// public int? AssessmentStatus { get; set; } diff --git a/uniapp/pages/assessment/info/index.vue b/uniapp/pages/assessment/info/index.vue index 8630cd3..25eb2bc 100644 --- a/uniapp/pages/assessment/info/index.vue +++ b/uniapp/pages/assessment/info/index.vue @@ -851,7 +851,7 @@ onLoad((options) => { } .popup-body { - padding: $spacing-xl $spacing-lg; + padding: $spacing-lg; } .popup-footer { @@ -948,5 +948,6 @@ onLoad((options) => { color: $text-color; text-align: center; letter-spacing: 8rpx; + box-sizing: border-box; }