From 1503f042e0c8c77901a40b0bcd56de23b00b90b1 Mon Sep 17 00:00:00 2001 From: que01 Date: Sun, 20 Sep 2026 10:02:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=92=A8=E8=AF=A2=E8=A1=A8=E5=8D=95=E5=85=AC=E5=BC=80=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E4=B8=8E=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/src/booking.dto.ts | 6 +++ apps/api/src/main.ts | 55 +++++++++++++++++++++++++- apps/api/test/http.integration.test.js | 10 +++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/apps/api/src/booking.dto.ts b/apps/api/src/booking.dto.ts index 3592a7e..87a800c 100644 --- a/apps/api/src/booking.dto.ts +++ b/apps/api/src/booking.dto.ts @@ -5,6 +5,7 @@ import { IsInt, IsISO8601, IsOptional, + IsObject, IsString, Max, Min, @@ -33,3 +34,8 @@ export class CreateBookingDto { @IsArray() @ValidateNested({ each: true }) @Type(() => BookingItemDto) items: BookingItemDto[] = []; } + +export class CreateInquirySubmissionDto { + @IsString() formId!: string; + @IsObject() values!: Record; +} diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index 732a301..83ecce0 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -22,7 +22,7 @@ import type { NestFastifyApplication } from "@nestjs/platform-fastify"; import { PrismaService } from "./prisma.service.js"; import { WechatAuthService } from "./wechat-auth.js"; import { BookingService } from "./booking.service.js"; -import { CreateBookingDto } from "./booking.dto.js"; +import { CreateBookingDto, CreateInquirySubmissionDto } from "./booking.dto.js"; import { CreateServiceDto, CreateTagDto, @@ -176,6 +176,57 @@ export class PublicOfferingController { } } +@Controller("public/inquiry-forms") +export class PublicInquiryFormController { + constructor(private readonly prisma: PrismaService) {} + @Get(":id") + async get(@Param("id") id: string): Promise { + const form = await this.prisma.inquiryForm.findFirst({ + where: { + id, + brandId: process.env.DEFAULT_BRAND_ID ?? "00000000-0000-0000-0000-000000000001", + isEnabled: true, + }, + }); + if (!form) throw new BadRequestException("咨询表单不存在"); + return form; + } +} + +@Controller("customer/inquiry-submissions") +export class CustomerInquirySubmissionController { + constructor(private readonly prisma: PrismaService) {} + @Post() + async create( + @Req() request: FastifyRequest, + @Body() body: CreateInquirySubmissionDto, + ): Promise { + const token = request.headers.authorization?.replace(/^Bearer\s+/i, ""); + if (!token) throw new UnauthorizedException("缺少客户登录态"); + let identity; + try { + identity = readIdentity(token); + } catch { + throw new UnauthorizedException("客户登录态无效或已过期"); + } + if (identity.role !== "customer") throw new ForbiddenException("无客户权限"); + const form = await this.prisma.inquiryForm.findFirst({ + where: { id: body.formId, brandId: identity.brandId, isEnabled: true }, + }); + if (!form) throw new BadRequestException("咨询表单不存在"); + return this.prisma.inquirySubmission.create({ + data: { + brandId: identity.brandId, + inquiryFormId: form.id, + formVersion: form.version, + fieldsSnapshot: form.fieldsSnapshot as Prisma.InputJsonValue, + values: body.values as Prisma.InputJsonValue, + activeFields: Object.fromEntries(Object.keys(body.values).map((key) => [key, true])), + }, + }); + } +} + @Controller("admin/workspace") export class AdminWorkspaceController { constructor(private readonly prisma: PrismaService) {} @@ -789,6 +840,8 @@ export class AdminConfigController { PublicTemplateController, PublicWorkspaceController, PublicOfferingController, + PublicInquiryFormController, + CustomerInquirySubmissionController, AdminWorkspaceController, CustomerSessionController, AdminSessionController, diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index bc23509..32074ea 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -162,7 +162,17 @@ test("admin can create and version an inquiry form", async () => { }); assert.equal(updated.statusCode, 200); assert.equal(JSON.parse(updated.body).version, 2); + const publicForm = await request(`/public/inquiry-forms/${id}`); + assert.equal(publicForm.statusCode, 200); + const submission = await request("/customer/inquiry-submissions", { + method: "POST", + headers: { authorization: `Bearer ${customerToken}` }, + payload: { formId: id, values: { project: "品牌升级" } }, + }); + assert.equal(submission.statusCode, 201); + assert.equal(JSON.parse(submission.body).formVersion, 2); } finally { + await prisma.inquirySubmission.deleteMany({ where: { inquiryFormId: id } }); await prisma.inquiryForm.delete({ where: { id } }); } });