From c00e18839293d42f4e61401972a724978939ebad Mon Sep 17 00:00:00 2001 From: que01 Date: Mon, 21 Sep 2026 15:36:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=9A=84=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/features/overview/OverviewPage.tsx | 3 +-- .../src/features/services/ServicesPage.tsx | 10 +++++----- apps/admin/src/main.tsx | 18 ++---------------- apps/api/src/admin.dto.ts | 8 ++++++-- apps/api/src/booking.service.ts | 3 ++- apps/api/src/template-workspace.service.ts | 5 +---- 6 files changed, 17 insertions(+), 30 deletions(-) diff --git a/apps/admin/src/features/overview/OverviewPage.tsx b/apps/admin/src/features/overview/OverviewPage.tsx index 84ba847..1fa8bc6 100644 --- a/apps/admin/src/features/overview/OverviewPage.tsx +++ b/apps/admin/src/features/overview/OverviewPage.tsx @@ -23,8 +23,7 @@ export function OverviewPage() { const retry = () => results.forEach((result) => void result.refetch()); const brand = results[0].data; const workspace = results[1].data as - | { inquiryForm?: { isEnabled?: boolean }; modules?: Array<{ isEnabled?: boolean }> } - | undefined; + { inquiryForm?: { isEnabled?: boolean }; modules?: Array<{ isEnabled?: boolean }> } | undefined; const trust = results[2].data; const offerings = results[3].data as Array<{ isEnabled?: boolean }> | undefined; const submissions = results[4].data; diff --git a/apps/admin/src/features/services/ServicesPage.tsx b/apps/admin/src/features/services/ServicesPage.tsx index 1e0f79e..8bafa13 100644 --- a/apps/admin/src/features/services/ServicesPage.tsx +++ b/apps/admin/src/features/services/ServicesPage.tsx @@ -324,11 +324,11 @@ export function ServicesPage() { onOk={() => form.submit()} confirmLoading={save.isPending} > -
save.mutate(values as Record)} - > + save.mutate(values as Record)} + > diff --git a/apps/admin/src/main.tsx b/apps/admin/src/main.tsx index a5d98bc..eddf7ed 100644 --- a/apps/admin/src/main.tsx +++ b/apps/admin/src/main.tsx @@ -1,21 +1,7 @@ import React, { Suspense, useState } from "react"; import { createRoot } from "react-dom/client"; -import { - QueryClient, - QueryClientProvider, -} from "@tanstack/react-query"; -import { - App, - Button, - Card, - Form, - Input, - Layout, - Menu, - Space, - Typography, - message, -} from "antd"; +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { App, Button, Card, Form, Input, Layout, Menu, Space, Typography, message } from "antd"; import { createApiClient } from "./lib/api.js"; const FeatureInquiriesPage = React.lazy(() => import("./features/inquiries/InquiriesPage.js").then((module) => ({ diff --git a/apps/api/src/admin.dto.ts b/apps/api/src/admin.dto.ts index 463bb63..ae4398c 100644 --- a/apps/api/src/admin.dto.ts +++ b/apps/api/src/admin.dto.ts @@ -180,7 +180,9 @@ export class CreateInquiryFormDto { @IsOptional() @IsString() offeringId?: string; @IsOptional() @IsIn(["inquiry", "booking", "quote-request"]) purpose?: string; @IsOptional() @IsIn(["brand", "offering"]) targetType?: string; - @IsOptional() @IsIn(["create-inquiry", "create-booking", "create-quote"]) submissionAction?: string; + @IsOptional() + @IsIn(["create-inquiry", "create-booking", "create-quote"]) + submissionAction?: string; @IsArray() fieldsSnapshot!: unknown[]; @IsOptional() @IsBoolean() isEnabled?: boolean; } @@ -190,7 +192,9 @@ export class UpdateInquiryFormDto { @IsOptional() @IsString() offeringId?: string; @IsOptional() @IsIn(["inquiry", "booking", "quote-request"]) purpose?: string; @IsOptional() @IsIn(["brand", "offering"]) targetType?: string; - @IsOptional() @IsIn(["create-inquiry", "create-booking", "create-quote"]) submissionAction?: string; + @IsOptional() + @IsIn(["create-inquiry", "create-booking", "create-quote"]) + submissionAction?: string; @IsOptional() @IsArray() fieldsSnapshot?: unknown[]; @IsOptional() @IsBoolean() isEnabled?: boolean; } diff --git a/apps/api/src/booking.service.ts b/apps/api/src/booking.service.ts index 810b61d..c07fb41 100644 --- a/apps/api/src/booking.service.ts +++ b/apps/api/src/booking.service.ts @@ -123,7 +123,8 @@ export class BookingService { async cancelForCustomer(brandId: string, customerUserId: string, id: string) { const booking = await this.prisma.booking.findFirst({ where: { id, brandId, customerUserId } }); if (!booking) throw new NotFoundException("订单不存在"); - if (booking.status !== "received") throw new BadRequestException("当前状态不可取消"); + if (!canTransitionBasicBooking(booking.currentState, "cancelled")) + throw new BadRequestException("当前状态不可取消"); return this.prisma.$transaction(async (tx) => { const updated = await tx.booking.update({ where: { id }, diff --git a/apps/api/src/template-workspace.service.ts b/apps/api/src/template-workspace.service.ts index db507ef..2e193e9 100644 --- a/apps/api/src/template-workspace.service.ts +++ b/apps/api/src/template-workspace.service.ts @@ -126,10 +126,7 @@ export class TemplateWorkspaceService { data: { templateVersion: template.version, configSnapshot: template as unknown as Prisma.InputJsonValue, - previousSnapshots: [ - ...history, - installation.configSnapshot, - ], + previousSnapshots: [...history, installation.configSnapshot], }, }); return { installation: updated, addedModules, addedFields };