From a8a37c179ef2fcd067bbfaffaed4d7c2c5e1a932 Mon Sep 17 00:00:00 2001 From: que01 Date: Wed, 23 Sep 2026 10:53:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B1=95=E7=A4=BA=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=92=A8=E8=AF=A2=E7=8A=B6=E6=80=81=E6=97=B6=E9=97=B4=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .codex-tasks/submission-timeline-epic/EPIC.md | 13 +++++ .../submission-timeline-epic/PROGRESS.md | 13 +++++ .../submission-timeline-epic/SUBTASKS.csv | 4 ++ .../tasks/api/PROGRESS.md | 7 +++ .../tasks/regression/PROGRESS.md | 8 +++ apps/api/src/main.ts | 55 +++++++++++-------- apps/api/test/http.integration.test.js | 9 +++ .../components/modules/records/records.wxml | 2 +- .../components/modules/records/records.wxss | 2 +- apps/miniapp/pages/records/index.js | 4 ++ packages/api-client/src/index.ts | 5 ++ 11 files changed, 98 insertions(+), 24 deletions(-) create mode 100644 .codex-tasks/submission-timeline-epic/EPIC.md create mode 100644 .codex-tasks/submission-timeline-epic/PROGRESS.md create mode 100644 .codex-tasks/submission-timeline-epic/SUBTASKS.csv create mode 100644 .codex-tasks/submission-timeline-epic/tasks/api/PROGRESS.md create mode 100644 .codex-tasks/submission-timeline-epic/tasks/regression/PROGRESS.md diff --git a/.codex-tasks/submission-timeline-epic/EPIC.md b/.codex-tasks/submission-timeline-epic/EPIC.md new file mode 100644 index 0000000..6b39606 --- /dev/null +++ b/.codex-tasks/submission-timeline-epic/EPIC.md @@ -0,0 +1,13 @@ +# 咨询状态反馈 + +## 目标 + +让客户在个人品牌咨询提交后看到真实、可理解的跟进状态和历史轨迹,同时保持品牌和客户身份隔离,不泄露管理员备注等内部信息。 + +## 验收 + +- 客户列表和详情接口返回状态历史的公开字段。 +- 客户只能访问自己的记录和历史。 +- 后台备注仍仅后台可见。 +- 小程序记录页展示当前状态和时间线。 +- API、Admin build、miniapp fixture 全部通过。 diff --git a/.codex-tasks/submission-timeline-epic/PROGRESS.md b/.codex-tasks/submission-timeline-epic/PROGRESS.md new file mode 100644 index 0000000..4cf2166 --- /dev/null +++ b/.codex-tasks/submission-timeline-epic/PROGRESS.md @@ -0,0 +1,13 @@ +# 进度 + +- 任务:咨询状态反馈 +- 形态:epic +- 进度:3/3 +- 当前:全部子任务完成 +- 真相文件:`SUBTASKS.csv` + +## 验证 + +- API integration tests:26 passed。 +- Admin production build:通过。 +- Miniapp fixture 和 visual fixture:通过。 diff --git a/.codex-tasks/submission-timeline-epic/SUBTASKS.csv b/.codex-tasks/submission-timeline-epic/SUBTASKS.csv new file mode 100644 index 0000000..aac53ba --- /dev/null +++ b/.codex-tasks/submission-timeline-epic/SUBTASKS.csv @@ -0,0 +1,4 @@ +id,title,task_type,depends_on,status,task_dir,acceptance_criteria,validation_command,notes +1,客户状态历史 API,single-full,,DONE,tasks/api,列表和详情返回公开状态历史且隔离,pnpm --filter @personal-brand/api test:integration,已完成 +2,小程序状态时间线,single-full,1,DONE,tasks/api,记录页展示当前状态和历史时间线,pnpm --filter @personal-brand/miniapp test:fixture && pnpm --filter @personal-brand/miniapp test:visual-fixture,已完成 +3,回归收口,single-full,2,DONE,tasks/regression,Admin build 与全量检查通过,pnpm --filter @personal-brand/admin build && git diff --check,已完成 diff --git a/.codex-tasks/submission-timeline-epic/tasks/api/PROGRESS.md b/.codex-tasks/submission-timeline-epic/tasks/api/PROGRESS.md new file mode 100644 index 0000000..b357f5d --- /dev/null +++ b/.codex-tasks/submission-timeline-epic/tasks/api/PROGRESS.md @@ -0,0 +1,7 @@ +# 客户状态历史 API + +状态:DONE + +- 客户列表和详情返回状态历史公开字段。 +- 管理员备注和客户 subject 不向客户端返回。 +- 品牌与客户身份隔离保持有效。 diff --git a/.codex-tasks/submission-timeline-epic/tasks/regression/PROGRESS.md b/.codex-tasks/submission-timeline-epic/tasks/regression/PROGRESS.md new file mode 100644 index 0000000..55fe273 --- /dev/null +++ b/.codex-tasks/submission-timeline-epic/tasks/regression/PROGRESS.md @@ -0,0 +1,8 @@ +# 回归收口 + +状态:DONE + +- API 集成测试:26 passed。 +- Admin production build:通过。 +- Miniapp fixture:通过。 +- Miniapp visual fixture:通过。 diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index 5252309..f821f5e 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -282,24 +282,24 @@ export class PublicWorkspaceController { ].includes(String(value.type)) ? (value.type as RuntimeInquiryField["type"]) : "text"; - const options = Array.isArray(value.options) - ? value.options.flatMap((option) => { - if (!option || typeof option !== "object") return []; - const item = option as Record; - return typeof item.label === "string" && typeof item.value === "string" - ? [{ label: item.label, value: item.value }] - : []; - }) - : undefined; - return [ - { - key: value.key, - label: value.label, - type, - required: value.required === true, - ...(options?.length ? { options } : {}), - }, - ]; + const options = Array.isArray(value.options) + ? value.options.flatMap((option) => { + if (!option || typeof option !== "object") return []; + const item = option as Record; + return typeof item.label === "string" && typeof item.value === "string" + ? [{ label: item.label, value: item.value }] + : []; + }) + : undefined; + return [ + { + key: value.key, + label: value.label, + type, + required: value.required === true, + ...(options?.length ? { options } : {}), + }, + ]; }); const inquiryForm = inquiryForms[0] ?? null; const runtimeWorkspace: RuntimeWorkspace = { @@ -480,11 +480,14 @@ export class PublicInquiryFormController { @Controller("customer/inquiry-submissions") export class CustomerInquirySubmissionController { constructor(private readonly prisma: PrismaService) {} - private present( - submission: T, - ): Omit { - const { customerSubject: _customerSubject, ...publicSubmission } = submission; + private present(submission: T) { + const { + customerSubject: _customerSubject, + adminNote: _adminNote, + ...publicSubmission + } = submission; void _customerSubject; + void _adminNote; return publicSubmission; } private identity(request: FastifyRequest): ReturnType { @@ -509,6 +512,10 @@ export class CustomerInquirySubmissionController { include: { inquiryForm: { select: { name: true, purpose: true } }, offering: { select: { id: true, name: true } }, + statusHistory: { + select: { fromStatus: true, toStatus: true, createdAt: true }, + orderBy: { createdAt: "asc" }, + }, }, }); return submissions.map((submission) => this.present(submission)); @@ -522,6 +529,10 @@ export class CustomerInquirySubmissionController { include: { inquiryForm: { select: { name: true, purpose: true } }, offering: { select: { id: true, name: true } }, + statusHistory: { + select: { fromStatus: true, toStatus: true, createdAt: true }, + orderBy: { createdAt: "asc" }, + }, }, }); if (!submission) throw new NotFoundException("咨询记录不存在"); diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index ac0b39b..e7ecbf2 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -604,6 +604,15 @@ test("admin can create and version an inquiry form", async () => { assert.equal(updatedSubmission.statusCode, 200); assert.equal(JSON.parse(updatedSubmission.body).status, "reviewing"); assert.equal(JSON.parse(updatedSubmission.body).adminNote, "已开始评估需求"); + const customerSubmissionAfterUpdate = await request( + `/customer/inquiry-submissions/${savedSubmission.id}`, + { headers: { authorization: `Bearer ${customerToken}` } }, + ); + assert.equal(customerSubmissionAfterUpdate.statusCode, 200); + const customerBody = JSON.parse(customerSubmissionAfterUpdate.body); + assert.equal(customerBody.adminNote, undefined); + assert.equal(customerBody.statusHistory[0].toStatus, "reviewing"); + assert.equal(customerBody.statusHistory[0].adminNote, undefined); const history = await prisma.inquirySubmissionStatusHistory.findMany({ where: { submissionId: savedSubmission.id }, }); diff --git a/apps/miniapp/components/modules/records/records.wxml b/apps/miniapp/components/modules/records/records.wxml index 1168786..98dc33f 100644 --- a/apps/miniapp/components/modules/records/records.wxml +++ b/apps/miniapp/components/modules/records/records.wxml @@ -1 +1 @@ -还没有咨询记录预约一次私享沟通,让我们从你的空间开始。{{item.type}}{{item.status}}{{item.project}} · {{item.offeringName}}档案编号 {{item.id}} {{item.createdAt}} +还没有咨询记录预约一次私享沟通,让我们从你的空间开始。{{item.type}}{{item.status}}{{item.project}} · {{item.offeringName}}档案编号 {{item.id}} {{item.createdAt}}●{{item.status}} · {{item.createdAt}} diff --git a/apps/miniapp/components/modules/records/records.wxss b/apps/miniapp/components/modules/records/records.wxss index 7c970fb..32e2ba4 100644 --- a/apps/miniapp/components/modules/records/records.wxss +++ b/apps/miniapp/components/modules/records/records.wxss @@ -1 +1 @@ -.records{margin-top:22rpx}.empty{text-align:center;padding:120rpx 20rpx;color:#99928a;font-size:26rpx;line-height:1.8}.empty-title{display:block;margin-bottom:16rpx;color:#252525;font:40rpx serif}.empty button{margin-top:34rpx;background:#8a6846;color:#fff;border-radius:0}.record{margin-top:18rpx;padding:28rpx;background:#fff;border:1rpx solid #e6ded5}.record-head{display:flex;justify-content:space-between;font:32rpx serif}.status{color:#8a6846;font:23rpx sans-serif}.project{display:block;margin-top:18rpx;color:#77736b;font-size:26rpx}.meta{display:block;margin-top:16rpx;color:#aaa39a;font-size:22rpx} +.records{margin-top:22rpx}.empty{text-align:center;padding:120rpx 20rpx;color:#99928a;font-size:26rpx;line-height:1.8}.empty-title{display:block;margin-bottom:16rpx;color:#252525;font:40rpx serif}.empty button{margin-top:34rpx;background:#8a6846;color:#fff;border-radius:0}.record{margin-top:18rpx;padding:28rpx;background:#fff;border:1rpx solid #e6ded5}.record-head{display:flex;justify-content:space-between;font:32rpx serif}.status{color:#8a6846;font:23rpx sans-serif}.project{display:block;margin-top:18rpx;color:#77736b;font-size:26rpx}.meta{display:block;margin-top:16rpx;color:#aaa39a;font-size:22rpx}.timeline{margin-top:24rpx;padding-top:18rpx;border-top:1rpx solid #eee7df}.timeline-item{display:flex;gap:12rpx;margin-top:10rpx;color:#77736b;font-size:22rpx}.timeline-dot{color:#8a6846} diff --git a/apps/miniapp/pages/records/index.js b/apps/miniapp/pages/records/index.js index 3c6b151..d0abdf0 100644 --- a/apps/miniapp/pages/records/index.js +++ b/apps/miniapp/pages/records/index.js @@ -22,6 +22,10 @@ Page({ ...item, type: item.inquiryForm?.name || "品牌咨询", status: statusLabels[item.status] || item.status, + timeline: (item.statusHistory || []).map((entry) => ({ + status: statusLabels[entry.toStatus] || entry.toStatus, + createdAt: new Date(entry.createdAt).toLocaleString("zh-CN"), + })), project: "咨询记录", offeringName: item.offering?.name || "品牌合作", createdAt: new Date(item.createdAt).toLocaleDateString("zh-CN"), diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index 16bc397..501b995 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -189,6 +189,11 @@ export interface InquirySubmission { adminNote?: string | null; inquiryForm?: { name: string }; offering?: { id: string; name: string } | null; + statusHistory?: Array<{ + fromStatus?: string | null; + toStatus: string; + createdAt: string; + }>; } export interface CapabilityInstallation { id: string | null;