修复(#120): 补齐用户订阅限速配置前端实现

apps/admin/public/assets/locales/en-US/menu.json

@@ -21,7 +21,6 @@
   "Order Management": "Order Management",
   "Payment Config": "Payment Config",
   "Product Management": "Product Management",
-  "Promo Management": "Promo Management",
   "Redemption Management": "Redemption Management",
   "Register": "Register",
   "Reset Subscribe": "Reset Subscribe",

apps/admin/public/assets/locales/en-US/promo.json

@@ -1,70 +0,0 @@
-{
-  "cancel": "Cancel",
-  "confirm": "Confirm",
-  "confirmDelete": "Are you sure you want to delete?",
-  "createPrice": "Create Promo Price",
-  "createRule": "Create Rule",
-  "createSuccess": "Create Success",
-  "delete": "Delete",
-  "deleteSuccess": "Delete Success",
-  "deleteWarning": "Once deleted, data cannot be recovered. Please proceed with caution.",
-  "detail": "Detail",
-  "edit": "Edit",
-  "editRule": "Edit Rule",
-  "emptyPrices": "No promo prices",
-  "emptyRules": "No promo rules",
-  "emptyUsage": "No promo usage records",
-  "enabled": "Enabled",
-  "endTime": "End Time",
-  "form": {
-    "enterPromoPrice": "Enter price",
-    "inactiveMonths": "Inactive Months",
-    "inactiveMonthsPlaceholder": "Months without purchase",
-    "name": "Name",
-    "namePlaceholder": "Rule name",
-    "noDiscounts": "This subscribe has no discount quantities and cannot be configured.",
-    "promoPriceLessThanOriginalPrice": "Promo price must be lower than original price",
-    "promoPriceLessThanUnitPrice": "Promo price must be lower than unit price",
-    "selectEndTime": "Select time",
-    "selectRule": "Select rule",
-    "selectStartTime": "Select time",
-    "selectQuantity": "Select discount quantity",
-    "selectSubscribe": "Select subscribe",
-    "type": "Rule Type",
-    "windowHours": "Window Hours",
-    "windowHoursPlaceholder": "Hours after registration"
-  },
-  "loadErrorDescription": "Refresh the table or try again later.",
-  "loadPricesError": "Failed to load promo prices",
-  "loadRulesError": "Failed to load promo rules",
-  "loadUsageError": "Failed to load promo usage",
-  "name": "Name",
-  "no": "No",
-  "orderNo": "Order No.",
-  "originalPriceHint": "Original price",
-  "params": "Params",
-  "prices": "Prices",
-  "priority": "Priority",
-  "promoPrice": "Promo Price",
-  "quantity": "Quantity",
-  "rule": "Rule",
-  "ruleDetail": "Rule Detail",
-  "rules": "Rules",
-  "searchRule": "Rule name",
-  "startTime": "Start Time",
-  "subscribe": "Subscribe",
-  "type": "Type",
-  "types": {
-    "campaign": "Campaign",
-    "inactive_user": "Inactive User",
-    "new_user": "New User"
-  },
-  "unitPrice": "Unit Price",
-  "unitPriceHint": "Unit price",
-  "updateSuccess": "Update Success",
-  "usage": "Usage",
-  "usedAt": "Used At",
-  "userId": "User ID",
-  "validityPeriod": "Validity Period",
-  "yes": "Yes"
-}

apps/admin/public/assets/locales/zh-CN/menu.json

@@ -21,7 +21,6 @@
   "Order Management": "订单管理",
   "Payment Config": "支付配置",
   "Product Management": "商品管理",
-  "Promo Management": "促销管理",
   "Redemption Management": "兑换码管理",
   "Register": "注册",
   "Reset Subscribe": "重置订阅",

apps/admin/public/assets/locales/zh-CN/promo.json

@@ -1,70 +0,0 @@
-{
-  "cancel": "取消",
-  "confirm": "确认",
-  "confirmDelete": "确定要删除吗？",
-  "createPrice": "创建促销价",
-  "createRule": "创建规则",
-  "createSuccess": "创建成功",
-  "delete": "删除",
-  "deleteSuccess": "删除成功",
-  "deleteWarning": "删除后数据无法恢复，请谨慎操作。",
-  "detail": "详情",
-  "edit": "编辑",
-  "editRule": "编辑规则",
-  "emptyPrices": "暂无商品促销价",
-  "emptyRules": "暂无促销规则",
-  "emptyUsage": "暂无促销使用记录",
-  "enabled": "启用",
-  "endTime": "结束时间",
-  "form": {
-    "enterPromoPrice": "输入价格",
-    "inactiveMonths": "未活跃月数",
-    "inactiveMonthsPlaceholder": "未购买的月数",
-    "name": "名称",
-    "namePlaceholder": "规则名称",
-    "noDiscounts": "该订阅没有 discount 档位，不能配置促销价。",
-    "promoPriceLessThanOriginalPrice": "促销价必须低于原价",
-    "promoPriceLessThanUnitPrice": "促销价必须低于原价",
-    "selectEndTime": "选择时间",
-    "selectRule": "选择规则",
-    "selectStartTime": "选择时间",
-    "selectQuantity": "选择 discount 档位",
-    "selectSubscribe": "选择订阅",
-    "type": "规则类型",
-    "windowHours": "新用户窗口小时数",
-    "windowHoursPlaceholder": "注册后的小时数"
-  },
-  "loadErrorDescription": "请刷新表格或稍后重试。",
-  "loadPricesError": "促销价加载失败",
-  "loadRulesError": "促销规则加载失败",
-  "loadUsageError": "促销使用记录加载失败",
-  "name": "名称",
-  "no": "否",
-  "orderNo": "订单号",
-  "originalPriceHint": "原价",
-  "params": "参数",
-  "prices": "商品促销价",
-  "priority": "优先级",
-  "promoPrice": "促销价",
-  "quantity": "档位",
-  "rule": "规则",
-  "ruleDetail": "规则详情",
-  "rules": "促销规则",
-  "searchRule": "规则名称",
-  "startTime": "开始时间",
-  "subscribe": "订阅",
-  "type": "类型",
-  "types": {
-    "campaign": "活动",
-    "inactive_user": "回归用户",
-    "new_user": "新用户"
-  },
-  "unitPrice": "原价",
-  "unitPriceHint": "原价",
-  "updateSuccess": "更新成功",
-  "usage": "使用记录",
-  "usedAt": "使用时间",
-  "userId": "用户 ID",
-  "validityPeriod": "有效期",
-  "yes": "是"
-}

apps/admin/src/layout/navs.ts

@@ -49,11 +49,6 @@ export function useNavs() {
             url: "/dashboard/product",
             icon: "flat-color-icons:shop",
           },
-          {
-            title: t("Promo Management", "Promo Management"),
-            url: "/dashboard/promo",
-            icon: "flat-color-icons:briefcase",
-          },
         ],
       },
 

apps/admin/src/main.tsx

@@ -42,7 +42,6 @@ initializeI18n({
     "nodes",
     "order",
     "payment",
-    "promo",
     "product",
     "servers",
     "subscribe",

apps/admin/src/routeTree.gen.ts

@@ -34,8 +34,6 @@ const DashboardSubscribeIndexLazyRouteImport = createFileRoute(
 const DashboardRedemptionIndexLazyRouteImport = createFileRoute(
   '/dashboard/redemption/',
 )()
-const DashboardPromoIndexLazyRouteImport =
-  createFileRoute('/dashboard/promo/')()
 const DashboardProductIndexLazyRouteImport = createFileRoute(
   '/dashboard/product/',
 )()
@@ -188,13 +186,6 @@ const DashboardRedemptionIndexLazyRoute =
   } as any).lazy(() =>
     import('./routes/dashboard/redemption/index.lazy').then((d) => d.Route),
   )
-const DashboardPromoIndexLazyRoute = DashboardPromoIndexLazyRouteImport.update({
-  id: '/promo/',
-  path: '/promo/',
-  getParentRoute: () => DashboardRouteLazyRoute,
-} as any).lazy(() =>
-  import('./routes/dashboard/promo/index.lazy').then((d) => d.Route),
-)
 const DashboardProductIndexLazyRoute =
   DashboardProductIndexLazyRouteImport.update({
     id: '/product/',
@@ -415,7 +406,6 @@ export interface FileRoutesByFullPath {
   '/dashboard/order': typeof DashboardOrderIndexLazyRoute
   '/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
   '/dashboard/product': typeof DashboardProductIndexLazyRoute
-  '/dashboard/promo': typeof DashboardPromoIndexLazyRoute
   '/dashboard/redemption': typeof DashboardRedemptionIndexLazyRoute
   '/dashboard/subscribe': typeof DashboardSubscribeIndexLazyRoute
   '/dashboard/system': typeof DashboardSystemIndexLazyRoute
@@ -452,7 +442,6 @@ export interface FileRoutesByTo {
   '/dashboard/order': typeof DashboardOrderIndexLazyRoute
   '/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
   '/dashboard/product': typeof DashboardProductIndexLazyRoute
-  '/dashboard/promo': typeof DashboardPromoIndexLazyRoute
   '/dashboard/redemption': typeof DashboardRedemptionIndexLazyRoute
   '/dashboard/subscribe': typeof DashboardSubscribeIndexLazyRoute
   '/dashboard/system': typeof DashboardSystemIndexLazyRoute
@@ -492,7 +481,6 @@ export interface FileRoutesById {
   '/dashboard/order/': typeof DashboardOrderIndexLazyRoute
   '/dashboard/payment/': typeof DashboardPaymentIndexLazyRoute
   '/dashboard/product/': typeof DashboardProductIndexLazyRoute
-  '/dashboard/promo/': typeof DashboardPromoIndexLazyRoute
   '/dashboard/redemption/': typeof DashboardRedemptionIndexLazyRoute
   '/dashboard/subscribe/': typeof DashboardSubscribeIndexLazyRoute
   '/dashboard/system/': typeof DashboardSystemIndexLazyRoute
@@ -533,7 +521,6 @@ export interface FileRouteTypes {
     | '/dashboard/order'
     | '/dashboard/payment'
     | '/dashboard/product'
-    | '/dashboard/promo'
     | '/dashboard/redemption'
     | '/dashboard/subscribe'
     | '/dashboard/system'
@@ -570,7 +557,6 @@ export interface FileRouteTypes {
     | '/dashboard/order'
     | '/dashboard/payment'
     | '/dashboard/product'
-    | '/dashboard/promo'
     | '/dashboard/redemption'
     | '/dashboard/subscribe'
     | '/dashboard/system'
@@ -609,7 +595,6 @@ export interface FileRouteTypes {
     | '/dashboard/order/'
     | '/dashboard/payment/'
     | '/dashboard/product/'
-    | '/dashboard/promo/'
     | '/dashboard/redemption/'
     | '/dashboard/subscribe/'
     | '/dashboard/system/'
@@ -709,13 +694,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof DashboardRedemptionIndexLazyRouteImport
       parentRoute: typeof DashboardRouteLazyRoute
     }
-    '/dashboard/promo/': {
-      id: '/dashboard/promo/'
-      path: '/promo'
-      fullPath: '/dashboard/promo'
-      preLoaderRoute: typeof DashboardPromoIndexLazyRouteImport
-      parentRoute: typeof DashboardRouteLazyRoute
-    }
     '/dashboard/product/': {
       id: '/dashboard/product/'
       path: '/product'
@@ -930,7 +908,6 @@ interface DashboardRouteLazyRouteChildren {
   DashboardOrderIndexLazyRoute: typeof DashboardOrderIndexLazyRoute
   DashboardPaymentIndexLazyRoute: typeof DashboardPaymentIndexLazyRoute
   DashboardProductIndexLazyRoute: typeof DashboardProductIndexLazyRoute
-  DashboardPromoIndexLazyRoute: typeof DashboardPromoIndexLazyRoute
   DashboardRedemptionIndexLazyRoute: typeof DashboardRedemptionIndexLazyRoute
   DashboardSubscribeIndexLazyRoute: typeof DashboardSubscribeIndexLazyRoute
   DashboardSystemIndexLazyRoute: typeof DashboardSystemIndexLazyRoute
@@ -968,7 +945,6 @@ const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
   DashboardOrderIndexLazyRoute: DashboardOrderIndexLazyRoute,
   DashboardPaymentIndexLazyRoute: DashboardPaymentIndexLazyRoute,
   DashboardProductIndexLazyRoute: DashboardProductIndexLazyRoute,
-  DashboardPromoIndexLazyRoute: DashboardPromoIndexLazyRoute,
   DashboardRedemptionIndexLazyRoute: DashboardRedemptionIndexLazyRoute,
   DashboardSubscribeIndexLazyRoute: DashboardSubscribeIndexLazyRoute,
   DashboardSystemIndexLazyRoute: DashboardSystemIndexLazyRoute,

apps/admin/src/routes/dashboard/promo/index.lazy.tsx

@@ -1,6 +0,0 @@
-import { createLazyFileRoute } from "@tanstack/react-router";
-import PromoPage from "@/sections/promo";
-
-export const Route = createLazyFileRoute("/dashboard/promo/")({
-  component: PromoPage,
-});

apps/admin/src/sections/promo/index.test.tsx

@@ -1,155 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import { cleanup, render, screen, waitFor } from "@testing-library/react";
-import { getPromoRuleList } from "@workspace/ui/services/admin/promo";
-import type { AxiosResponse } from "axios";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import PromoPage from ".";
-
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({
-    t: (_key: string, fallback: string): string => fallback,
-  }),
-}));
-
-vi.mock("@/stores/subscribe", () => ({
-  useSubscribe: () => ({
-    subscribes: [
-      {
-        id: 8,
-        name: "Monthly Plan",
-        unit_price: 1200,
-        sold: 0,
-      },
-    ],
-    getSubscribeName: (id?: number) => (id === 8 ? "Monthly Plan" : "--"),
-  }),
-}));
-
-vi.mock("@/utils/common", () => ({
-  formatDate: (timestamp: number) => `date-${timestamp}`,
-}));
-
-vi.mock("@workspace/ui/services/admin/promo", () => ({
-  createPromoPrice: vi.fn(),
-  createPromoRule: vi.fn(),
-  deletePromoPrice: vi.fn(),
-  deletePromoRule: vi.fn(),
-  getPromoPriceList: vi.fn(),
-  getPromoRuleList: vi.fn(),
-  getPromoUsageList: vi.fn(),
-  updatePromoRule: vi.fn(),
-}));
-
-const mockedGetPromoRuleList = vi.mocked(getPromoRuleList);
-
-function createRuleListResponse(
-  data: API.GetPromoRuleListResponse
-): AxiosResponse<API.Response & { data?: API.GetPromoRuleListResponse }> {
-  return {
-    data: {
-      code: 200,
-      data,
-    },
-    status: 200,
-    statusText: "OK",
-    headers: {},
-    config: {
-      headers: {} as AxiosResponse["config"]["headers"],
-    },
-  };
-}
-
-beforeEach(() => {
-  localStorage.setItem("timezone", "UTC");
-});
-
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("PromoPage", () => {
-  it("renders promo rules with type, priority, status, and validity period", async () => {
-    mockedGetPromoRuleList.mockResolvedValue(
-      createRuleListResponse({
-        total: 1,
-        list: [
-          {
-            id: 1,
-            name: "Return User Price",
-            type: "inactive_user",
-            params: { inactive_months: 3 },
-            priority: 5,
-            enabled: true,
-            start_time: 1_716_800_000,
-            end_time: 1_716_900_000,
-          },
-        ],
-      })
-    );
-
-    render(<PromoPage />);
-
-    await waitFor(() =>
-      expect(mockedGetPromoRuleList).toHaveBeenCalledWith({
-        page: 1,
-        size: 200,
-        search: undefined,
-        type: undefined,
-        enabled: undefined,
-      })
-    );
-    expect(await screen.findByText("Return User Price")).not.toBeNull();
-    expect(screen.getByText("inactive_user")).not.toBeNull();
-    expect(screen.getByText("5")).not.toBeNull();
-    expect(screen.getByText("date-1716800000")).not.toBeNull();
-    expect(screen.getByText("date-1716900000")).not.toBeNull();
-  });
-
-  it("shows the empty state when there are no promo rules", async () => {
-    mockedGetPromoRuleList.mockResolvedValue(
-      createRuleListResponse({
-        total: 0,
-        list: [],
-      })
-    );
-
-    render(<PromoPage />);
-
-    expect(await screen.findByText("No promo rules")).not.toBeNull();
-  });
-
-  it("shows a loading state while promo rules are being fetched", () => {
-    let resolveRequest:
-      | ((
-          value: AxiosResponse<
-            API.Response & { data?: API.GetPromoRuleListResponse }
-          >
-        ) => void)
-      | undefined;
-    mockedGetPromoRuleList.mockReturnValue(
-      new Promise((resolve) => {
-        resolveRequest = resolve;
-      })
-    );
-
-    render(<PromoPage />);
-
-    expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
-    expect(resolveRequest).toBeTypeOf("function");
-  });
-
-  it("shows an error state when promo rules fail to load", async () => {
-    mockedGetPromoRuleList.mockRejectedValue(new Error("network failed"));
-
-    render(<PromoPage />);
-
-    await waitFor(() => expect(mockedGetPromoRuleList).toHaveBeenCalled());
-    expect(
-      await screen.findByText("Failed to load promo rules")
-    ).not.toBeNull();
-    expect(screen.queryByText("No promo rules")).toBeNull();
-  });
-});

apps/admin/src/sections/promo/index.tsx

@@ -1,504 +0,0 @@
-import {
-  Alert,
-  AlertDescription,
-  AlertTitle,
-} from "@workspace/ui/components/alert";
-import { Badge } from "@workspace/ui/components/badge";
-import { Button } from "@workspace/ui/components/button";
-import { Switch } from "@workspace/ui/components/switch";
-import {
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
-} from "@workspace/ui/components/tabs";
-import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
-import Empty from "@workspace/ui/composed/empty";
-import {
-  ProTable,
-  type ProTableActions,
-} from "@workspace/ui/composed/pro-table/pro-table";
-import {
-  createPromoPrice,
-  createPromoRule,
-  deletePromoPrice,
-  deletePromoRule,
-  getPromoPriceList,
-  getPromoRuleList,
-  getPromoUsageList,
-  updatePromoRule,
-} from "@workspace/ui/services/admin/promo";
-import { CircleAlert } from "lucide-react";
-import { useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import { useSubscribe } from "@/stores/subscribe";
-import { formatDate } from "@/utils/common";
-import PriceForm from "./price-form";
-import RuleDetail from "./rule-detail";
-import RuleForm from "./rule-form";
-import { formatCurrency, parseOptionalNumber, promoRuleTypes } from "./utils";
-
-type RuleFilters = {
-  search?: string;
-  type?: API.PromoRuleType;
-  enabled?: string;
-};
-
-type PriceFilters = {
-  promo_rule_id?: string;
-  subscribe_id?: string;
-};
-
-type UsageFilters = PriceFilters & {
-  user_id?: string;
-  order_no?: string;
-};
-
-function ErrorState({
-  title,
-  description,
-}: {
-  title: string;
-  description: string;
-}) {
-  return (
-    <Alert className="mx-auto max-w-md" variant="destructive">
-      <CircleAlert aria-hidden="true" />
-      <AlertTitle>{title}</AlertTitle>
-      <AlertDescription>{description}</AlertDescription>
-    </Alert>
-  );
-}
-
-export default function PromoPage() {
-  const { t } = useTranslation("promo");
-  const { subscribes, getSubscribeName } = useSubscribe();
-  const [loading, setLoading] = useState(false);
-  const [rules, setRules] = useState<API.PromoRule[]>([]);
-  const [detailRule, setDetailRule] = useState<API.PromoRule>();
-  const [detailOpen, setDetailOpen] = useState(false);
-  const ruleRef = useRef<ProTableActions>(null);
-  const priceRef = useRef<ProTableActions>(null);
-  const usageRef = useRef<ProTableActions>(null);
-
-  return (
-    <>
-      <Tabs className="space-y-4" defaultValue="rules">
-        <TabsList className="grid w-full grid-cols-3 md:w-fit">
-          <TabsTrigger value="rules">{t("rules", "Rules")}</TabsTrigger>
-          <TabsTrigger value="prices">{t("prices", "Prices")}</TabsTrigger>
-          <TabsTrigger value="usage">{t("usage", "Usage")}</TabsTrigger>
-        </TabsList>
-
-        <TabsContent value="rules">
-          <ProTable<API.PromoRule, RuleFilters>
-            action={ruleRef}
-            actions={{
-              render: (row) => [
-                <Button
-                  key="detail"
-                  onClick={() => {
-                    setDetailRule(row);
-                    setDetailOpen(true);
-                  }}
-                  size="sm"
-                  variant="outline"
-                >
-                  {t("detail", "Detail")}
-                </Button>,
-                <RuleForm
-                  initialValues={row}
-                  key="edit"
-                  loading={loading}
-                  onSubmit={async (values) => {
-                    setLoading(true);
-                    try {
-                      await updatePromoRule({ id: row.id }, values);
-                      toast.success(t("updateSuccess", "Update Success"));
-                      ruleRef.current?.refresh();
-                      setLoading(false);
-                      return true;
-                    } catch (_error) {
-                      setLoading(false);
-                      return false;
-                    }
-                  }}
-                  title={t("editRule", "Edit Rule")}
-                  trigger={t("edit", "Edit")}
-                />,
-                <ConfirmButton
-                  cancelText={t("cancel", "Cancel")}
-                  confirmText={t("confirm", "Confirm")}
-                  description={t(
-                    "deleteWarning",
-                    "Once deleted, data cannot be recovered. Please proceed with caution."
-                  )}
-                  key="delete"
-                  onConfirm={async () => {
-                    await deletePromoRule({ id: row.id });
-                    toast.success(t("deleteSuccess", "Delete Success"));
-                    ruleRef.current?.refresh();
-                  }}
-                  title={t("confirmDelete", "Are you sure you want to delete?")}
-                  trigger={
-                    <Button size="sm" variant="destructive">
-                      {t("delete", "Delete")}
-                    </Button>
-                  }
-                />,
-              ],
-            }}
-            columns={[
-              {
-                accessorKey: "name",
-                header: t("name", "Name"),
-              },
-              {
-                accessorKey: "type",
-                header: t("type", "Type"),
-                cell: ({ row }) => (
-                  <Badge variant="outline">
-                    {t(`types.${row.original.type}`, row.original.type)}
-                  </Badge>
-                ),
-              },
-              {
-                accessorKey: "priority",
-                header: t("priority", "Priority"),
-              },
-              {
-                accessorKey: "enabled",
-                header: t("enabled", "Enabled"),
-                cell: ({ row }) => (
-                  <Switch
-                    defaultChecked={row.original.enabled}
-                    onCheckedChange={async (checked) => {
-                      await updatePromoRule(
-                        { id: row.original.id },
-                        { ...row.original, enabled: checked }
-                      );
-                      toast.success(t("updateSuccess", "Update Success"));
-                      ruleRef.current?.refresh();
-                    }}
-                  />
-                ),
-              },
-              {
-                accessorKey: "start_time",
-                header: t("startTime", "Start Time"),
-                cell: ({ row }) =>
-                  row.original.start_time
-                    ? formatDate(row.original.start_time)
-                    : "--",
-              },
-              {
-                accessorKey: "end_time",
-                header: t("endTime", "End Time"),
-                cell: ({ row }) =>
-                  row.original.end_time
-                    ? formatDate(row.original.end_time)
-                    : "--",
-              },
-            ]}
-            empty={<Empty description={t("emptyRules", "No promo rules")} />}
-            error={
-              <ErrorState
-                description={t(
-                  "loadErrorDescription",
-                  "Refresh the table or try again later."
-                )}
-                title={t("loadRulesError", "Failed to load promo rules")}
-              />
-            }
-            header={{
-              toolbar: (
-                <RuleForm
-                  loading={loading}
-                  onSubmit={async (values) => {
-                    setLoading(true);
-                    try {
-                      await createPromoRule(values);
-                      toast.success(t("createSuccess", "Create Success"));
-                      ruleRef.current?.refresh();
-                      setLoading(false);
-                      return true;
-                    } catch (_error) {
-                      setLoading(false);
-                      return false;
-                    }
-                  }}
-                  title={t("createRule", "Create Rule")}
-                  trigger={t("createRule", "Create Rule")}
-                />
-              ),
-            }}
-            params={[
-              { key: "search", placeholder: t("searchRule", "Rule name") },
-              {
-                key: "type",
-                placeholder: t("type", "Type"),
-                options: promoRuleTypes.map((type) => ({
-                  label: t(`types.${type}`, type),
-                  value: type,
-                })),
-              },
-              {
-                key: "enabled",
-                placeholder: t("enabled", "Enabled"),
-                options: [
-                  { label: t("yes", "Yes"), value: "true" },
-                  { label: t("no", "No"), value: "false" },
-                ],
-              },
-            ]}
-            request={async (pagination, filters) => {
-              const { data } = await getPromoRuleList({
-                ...pagination,
-                search: filters.search?.trim() || undefined,
-                type: filters.type,
-                enabled:
-                  filters.enabled === undefined || filters.enabled === ""
-                    ? undefined
-                    : filters.enabled === "true",
-              });
-              const list = data.data?.list || [];
-              setRules(list);
-              return {
-                list,
-                total: data.data?.total || 0,
-              };
-            }}
-          />
-        </TabsContent>
-
-        <TabsContent value="prices">
-          <ProTable<API.PromoPrice, PriceFilters>
-            action={priceRef}
-            actions={{
-              render: (row) => [
-                <ConfirmButton
-                  cancelText={t("cancel", "Cancel")}
-                  confirmText={t("confirm", "Confirm")}
-                  description={t(
-                    "deleteWarning",
-                    "Once deleted, data cannot be recovered. Please proceed with caution."
-                  )}
-                  key="delete"
-                  onConfirm={async () => {
-                    await deletePromoPrice({ id: row.id });
-                    toast.success(t("deleteSuccess", "Delete Success"));
-                    priceRef.current?.refresh();
-                  }}
-                  title={t("confirmDelete", "Are you sure you want to delete?")}
-                  trigger={
-                    <Button size="sm" variant="destructive">
-                      {t("delete", "Delete")}
-                    </Button>
-                  }
-                />,
-              ],
-            }}
-            columns={[
-              {
-                accessorKey: "promo_rule_id",
-                header: t("rule", "Rule"),
-                cell: ({ row }) =>
-                  row.original.promo_rule_id
-                    ? rules.find(
-                        (rule) => rule.id === row.original.promo_rule_id
-                      )?.name || `#${row.original.promo_rule_id}`
-                    : "--",
-              },
-              {
-                accessorKey: "subscribe_id",
-                header: t("subscribe", "Subscribe"),
-                cell: ({ row }) =>
-                  row.original.subscribe_name ||
-                  getSubscribeName(row.original.subscribe_id),
-              },
-              {
-                accessorKey: "quantity",
-                header: t("quantity", "Quantity"),
-                cell: ({ row }) => row.original.quantity || "--",
-              },
-              {
-                accessorKey: "unit_price",
-                header: t("unitPrice", "Unit Price"),
-                cell: ({ row }) => formatCurrency(row.original.unit_price),
-              },
-              {
-                accessorKey: "promo_price",
-                header: t("promoPrice", "Promo Price"),
-                cell: ({ row }) => formatCurrency(row.original.promo_price),
-              },
-            ]}
-            empty={<Empty description={t("emptyPrices", "No promo prices")} />}
-            error={
-              <ErrorState
-                description={t(
-                  "loadErrorDescription",
-                  "Refresh the table or try again later."
-                )}
-                title={t("loadPricesError", "Failed to load promo prices")}
-              />
-            }
-            header={{
-              toolbar: (
-                <PriceForm
-                  loading={loading}
-                  onSubmit={async (values) => {
-                    setLoading(true);
-                    try {
-                      await createPromoPrice(values);
-                      toast.success(t("createSuccess", "Create Success"));
-                      priceRef.current?.refresh();
-                      setLoading(false);
-                      return true;
-                    } catch (_error) {
-                      setLoading(false);
-                      return false;
-                    }
-                  }}
-                  rules={rules}
-                  subscribes={subscribes}
-                />
-              ),
-            }}
-            params={[
-              {
-                key: "promo_rule_id",
-                placeholder: t("rule", "Rule"),
-                options: rules.map((rule) => ({
-                  label: rule.name,
-                  value: String(rule.id),
-                })),
-              },
-              {
-                key: "subscribe_id",
-                placeholder: t("subscribe", "Subscribe"),
-                options: subscribes
-                  .filter((item) => typeof item.id === "number")
-                  .map((item) => ({
-                    label: item.name || `#${item.id}`,
-                    value: String(item.id),
-                  })),
-              },
-            ]}
-            request={async (pagination, filters) => {
-              const { data } = await getPromoPriceList({
-                ...pagination,
-                promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
-                subscribe_id: parseOptionalNumber(filters.subscribe_id),
-              });
-              return {
-                list: data.data?.list || [],
-                total: data.data?.total || 0,
-              };
-            }}
-          />
-        </TabsContent>
-
-        <TabsContent value="usage">
-          <ProTable<API.PromoUsage, UsageFilters>
-            action={usageRef}
-            columns={[
-              {
-                accessorKey: "promo_rule_id",
-                header: t("rule", "Rule"),
-                cell: ({ row }) =>
-                  row.original.rule_name ||
-                  rules.find((rule) => rule.id === row.original.promo_rule_id)
-                    ?.name ||
-                  `#${row.original.promo_rule_id}`,
-              },
-              {
-                accessorKey: "user_id",
-                header: t("userId", "User ID"),
-                cell: ({ row }) => `#${row.original.user_id}`,
-              },
-              {
-                accessorKey: "subscribe_id",
-                header: t("subscribe", "Subscribe"),
-                cell: ({ row }) =>
-                  row.original.subscribe_name ||
-                  getSubscribeName(row.original.subscribe_id),
-              },
-              {
-                accessorKey: "quantity",
-                header: t("quantity", "Quantity"),
-                cell: ({ row }) => row.original.quantity || "--",
-              },
-              {
-                accessorKey: "order_no",
-                header: t("orderNo", "Order No."),
-              },
-              {
-                accessorKey: "promo_price",
-                header: t("promoPrice", "Promo Price"),
-                cell: ({ row }) => formatCurrency(row.original.promo_price),
-              },
-              {
-                accessorKey: "used_at",
-                header: t("usedAt", "Used At"),
-                cell: ({ row }) => formatDate(row.original.used_at),
-              },
-            ]}
-            empty={
-              <Empty description={t("emptyUsage", "No promo usage records")} />
-            }
-            error={
-              <ErrorState
-                description={t(
-                  "loadErrorDescription",
-                  "Refresh the table or try again later."
-                )}
-                title={t("loadUsageError", "Failed to load promo usage")}
-              />
-            }
-            params={[
-              {
-                key: "promo_rule_id",
-                placeholder: t("rule", "Rule"),
-                options: rules.map((rule) => ({
-                  label: rule.name,
-                  value: String(rule.id),
-                })),
-              },
-              {
-                key: "subscribe_id",
-                placeholder: t("subscribe", "Subscribe"),
-                options: subscribes
-                  .filter((item) => typeof item.id === "number")
-                  .map((item) => ({
-                    label: item.name || `#${item.id}`,
-                    value: String(item.id),
-                  })),
-              },
-              { key: "user_id", placeholder: t("userId", "User ID") },
-              { key: "order_no", placeholder: t("orderNo", "Order No.") },
-            ]}
-            request={async (pagination, filters) => {
-              const { data } = await getPromoUsageList({
-                ...pagination,
-                promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
-                subscribe_id: parseOptionalNumber(filters.subscribe_id),
-                user_id: parseOptionalNumber(filters.user_id),
-                order_no: filters.order_no?.trim() || undefined,
-              });
-              return {
-                list: data.data?.list || [],
-                total: data.data?.total || 0,
-              };
-            }}
-          />
-        </TabsContent>
-      </Tabs>
-      <RuleDetail
-        onOpenChange={setDetailOpen}
-        open={detailOpen}
-        rule={detailRule}
-      />
-    </>
-  );
-}

apps/admin/src/sections/promo/price-form.test.tsx

@@ -1,152 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import {
-  cleanup,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import PriceForm from "./price-form";
-
-globalThis.ResizeObserver = class ResizeObserver {
-  observe() {
-    return;
-  }
-  unobserve() {
-    return;
-  }
-  disconnect() {
-    return;
-  }
-};
-Element.prototype.scrollIntoView = function scrollIntoView() {
-  return;
-};
-
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({
-    t: (_key: string, fallback: string): string => fallback,
-  }),
-}));
-
-const rules: API.PromoRule[] = [
-  {
-    id: 1,
-    name: "Campaign Rule",
-    type: "campaign",
-    params: {},
-    priority: 1,
-    enabled: true,
-  },
-];
-
-const subscribes: API.SubscribeItem[] = [
-  {
-    id: 8,
-    name: "Monthly Plan",
-    unit_price: 1200,
-    unit_time: "Month",
-    sold: 0,
-    discount: [
-      {
-        quantity: 3,
-        discount: 90,
-      },
-    ],
-  },
-];
-const subscribesWithoutDiscounts: API.SubscribeItem[] = [
-  {
-    id: 8,
-    name: "Monthly Plan",
-    unit_price: 1200,
-    unit_time: "Month",
-    sold: 0,
-    discount: [],
-  },
-];
-
-async function selectCombobox(index: number, option: string) {
-  const combobox = screen.getAllByRole("combobox")[index];
-  if (!combobox) throw new Error(`Combobox ${index} not found`);
-  fireEvent.click(combobox);
-  fireEvent.click(await screen.findByText(option));
-}
-
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("PriceForm", () => {
-  it("submits promo price with promo_rule_id and selected quantity item", async () => {
-    const onSubmit = vi.fn().mockResolvedValue(true);
-    render(
-      <PriceForm onSubmit={onSubmit} rules={rules} subscribes={subscribes} />
-    );
-
-    fireEvent.click(screen.getByRole("button", { name: "Create Promo Price" }));
-    await selectCombobox(0, "Campaign Rule");
-    await selectCombobox(1, "Monthly Plan");
-    await selectCombobox(2, "3 x Month");
-    fireEvent.change(screen.getByPlaceholderText("Enter price"), {
-      target: { value: "20" },
-    });
-    fireEvent.click(screen.getByRole("button", { name: "Confirm" }));
-
-    await waitFor(() =>
-      expect(onSubmit).toHaveBeenCalledWith({
-        promo_rule_id: 1,
-        items: [{ subscribe_id: 8, quantity: 3, promo_price: 2000 }],
-      })
-    );
-  });
-
-  it("blocks submit when subscribe has no discount quantities", async () => {
-    const onSubmit = vi.fn();
-    render(
-      <PriceForm
-        onSubmit={onSubmit}
-        rules={rules}
-        subscribes={subscribesWithoutDiscounts}
-      />
-    );
-
-    fireEvent.click(screen.getByRole("button", { name: "Create Promo Price" }));
-    await selectCombobox(1, "Monthly Plan");
-
-    expect(
-      screen.getByText(
-        "This subscribe has no discount quantities and cannot be configured."
-      )
-    ).not.toBeNull();
-    expect(screen.getByRole("button", { name: "Confirm" })).toHaveProperty(
-      "disabled",
-      true
-    );
-  });
-
-  it("keeps the form open and shows an error when promo price reaches original price", async () => {
-    const onSubmit = vi.fn();
-    render(
-      <PriceForm onSubmit={onSubmit} rules={rules} subscribes={subscribes} />
-    );
-
-    fireEvent.click(screen.getByRole("button", { name: "Create Promo Price" }));
-    await selectCombobox(0, "Campaign Rule");
-    await selectCombobox(1, "Monthly Plan");
-    await selectCombobox(2, "3 x Month");
-    fireEvent.change(screen.getByPlaceholderText("Enter price"), {
-      target: { value: "36" },
-    });
-    fireEvent.click(screen.getByRole("button", { name: "Confirm" }));
-
-    expect(
-      await screen.findByText("Promo price must be lower than original price")
-    ).not.toBeNull();
-    expect(onSubmit).not.toHaveBeenCalled();
-  });
-});

apps/admin/src/sections/promo/price-form.tsx

@@ -1,260 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Button } from "@workspace/ui/components/button";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@workspace/ui/components/form";
-import {
-  Sheet,
-  SheetContent,
-  SheetFooter,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@workspace/ui/components/sheet";
-import { Combobox } from "@workspace/ui/composed/combobox";
-import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
-import { unitConversion } from "@workspace/ui/utils/unit-conversions";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
-import { z } from "zod";
-import {
-  formatCurrency,
-  getSubscribeDiscounts,
-  getSubscribeUnitPrice,
-} from "./utils";
-
-const priceSchema = z.object({
-  promo_rule_id: z.number().min(1),
-  subscribe_id: z.number().min(1),
-  quantity: z.number().min(1),
-  promo_price: z.number().min(1),
-});
-
-type PriceFormValues = z.infer<typeof priceSchema>;
-
-interface PriceFormProps {
-  loading?: boolean;
-  rules: API.PromoRule[];
-  subscribes: API.SubscribeItem[];
-  onSubmit: (data: API.CreatePromoPriceRequest) => Promise<boolean> | boolean;
-}
-
-export default function PriceForm({
-  loading,
-  rules,
-  subscribes,
-  onSubmit,
-}: PriceFormProps) {
-  const { t } = useTranslation("promo");
-  const [open, setOpen] = useState(false);
-  const form = useForm<PriceFormValues>({
-    resolver: zodResolver(priceSchema),
-    defaultValues: {
-      promo_rule_id: 0,
-      subscribe_id: 0,
-      quantity: 0,
-      promo_price: 0,
-    },
-  });
-  const subscribeId = form.watch("subscribe_id");
-  const quantity = form.watch("quantity");
-  const subscribe = subscribes.find((item) => item.id === subscribeId);
-  const discounts = getSubscribeDiscounts(subscribe);
-  const unitPrice = getSubscribeUnitPrice(subscribe);
-  const originalPrice = unitPrice * quantity;
-  const hasSelectedSubscribe = subscribeId > 0;
-  const hasDiscounts = discounts.length > 0;
-
-  async function handleSubmit(values: PriceFormValues) {
-    const maxPrice = unitPrice * values.quantity;
-    if (maxPrice > 0 && values.promo_price >= maxPrice) {
-      form.setError("promo_price", {
-        message: t(
-          "form.promoPriceLessThanOriginalPrice",
-          "Promo price must be lower than original price"
-        ),
-      });
-      return;
-    }
-    const success = await onSubmit({
-      promo_rule_id: values.promo_rule_id,
-      items: [
-        {
-          subscribe_id: values.subscribe_id,
-          quantity: values.quantity,
-          promo_price: values.promo_price,
-        },
-      ],
-    });
-    if (success) setOpen(false);
-  }
-
-  return (
-    <Sheet onOpenChange={setOpen} open={open}>
-      <SheetTrigger asChild>
-        <Button
-          onClick={() => {
-            form.reset({
-              promo_rule_id: 0,
-              subscribe_id: 0,
-              quantity: 0,
-              promo_price: 0,
-            });
-            setOpen(true);
-          }}
-          size="sm"
-        >
-          {t("createPrice", "Create Promo Price")}
-        </Button>
-      </SheetTrigger>
-      <SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
-        <SheetHeader>
-          <SheetTitle>{t("createPrice", "Create Promo Price")}</SheetTitle>
-        </SheetHeader>
-        <Form {...form}>
-          <form
-            className="space-y-4 px-6 pt-4"
-            id="promo-price-form"
-            onSubmit={form.handleSubmit(handleSubmit)}
-          >
-            <FormField
-              control={form.control}
-              name="promo_rule_id"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>{t("rule", "Rule")}</FormLabel>
-                  <FormControl>
-                    <Combobox<number>
-                      onChange={field.onChange}
-                      options={rules.map((rule) => ({
-                        label: rule.name,
-                        value: rule.id,
-                      }))}
-                      placeholder={t("form.selectRule", "Select rule")}
-                      value={field.value}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name="subscribe_id"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>{t("subscribe", "Subscribe")}</FormLabel>
-                  <FormControl>
-                    <Combobox<number>
-                      onChange={(value) => {
-                        field.onChange(value);
-                        form.setValue("quantity", 0, {
-                          shouldDirty: true,
-                          shouldValidate: true,
-                        });
-                        form.clearErrors(["quantity", "promo_price"]);
-                      }}
-                      options={subscribes
-                        .filter((item) => typeof item.id === "number")
-                        .map((item) => ({
-                          label: item.name || `#${item.id}`,
-                          value: item.id as number,
-                        }))}
-                      placeholder={t(
-                        "form.selectSubscribe",
-                        "Select subscribe"
-                      )}
-                      value={field.value}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name="quantity"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>{t("quantity", "Quantity")}</FormLabel>
-                  <FormControl>
-                    <Combobox<number>
-                      onChange={field.onChange}
-                      options={discounts.map((item) => ({
-                        label: `${item.quantity} x ${t(
-                          subscribe?.unit_time || "Month",
-                          subscribe?.unit_time || "Month"
-                        )}`,
-                        value: item.quantity,
-                      }))}
-                      placeholder={t(
-                        "form.selectQuantity",
-                        "Select discount quantity"
-                      )}
-                      value={field.value}
-                    />
-                  </FormControl>
-                  {hasSelectedSubscribe && !hasDiscounts && (
-                    <p className="text-destructive text-xs">
-                      {t(
-                        "form.noDiscounts",
-                        "This subscribe has no discount quantities and cannot be configured."
-                      )}
-                    </p>
-                  )}
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name="promo_price"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>{t("promoPrice", "Promo Price")}</FormLabel>
-                  <FormControl>
-                    <EnhancedInput
-                      formatInput={(value) =>
-                        unitConversion("centsToDollars", value)
-                      }
-                      formatOutput={(value) =>
-                        unitConversion("dollarsToCents", value)
-                      }
-                      min={0.01}
-                      onValueChange={(value) => field.onChange(value)}
-                      placeholder={t("form.enterPromoPrice", "Enter price")}
-                      type="number"
-                      value={field.value}
-                    />
-                  </FormControl>
-                  {originalPrice > 0 && (
-                    <p className="text-muted-foreground text-xs">
-                      {t("originalPriceHint", "Original price")}:{" "}
-                      {formatCurrency(originalPrice)}
-                    </p>
-                  )}
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          </form>
-        </Form>
-        <SheetFooter>
-          <Button
-            disabled={loading || (hasSelectedSubscribe && !hasDiscounts)}
-            form="promo-price-form"
-            type="submit"
-          >
-            {t("confirm", "Confirm")}
-          </Button>
-        </SheetFooter>
-      </SheetContent>
-    </Sheet>
-  );
-}

apps/admin/src/sections/promo/rule-detail.tsx

@@ -1,84 +0,0 @@
-import { Badge } from "@workspace/ui/components/badge";
-import {
-  Sheet,
-  SheetContent,
-  SheetHeader,
-  SheetTitle,
-} from "@workspace/ui/components/sheet";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableRow,
-} from "@workspace/ui/components/table";
-import { useTranslation } from "react-i18next";
-import { formatDate } from "@/utils/common";
-
-interface RuleDetailProps {
-  open: boolean;
-  rule?: API.PromoRule;
-  onOpenChange: (open: boolean) => void;
-}
-
-export default function RuleDetail({
-  open,
-  rule,
-  onOpenChange,
-}: RuleDetailProps) {
-  const { t } = useTranslation("promo");
-
-  return (
-    <Sheet onOpenChange={onOpenChange} open={open}>
-      <SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
-        <SheetHeader>
-          <SheetTitle>
-            {rule?.name || t("ruleDetail", "Rule Detail")}
-          </SheetTitle>
-        </SheetHeader>
-        {rule && (
-          <div className="px-6 pt-4">
-            <Table>
-              <TableBody>
-                <TableRow>
-                  <TableCell>{t("type", "Type")}</TableCell>
-                  <TableCell>
-                    <Badge variant="outline">
-                      {t(`types.${rule.type}`, rule.type)}
-                    </Badge>
-                  </TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell>{t("priority", "Priority")}</TableCell>
-                  <TableCell>{rule.priority}</TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell>{t("enabled", "Enabled")}</TableCell>
-                  <TableCell>
-                    {rule.enabled ? t("yes", "Yes") : t("no", "No")}
-                  </TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell>{t("params", "Params")}</TableCell>
-                  <TableCell>
-                    <code className="whitespace-pre-wrap rounded bg-muted px-2 py-1 text-xs">
-                      {JSON.stringify(rule.params || {}, null, 2)}
-                    </code>
-                  </TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell>
-                    {t("validityPeriod", "Validity Period")}
-                  </TableCell>
-                  <TableCell>
-                    {rule.start_time ? formatDate(rule.start_time) : "--"} -{" "}
-                    {rule.end_time ? formatDate(rule.end_time) : "--"}
-                  </TableCell>
-                </TableRow>
-              </TableBody>
-            </Table>
-          </div>
-        )}
-      </SheetContent>
-    </Sheet>
-  );
-}

apps/admin/src/sections/promo/rule-form.tsx

@@ -1,353 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Button } from "@workspace/ui/components/button";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@workspace/ui/components/form";
-import {
-  RadioGroup,
-  RadioGroupItem,
-} from "@workspace/ui/components/radio-group";
-import { ScrollArea } from "@workspace/ui/components/scroll-area";
-import {
-  Sheet,
-  SheetContent,
-  SheetFooter,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@workspace/ui/components/sheet";
-import { Switch } from "@workspace/ui/components/switch";
-import { DatePicker } from "@workspace/ui/composed/date-picker";
-import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
-import { z } from "zod";
-import { promoRuleTypes } from "./utils";
-
-const ruleSchema = z
-  .object({
-    name: z.string().min(1),
-    type: z.enum(["new_user", "inactive_user", "campaign"]),
-    inactive_months: z.number().optional(),
-    window_hours: z.number().optional(),
-    priority: z.number().min(0),
-    enabled: z.boolean(),
-    start_time: z.number().optional(),
-    end_time: z.number().optional(),
-  })
-  .superRefine((data, ctx) => {
-    if (
-      data.start_time !== undefined &&
-      data.end_time !== undefined &&
-      data.start_time >= data.end_time
-    ) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "End time must be later than start time",
-        path: ["end_time"],
-      });
-    }
-    if (
-      data.type === "inactive_user" &&
-      (!data.inactive_months || data.inactive_months <= 0)
-    ) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "Inactive months must be greater than 0",
-        path: ["inactive_months"],
-      });
-    }
-    if (
-      data.type === "new_user" &&
-      (!data.window_hours || data.window_hours <= 0)
-    ) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "Window hours must be greater than 0",
-        path: ["window_hours"],
-      });
-    }
-  });
-
-type RuleFormValues = z.infer<typeof ruleSchema>;
-
-interface RuleFormProps {
-  initialValues?: API.PromoRule;
-  loading?: boolean;
-  onSubmit: (data: API.CreatePromoRuleRequest) => Promise<boolean> | boolean;
-  title: string;
-  trigger: string;
-}
-
-function toFormValues(rule?: API.PromoRule): RuleFormValues {
-  return {
-    name: rule?.name ?? "",
-    type: rule?.type ?? "inactive_user",
-    inactive_months: rule?.params?.inactive_months,
-    window_hours: rule?.params?.window_hours,
-    priority: rule?.priority ?? 0,
-    enabled: rule?.enabled ?? false,
-    start_time: rule?.start_time,
-    end_time: rule?.end_time,
-  };
-}
-
-function toRequest(values: RuleFormValues): API.CreatePromoRuleRequest {
-  const params: API.PromoRuleParams =
-    values.type === "inactive_user"
-      ? { inactive_months: values.inactive_months }
-      : values.type === "new_user"
-        ? { window_hours: values.window_hours }
-        : {};
-
-  return {
-    name: values.name.trim(),
-    type: values.type,
-    params,
-    priority: values.priority,
-    enabled: values.enabled,
-    start_time: values.start_time || undefined,
-    end_time: values.end_time || undefined,
-  };
-}
-
-export default function RuleForm({
-  initialValues,
-  loading,
-  onSubmit,
-  title,
-  trigger,
-}: RuleFormProps) {
-  const { t } = useTranslation("promo");
-  const [open, setOpen] = useState(false);
-  const form = useForm<RuleFormValues>({
-    resolver: zodResolver(ruleSchema),
-    defaultValues: toFormValues(initialValues),
-  });
-  const type = form.watch("type");
-
-  useEffect(() => {
-    form.reset(toFormValues(initialValues));
-  }, [form, initialValues]);
-
-  async function handleSubmit(values: RuleFormValues) {
-    const success = await onSubmit(toRequest(values));
-    if (success) setOpen(false);
-  }
-
-  return (
-    <Sheet onOpenChange={setOpen} open={open}>
-      <SheetTrigger asChild>
-        <Button
-          onClick={() => {
-            form.reset(toFormValues(initialValues));
-            setOpen(true);
-          }}
-          size="sm"
-        >
-          {trigger}
-        </Button>
-      </SheetTrigger>
-      <SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
-        <SheetHeader>
-          <SheetTitle>{title}</SheetTitle>
-        </SheetHeader>
-        <ScrollArea className="h-[calc(100vh-48px-36px-36px-env(safe-area-inset-top))]">
-          <Form {...form}>
-            <form
-              className="space-y-4 px-6 pt-4"
-              id="promo-rule-form"
-              onSubmit={form.handleSubmit(handleSubmit)}
-            >
-              <FormField
-                control={form.control}
-                name="name"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>{t("form.name", "Name")}</FormLabel>
-                    <FormControl>
-                      <EnhancedInput
-                        onValueChange={(value) => field.onChange(value)}
-                        placeholder={t("form.namePlaceholder", "Rule name")}
-                        value={field.value}
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <FormField
-                control={form.control}
-                name="type"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>{t("form.type", "Rule Type")}</FormLabel>
-                    <FormControl>
-                      <RadioGroup
-                        className="grid gap-2 sm:grid-cols-3"
-                        onValueChange={(value) =>
-                          field.onChange(value as API.PromoRuleType)
-                        }
-                        value={field.value}
-                      >
-                        {promoRuleTypes.map((item) => (
-                          <FormItem
-                            className="flex items-center space-x-2 space-y-0"
-                            key={item}
-                          >
-                            <FormControl>
-                              <RadioGroupItem value={item} />
-                            </FormControl>
-                            <FormLabel className="font-normal">
-                              {t(`types.${item}`, item)}
-                            </FormLabel>
-                          </FormItem>
-                        ))}
-                      </RadioGroup>
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              {type === "inactive_user" && (
-                <FormField
-                  control={form.control}
-                  name="inactive_months"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        {t("form.inactiveMonths", "Inactive Months")}
-                      </FormLabel>
-                      <FormControl>
-                        <EnhancedInput
-                          min={1}
-                          onValueChange={(value) => field.onChange(value)}
-                          placeholder={t(
-                            "form.inactiveMonthsPlaceholder",
-                            "Months without purchase"
-                          )}
-                          type="number"
-                          value={field.value}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              )}
-              {type === "new_user" && (
-                <FormField
-                  control={form.control}
-                  name="window_hours"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        {t("form.windowHours", "Window Hours")}
-                      </FormLabel>
-                      <FormControl>
-                        <EnhancedInput
-                          min={1}
-                          onValueChange={(value) => field.onChange(value)}
-                          placeholder={t(
-                            "form.windowHoursPlaceholder",
-                            "Hours after registration"
-                          )}
-                          type="number"
-                          value={field.value}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              )}
-              <FormField
-                control={form.control}
-                name="priority"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>{t("priority", "Priority")}</FormLabel>
-                    <FormControl>
-                      <EnhancedInput
-                        min={0}
-                        onValueChange={(value) => field.onChange(value)}
-                        placeholder="0"
-                        type="number"
-                        value={field.value}
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <div className="grid gap-4 sm:grid-cols-2">
-                <FormField
-                  control={form.control}
-                  name="start_time"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t("startTime", "Start Time")}</FormLabel>
-                      <FormControl>
-                        <DatePicker
-                          onChange={(value) => field.onChange(value)}
-                          placeholder={t("form.selectStartTime", "Select time")}
-                          value={field.value}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="end_time"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t("endTime", "End Time")}</FormLabel>
-                      <FormControl>
-                        <DatePicker
-                          onChange={(value) => field.onChange(value)}
-                          placeholder={t("form.selectEndTime", "Select time")}
-                          value={field.value}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              </div>
-              <FormField
-                control={form.control}
-                name="enabled"
-                render={({ field }) => (
-                  <FormItem className="flex items-center justify-between rounded-md border p-3">
-                    <div>
-                      <FormLabel>{t("enabled", "Enabled")}</FormLabel>
-                    </div>
-                    <FormControl>
-                      <Switch
-                        checked={field.value}
-                        onCheckedChange={field.onChange}
-                      />
-                    </FormControl>
-                  </FormItem>
-                )}
-              />
-            </form>
-          </Form>
-        </ScrollArea>
-        <SheetFooter>
-          <Button disabled={loading} form="promo-rule-form" type="submit">
-            {t("confirm", "Confirm")}
-          </Button>
-        </SheetFooter>
-      </SheetContent>
-    </Sheet>
-  );
-}

apps/admin/src/sections/promo/utils.ts

@@ -1,28 +0,0 @@
-import { unitConversion } from "@workspace/ui/utils/unit-conversions";
-
-export const promoRuleTypes: API.PromoRuleType[] = [
-  "inactive_user",
-  "new_user",
-  "campaign",
-];
-
-export function formatCurrency(value?: number) {
-  if (typeof value !== "number") return "--";
-  return `$${unitConversion("centsToDollars", value)}`;
-}
-
-export function parseOptionalNumber(value?: string) {
-  if (!value) return;
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : undefined;
-}
-
-export function getSubscribeUnitPrice(subscribe?: API.SubscribeItem) {
-  return typeof subscribe?.unit_price === "number" ? subscribe.unit_price : 0;
-}
-
-export function getSubscribeDiscounts(subscribe?: API.SubscribeItem) {
-  return (subscribe?.discount || []).filter(
-    (item) => typeof item.quantity === "number" && item.quantity > 0
-  );
-}

apps/admin/src/sections/user/user-subscription/index.tsx

@@ -30,27 +30,26 @@ import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
 import { formatDate } from "@/utils/common";
 import { SubscriptionDetail } from "./subscription-detail";
-import {
+import { SubscriptionForm } from "./subscription-form";
-  SubscriptionForm,
+
-  type SubscriptionFormValues,
+type SubscriptionFormPayload = Parameters<
-} from "./subscription-form";
+  React.ComponentProps<typeof SubscriptionForm>["onSubmit"]
+>[0];
 
 interface SharedInfo {
   ownerUserId: number;
   familyId: number;
 }
 
-function toUserSubscribePayload(values: SubscriptionFormValues) {
+function toUserSubscribePayload(values: SubscriptionFormPayload) {
   return {
-    ...values,
+    subscribe_id: values.subscribe_id ?? 0,
-    expired_at: values.expired_at || 0,
+    traffic: values.traffic ?? 0,
-    subscribe_id: values.subscribe_id || 0,
+    expired_at: values.expired_at ?? 0,
-    traffic: values.traffic || 0,
+    upload: values.upload ?? 0,
-    upload: values.upload || 0,
+    download: values.download ?? 0,
-    download: values.download || 0,
+    speed_limit: values.speed_limit ?? 0,
-    speed_limit: values.speed_limit || 0,
+    traffic_limit: values.traffic_limit ?? [],
-    device_limit: values.device_limit || 0,
-    traffic_limit: values.traffic_limit || [],
   };
 }
 
@@ -181,7 +180,6 @@ export default function UserSubscription({ userId }: { userId: number }) {
                     onSubmit={async (values) => {
                       setLoading(true);
                       await updateUserSubscribe({
-                        user_id: Number(userId),
                         user_subscribe_id: row.id,
                         ...toUserSubscribePayload(values),
                       });
@@ -313,39 +311,15 @@ export default function UserSubscription({ userId }: { userId: number }) {
             accessorKey: "speed_limit",
             header: t("speedLimit", "Speed Limit"),
             cell: ({ row }) => {
-              const userSpeed = row.original.speed_limit ?? 0;
+              const speed = row.original?.subscribe?.speed_limit;
-              const effectiveSpeed = row.original.effective_speed ?? 0;
+              return <Display type="trafficSpeed" value={speed} />;
-              const planSpeed = row.original.subscribe?.speed_limit ?? 0;
-              const speed = effectiveSpeed || userSpeed || planSpeed;
-              const source =
-                userSpeed > 0
-                  ? t("userOverride", "User Override")
-                  : t("subscriptionDefault", "Subscription Default");
-
-              return (
-                <div className="flex flex-col gap-1">
-                  <div className="flex items-center gap-2">
-                    <Display type="trafficSpeed" value={speed} />
-                    {row.original.is_throttled && (
-                      <Badge variant="destructive">
-                        {t("throttled", "Throttled")}
-                      </Badge>
-                    )}
-                  </div>
-                  <span className="text-muted-foreground text-xs">
-                    {source}
-                  </span>
-                </div>
-              );
             },
           },
           {
             accessorKey: "device_limit",
             header: t("deviceLimit", "Device Limit"),
             cell: ({ row }) => {
-              const limit =
+              const limit = row.original?.subscribe?.device_limit;
-                row.original.device_limit ||
-                row.original?.subscribe?.device_limit;
               return <Display type="number" unlimited value={limit} />;
             },
           },

apps/admin/src/sections/user/user-subscription/subscription-detail.tsx

@@ -7,7 +7,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@workspace/ui/components/sheet";
-import { Skeleton } from "@workspace/ui/components/skeleton";
 import { Switch } from "@workspace/ui/components/switch";
 import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
 import { ProTable } from "@workspace/ui/composed/pro-table/pro-table";
@@ -17,62 +16,52 @@ import {
   kickOfflineByUserDevice,
 } from "@workspace/ui/services/admin/user";
 import { deviceIdToHash } from "@workspace/ui/utils/device";
-import { AlertCircle, AlertTriangle, Gauge } from "lucide-react";
+import { AlertTriangle, Gauge } from "lucide-react";
 import { type ReactNode, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
+import { Display } from "@/components/display";
 import { IpLink } from "@/components/ip-link";
 import { formatDate } from "@/utils/common";
 
+function formatRules(rules?: API.TrafficLimitRule[]) {
+  return rules && rules.length > 0 ? rules : [];
+}
+
 function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
   const { t } = useTranslation("user");
   const [detail, setDetail] = useState<API.UserSubscribeDetail | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
+  const [loading, setLoading] = useState(false);
-  const [isError, setIsError] = useState(false);
+  const [error, setError] = useState(false);
 
   useEffect(() => {
-    let ignore = false;
+    setLoading(true);
-
+    setError(false);
-    setIsLoading(true);
-    setIsError(false);
     getUserSubscribeById({ id: subscriptionId })
       .then(({ data }) => {
-        if (!ignore) setDetail(data.data || null);
+        setDetail(data.data || null);
       })
       .catch(() => {
-        if (!ignore) {
+        setError(true);
-          setDetail(null);
+        setDetail(null);
-          setIsError(true);
-        }
       })
       .finally(() => {
-        if (!ignore) setIsLoading(false);
+        setLoading(false);
       });
-
-    return () => {
-      ignore = true;
-    };
   }, [subscriptionId]);
 
-  if (isLoading) {
+  if (loading) {
     return (
-      <div className="mb-4 rounded-lg border bg-muted/30 p-3">
+      <div className="mb-4 rounded-lg border bg-muted/30 p-3 text-muted-foreground text-sm">
-        <Skeleton className="mb-3 h-5 w-40" />
+        {t("loading", "Loading")}...
-        <div className="grid grid-cols-2 gap-3">
-          <Skeleton className="h-16" />
-          <Skeleton className="h-16" />
-        </div>
       </div>
     );
   }
 
-  if (isError) {
+  if (error) {
     return (
-      <div className="mb-4 flex items-start gap-3 rounded-lg border border-destructive/40 bg-destructive/5 p-3 text-destructive text-sm">
+      <div className="mb-4 rounded-lg border border-destructive/40 bg-destructive/5 p-3 text-destructive text-sm">
-        <AlertCircle className="mt-0.5 h-4 w-4 shrink-0" />
+        {t("loadFailed", "Failed to load data")}
-        <span>
-          {t("subscriptionDetailLoadFailed", "Failed to load speed settings.")}
-        </span>
       </div>
     );
   }
@@ -80,140 +69,140 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
   if (!detail) {
     return (
       <div className="mb-4 rounded-lg border bg-muted/30 p-3 text-muted-foreground text-sm">
-        {t("subscriptionDetailEmpty", "No subscription details found.")}
+        {t("noSubscriptionDetail", "No subscription detail")}
       </div>
     );
   }
 
-  if (detail.status !== 1) return null;
-
   const baseSpeed = detail.subscribe?.speed_limit ?? 0;
   const userSpeed = detail.speed_limit ?? 0;
   const effectiveSpeed = detail.effective_speed ?? 0;
   const isThrottled = detail.is_throttled;
-  const rules = detail.traffic_limit || [];
+  const packageRules = formatRules(detail.subscribe?.traffic_limit);
-  const hasLimitConfig =
+  const userRules = formatRules(detail.traffic_limit);
-    baseSpeed > 0 || userSpeed > 0 || effectiveSpeed > 0 || rules.length > 0;
-
-  if (!(hasLimitConfig || isThrottled)) {
-    return (
-      <div className="mb-4 rounded-lg border bg-muted/30 p-3 text-muted-foreground text-sm">
-        {t("speedLimitEmpty", "No user-level speed limit rules configured.")}
-      </div>
-    );
-  }
 
   return (
     <div
-      className={`mb-4 flex items-start gap-3 rounded-lg border p-3 text-sm ${
+      className={`mb-4 space-y-4 rounded-lg border p-3 text-sm ${
         isThrottled
           ? "border-destructive/40 bg-destructive/5 text-destructive"
           : "border-border bg-muted/40 text-foreground"
       }`}
     >
-      {isThrottled ? (
+      <div className="flex items-start gap-3">
-        <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+        {isThrottled ? (
-      ) : (
+          <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
-        <Gauge className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+        ) : (
-      )}
+          <Gauge className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
-      <div className="min-w-0 flex-1 space-y-3">
+        )}
-        <div className="flex flex-wrap items-center gap-2 font-medium">
+        <div className="min-w-0 space-y-1">
-          {isThrottled ? (
+          <div className="flex flex-wrap items-center gap-2 font-medium">
-            <>
+            <span>
-              <span>{t("throttled", "Speed Throttled")}</span>
+              {isThrottled
-              <Badge className="text-xs" variant="destructive">
+                ? t("throttled", "Speed Throttled")
-                {effectiveSpeed} Mbps
+                : t("speedLimitOverview", "Speed Limit Overview")}
-              </Badge>
+            </span>
-              {baseSpeed > 0 && (
+            <Badge
-                <span className="text-muted-foreground text-xs line-through">
+              className="text-xs"
-                  {t("subscriptionDefault", "Subscription Default")}:{" "}
+              variant={isThrottled ? "destructive" : "secondary"}
-                  {baseSpeed} Mbps
+            >
-                </span>
+              {effectiveSpeed > 0
-              )}
+                ? `${effectiveSpeed} Mbps`
-            </>
+                : t("unlimited", "Unlimited")}
-          ) : (
+            </Badge>
-            <>
+          </div>
-              <span className="text-muted-foreground">
+          {isThrottled && detail.throttle_rule && (
-                {t("speedLimit", "Speed Limit")}
+            <p className="text-muted-foreground text-xs">
-              </span>
+              {detail.throttle_rule}
-              <Badge className="text-xs" variant="secondary">
+            </p>
-                {effectiveSpeed > 0
+          )}
-                  ? `${effectiveSpeed} Mbps`
+          {isThrottled && detail.throttle_start && detail.throttle_end && (
-                  : t("unlimited", "Unlimited")}
+            <p className="text-muted-foreground text-xs">
-              </Badge>
+              {formatDate(detail.throttle_start)} ~{" "}
-            </>
+              {formatDate(detail.throttle_end)}
+            </p>
           )}
         </div>
-        <div className="grid gap-2 sm:grid-cols-3">
+      </div>
-          <SpeedMetric
+
-            label={t("subscriptionDefault", "Subscription Default")}
+      <div className="grid gap-2 md:grid-cols-3">
-            value={baseSpeed}
+        {[
-          />
+          {
-          <SpeedMetric
+            label: t("packageSpeedLimit", "Package Speed Limit"),
-            label={t("userOverride", "User Override")}
+            value: <Display type="trafficSpeed" unlimited value={baseSpeed} />,
-            value={userSpeed}
+          },
-          />
+          {
-          <SpeedMetric
+            label: t("userSpeedOverride", "User Speed Override"),
-            label={t("effectiveSpeed", "Effective Speed")}
+            value: <Display type="trafficSpeed" unlimited value={userSpeed} />,
-            value={effectiveSpeed}
+          },
-          />
+          {
-        </div>
+            label: t("effectiveSpeedLimit", "Effective Speed Limit"),
-        {isThrottled && detail.throttle_rule && (
+            value: (
-          <p className="text-muted-foreground text-xs">
+              <Display type="trafficSpeed" unlimited value={effectiveSpeed} />
-            {detail.throttle_rule}
+            ),
-          </p>
+          },
-        )}
+        ].map((item) => (
-        {isThrottled && detail.throttle_start && detail.throttle_end && (
+          <div
-          <p className="text-muted-foreground text-xs">
+            className="rounded-md border bg-background/70 p-2"
-            {formatDate(detail.throttle_start)} ~{" "}
+            key={item.label}
-            {formatDate(detail.throttle_end)}
+          >
-          </p>
+            <div className="text-muted-foreground text-xs">{item.label}</div>
-        )}
+            <div className="mt-1 font-medium">{item.value}</div>
-        {rules.length > 0 && (
-          <div className="space-y-2">
-            <p className="font-medium text-foreground text-xs">
-              {t("trafficLimitRules", "Traffic Limit Rules")}
-            </p>
-            <div className="grid gap-2">
-              {rules.map((rule, index) => (
-                <div
-                  className="rounded-md border bg-background/60 px-3 py-2 text-muted-foreground text-xs"
-                  key={`${rule.stat_type}-${rule.stat_value}-${index}`}
-                >
-                  {t("trafficLimitRuleSummary", {
-                    defaultValue:
-                      "{{traffic}} GB in {{value}} {{type}} -> {{speed}} Mbps",
-                    traffic: rule.traffic_usage,
-                    value: rule.stat_value,
-                    type:
-                      rule.stat_type === "hour"
-                        ? t("hour", "Hour")
-                        : t("day", "Day"),
-                    speed: rule.speed_limit,
-                  })}
-                </div>
-              ))}
-            </div>
           </div>
-        )}
+        ))}
+      </div>
+
+      <div className="grid gap-3 md:grid-cols-2">
+        <TrafficRulesBlock
+          emptyText={t("noPackageTrafficRules", "No package traffic rules")}
+          rules={packageRules}
+          title={t("packageTrafficRules", "Package Traffic Rules")}
+        />
+        <TrafficRulesBlock
+          emptyText={t("noUserTrafficRules", "No user traffic rules")}
+          rules={userRules}
+          title={t("userTrafficRules", "User Traffic Rules")}
+        />
       </div>
     </div>
   );
 }
 
-function SpeedMetric({ label, value }: { label: string; value: number }) {
+function TrafficRulesBlock({
-  const { t } = useTranslation("user");
+  title,
-
+  rules,
+  emptyText,
+}: {
+  title: string;
+  rules: API.TrafficLimitRule[];
+  emptyText: string;
+}) {
   return (
-    <div className="rounded-md border bg-background/60 p-2">
+    <div className="rounded-md border bg-background/70 p-2">
-      <div className="text-muted-foreground text-xs">{label}</div>
+      <div className="font-medium text-muted-foreground text-xs">{title}</div>
-      <div className="font-medium text-foreground">
+      {rules.length === 0 ? (
-        {value > 0 ? `${value} Mbps` : t("unlimited", "Unlimited")}
+        <div className="mt-2 text-muted-foreground text-xs">{emptyText}</div>
-      </div>
+      ) : (
+        <div className="mt-2 space-y-2">
+          {rules.map((rule, index) => (
+            <div
+              className="rounded border bg-muted/30 px-2 py-1.5 text-xs"
+              key={`${rule.stat_type}-${rule.stat_value}-${index}`}
+            >
+              <div className="flex flex-wrap gap-x-2 gap-y-1">
+                <span>
+                  {rule.stat_value} {rule.stat_type}
+                </span>
+                <span>{rule.traffic_usage} GB</span>
+                <span>{rule.speed_limit} Mbps</span>
+              </div>
+            </div>
+          ))}
+        </div>
+      )}
     </div>
   );
 }
-
 export function SubscriptionDetail({
   trigger,
   userId,
@@ -272,7 +261,11 @@ export function SubscriptionDetail({
                 accessorKey: "enabled",
                 header: t("enable", "Enable"),
                 cell: ({ row }) => (
-                  <Switch checked={row.getValue("enabled")} disabled />
+                  <Switch
+                    checked={row.getValue("enabled")}
+                    disabled
+                    title={t("readOnly", "Read only")}
+                  />
                 ),
               },
               { accessorKey: "id", header: "ID" },

apps/admin/src/sections/user/user-subscription/subscription-form.tsx

@@ -18,13 +18,14 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@workspace/ui/components/sheet";
+import { Textarea } from "@workspace/ui/components/textarea";
 import { Combobox } from "@workspace/ui/composed/combobox";
 import { DatePicker } from "@workspace/ui/composed/date-picker";
 import { ArrayInput } from "@workspace/ui/composed/dynamic-inputs";
 import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
 import { Icon } from "@workspace/ui/composed/icon";
 import { unitConversion } from "@workspace/ui/utils/unit-conversions";
-import { type KeyboardEvent, type ReactNode, useState } from "react";
+import { type ReactNode, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { z } from "zod";
@@ -38,48 +39,63 @@ interface Props {
   onSubmit: (values: SubscriptionFormValues) => Promise<boolean>;
 }
 
-type SubscriptionTrafficLimitRule = API.UserSubscribeTrafficLimitRule;
+const trafficLimitRuleSchema = z.object({
-
+  stat_type: z.enum(["hour", "day"]),
-const defaultLimitRule: SubscriptionTrafficLimitRule = {
+  stat_value: z.number().int().min(1),
-  stat_type: "day",
+  traffic_usage: z.number().int().min(0),
-  stat_value: 1,
+  speed_limit: z.number().int().min(0),
-  traffic_usage: 0,
+});
-  speed_limit: 0,
-};
 
 const formSchema = z.object({
   subscribe_id: z.number().optional(),
-  traffic: z.number().min(0).optional(),
+  traffic: z.number().optional(),
-  speed_limit: z.number().min(0).optional(),
+  speed_limit: z.number().optional(),
-  device_limit: z.number().min(0).optional(),
+  traffic_limit: z.array(trafficLimitRuleSchema).optional(),
+  traffic_limit_json: z.string().superRefine((value, ctx) => {
+    if (!value.trim()) return;
+    try {
+      const parsed: unknown = JSON.parse(value);
+      const result = z.array(trafficLimitRuleSchema).safeParse(parsed);
+      if (!result.success) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Invalid traffic limit JSON",
+        });
+      }
+    } catch {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Invalid JSON",
+      });
+    }
+  }),
   expired_at: z.number().nullish().optional(),
-  upload: z.number().min(0).optional(),
+  upload: z.number().optional(),
-  download: z.number().min(0).optional(),
+  download: z.number().optional(),
   id: z.number().optional(),
-  traffic_limit: z
-    .array(
-      z.object({
-        stat_type: z.string(),
-        stat_value: z.number().int().min(1),
-        traffic_usage: z.number().min(0),
-        speed_limit: z.number().min(0),
-      })
-    )
-    .optional(),
 });
 
 type SubscriptionFormValues = z.infer<typeof formSchema>;
 
-export type { SubscriptionFormValues };
+type TrafficLimitFormRule = z.infer<typeof trafficLimitRuleSchema>;
 
-const normalizeLimitRule = (
+function parseTrafficLimitJson(value: string): API.TrafficLimitRule[] {
-  item: SubscriptionTrafficLimitRule
+  if (!value.trim()) return [];
-): SubscriptionTrafficLimitRule => ({
+  const parsed: unknown = JSON.parse(value);
-  stat_type: item.stat_type || "day",
+  const result = z.array(trafficLimitRuleSchema).safeParse(parsed);
-  stat_value: Math.max(1, Math.floor(Number(item.stat_value) || 1)),
+  return result.success ? normalizeTrafficLimitRules(result.data) : [];
-  traffic_usage: Math.max(0, Number(item.traffic_usage) || 0),
+}
-  speed_limit: Math.max(0, Number(item.speed_limit) || 0),
+
-});
+function normalizeTrafficLimitRules(
+  rules?: TrafficLimitFormRule[]
+): API.TrafficLimitRule[] {
+  return (rules || []).map((item) => ({
+    stat_type: item.stat_type === "hour" ? "hour" : "day",
+    stat_value: Number(item.stat_value) || 1,
+    traffic_usage: Number(item.traffic_usage) || 0,
+    speed_limit: Number(item.speed_limit) || 0,
+  }));
+}
 
 export function SubscriptionForm({
   trigger,
@@ -97,8 +113,12 @@ export function SubscriptionForm({
       subscribe_id: initialData?.subscribe_id || 0,
       traffic: initialData?.traffic || 0,
       speed_limit: initialData?.speed_limit || 0,
-      device_limit: initialData?.device_limit || 0,
+      traffic_limit: normalizeTrafficLimitRules(initialData?.traffic_limit),
-      traffic_limit: initialData?.traffic_limit || [],
+      traffic_limit_json: JSON.stringify(
+        normalizeTrafficLimitRules(initialData?.traffic_limit),
+        null,
+        2
+      ),
       upload: initialData?.upload || 0,
       download: initialData?.download || 0,
       expired_at: initialData?.expire_time || 0,
@@ -107,7 +127,17 @@ export function SubscriptionForm({
   });
 
   const handleSubmit = async (values: SubscriptionFormValues) => {
-    const success = await onSubmit(values);
+    const trafficLimitFromJson = parseTrafficLimitJson(
+      values.traffic_limit_json
+    );
+    const success = await onSubmit({
+      ...values,
+      traffic_limit: normalizeTrafficLimitRules(
+        trafficLimitFromJson.length > 0
+          ? trafficLimitFromJson
+          : values.traffic_limit
+      ),
+    });
     if (success) {
       setOpen(false);
       form.reset();
@@ -172,7 +202,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder={t("unlimited", "Unlimited")}
                           type="number"
                           {...field}
@@ -200,7 +229,6 @@ export function SubscriptionForm({
                       <FormLabel>{t("speedLimit", "Speed Limit")}</FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder={t("unlimited", "Unlimited")}
                           type="number"
                           {...field}
@@ -213,35 +241,13 @@ export function SubscriptionForm({
                       <FormDescription>
                         {t(
                           "userSpeedLimitDescription",
-                          "Set to 0 to use the subscription default speed limit."
+                          "Set a user-level speed override. Use 0 to inherit the subscription limit."
                         )}
                       </FormDescription>
                       <FormMessage />
                     </FormItem>
                   )}
                 />
-                <FormField
-                  control={form.control}
-                  name="device_limit"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t("deviceLimit", "Device Limit")}</FormLabel>
-                      <FormControl>
-                        <EnhancedInput
-                          min={0}
-                          placeholder={t("unlimited", "Unlimited")}
-                          step={1}
-                          type="number"
-                          {...field}
-                          onValueChange={(value) => {
-                            form.setValue(field.name, value as number);
-                          }}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
                 <FormField
                   control={form.control}
                   name="upload"
@@ -252,37 +258,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
-                          placeholder="0"
-                          type="number"
-                          {...field}
-                          formatInput={(value) =>
-                            unitConversion("bytesToGb", value)
-                          }
-                          formatOutput={(value) =>
-                            unitConversion("gbToBytes", value)
-                          }
-                          onValueChange={(value) => {
-                            form.setValue(field.name, value as number);
-                          }}
-                          suffix="GB"
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="download"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        {t("downloadTraffic", "Download Traffic")}
-                      </FormLabel>
-                      <FormControl>
-                        <EnhancedInput
-                          min={0}
                           placeholder="0"
                           type="number"
                           {...field}
@@ -311,23 +286,16 @@ export function SubscriptionForm({
                         {t("trafficLimitRules", "Traffic Limit Rules")}
                       </FormLabel>
                       <FormControl>
-                        <ArrayInput<SubscriptionTrafficLimitRule>
+                        <ArrayInput<API.TrafficLimitRule>
-                          className="grid grid-cols-2 gap-3 lg:grid-cols-4"
+                          className="grid grid-cols-1 gap-3 md:grid-cols-4"
                           fields={[
                             {
                               name: "stat_type",
                               type: "select",
                               placeholder: t("statType", "Statistics Type"),
-                              value: "day",
                               options: [
-                                {
+                                { label: t("hour", "Hour"), value: "hour" },
-                                  label: t("statTypeHour", "Hour"),
+                                { label: t("day", "Day"), value: "day" },
-                                  value: "hour",
-                                },
-                                {
-                                  label: t("statTypeDay", "Day"),
-                                  value: "day",
-                                },
                               ],
                             },
                             {
@@ -335,42 +303,15 @@ export function SubscriptionForm({
                               type: "number",
                               placeholder: t("statValue", "Time Value"),
                               min: 1,
-                              step: 1,
-                              onKeyDown: (
-                                e: KeyboardEvent<HTMLInputElement>
-                              ) => {
-                                if (e.key === "." || e.key === ",") {
-                                  e.preventDefault();
-                                }
-                              },
-                              formatOutput: (value: string | number) => {
-                                const num = Number(value);
-                                return String(
-                                  Number.isNaN(num) ? 1 : Math.floor(num)
-                                );
-                              },
                             },
                             {
                               name: "traffic_usage",
                               type: "number",
                               placeholder: t(
-                                "trafficUsage",
+                                "trafficUsageGb",
                                 "Traffic Usage (GB)"
                               ),
                               min: 0,
-                              onKeyDown: (
-                                e: KeyboardEvent<HTMLInputElement>
-                              ) => {
-                                if (e.key === "." || e.key === ",") {
-                                  e.preventDefault();
-                                }
-                              },
-                              formatOutput: (value: string | number) => {
-                                const num = Number(value);
-                                return String(
-                                  Number.isNaN(num) ? 0 : Math.floor(num)
-                                );
-                              },
                             },
                             {
                               name: "speed_limit",
@@ -380,41 +321,99 @@ export function SubscriptionForm({
                                 "Speed Limit (Mbps)"
                               ),
                               min: 0,
-                              onKeyDown: (
-                                e: KeyboardEvent<HTMLInputElement>
-                              ) => {
-                                if (e.key === "." || e.key === ",") {
-                                  e.preventDefault();
-                                }
-                              },
-                              formatOutput: (value: string | number) => {
-                                const num = Number(value);
-                                return String(
-                                  Number.isNaN(num) ? 0 : Math.floor(num)
-                                );
-                              },
                             },
                           ]}
                           onChange={(items) => {
-                            field.onChange(items.map(normalizeLimitRule));
+                            const normalized =
+                              normalizeTrafficLimitRules(items);
+                            field.onChange(normalized);
+                            form.setValue(
+                              "traffic_limit_json",
+                              JSON.stringify(normalized, null, 2),
+                              { shouldValidate: true }
+                            );
                           }}
-                          value={
+                          value={field.value}
-                            field.value && field.value.length > 0
-                              ? field.value
-                              : [defaultLimitRule]
-                          }
                         />
                       </FormControl>
                       <FormDescription>
                         {t(
-                          "trafficLimitDescription",
+                          "userTrafficLimitDescription",
-                          "Limit speed when usage reaches the configured amount in the selected time window."
+                          "Optional user-level traffic throttle rules. Traffic usage is stored in GB for each rule."
                         )}
                       </FormDescription>
                       <FormMessage />
                     </FormItem>
                   )}
                 />
+                <FormField
+                  control={form.control}
+                  name="traffic_limit_json"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        {t("trafficLimitJson", "Traffic Limit JSON")}
+                      </FormLabel>
+                      <FormControl>
+                        <Textarea
+                          className="min-h-32 font-mono text-xs"
+                          placeholder='[{"stat_type":"day","stat_value":1,"traffic_usage":10,"speed_limit":5}]'
+                          {...field}
+                          onChange={(event) => {
+                            field.onChange(event.target.value);
+                            try {
+                              const parsed = JSON.parse(event.target.value);
+                              const result = z
+                                .array(trafficLimitRuleSchema)
+                                .safeParse(parsed);
+                              if (result.success) {
+                                form.setValue("traffic_limit", result.data);
+                              }
+                            } catch {
+                              // Validation message is handled by zod.
+                            }
+                          }}
+                        />
+                      </FormControl>
+                      <FormDescription>
+                        {t(
+                          "trafficLimitJsonDescription",
+                          "Use JSON when pasting existing rules or clearing all rules with []."
+                        )}
+                      </FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="download"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        {t("downloadTraffic", "Download Traffic")}
+                      </FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          placeholder="0"
+                          type="number"
+                          {...field}
+                          formatInput={(value) =>
+                            unitConversion("bytesToGb", value)
+                          }
+                          formatOutput={(value) =>
+                            unitConversion("gbToBytes", value)
+                          }
+                          onValueChange={(value) => {
+                            form.setValue(field.name, value as number);
+                          }}
+                          suffix="GB"
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
                 <FormField
                   control={form.control}
                   name="expired_at"

apps/user/public/assets/locales/en-US/affiliate.json

@@ -16,10 +16,6 @@
   "inviteCode": "Invite Code",
   "inviteRecords": "Invite Records",
   "noReason": "None",
-  "recordsTabs": {
-    "withdrawal": "Withdrawal Records",
-    "refund": "Refund Records"
-  },
   "rejectReason": "Reject Reason",
   "registrationTime": "Registration Time",
   "submitWithdraw": "Submit Request",
@@ -32,27 +28,10 @@
   "withdrawDescription": "Submit the withdrawal amount and payout details, then wait for review.",
   "withdrawError": "Failed to submit withdrawal request",
   "withdrawRecords": "Withdrawal Records",
-  "withdrawalRecordsDescription": "Review your withdrawal requests, statuses, and payout details.",
-  "withdrawalEmpty": "No withdrawal records yet",
   "withdrawStatus": {
     "approved": "Approved",
     "pending": "Pending Review",
     "rejected": "Rejected"
   },
-  "withdrawSuccess": "Withdrawal request submitted",
+  "withdrawSuccess": "Withdrawal request submitted"
-  "commissionReturn": {
-    "description": "Review order refunds and returned withdrawal commissions.",
-    "empty": "No refund records yet",
-    "eventType": {
-      "orderRefund": "Order Refund",
-      "withdrawRejectReturn": "Withdrawal Rejected Return",
-      "withdrawCancelReturn": "Withdrawal Cancel Return",
-      "unknown": "Commission Return"
-    },
-    "fields": {
-      "eventType": "Type",
-      "orderNo": "Order No.",
-      "createdAt": "Created At"
-    }
-  }
 }

apps/user/public/assets/locales/en-US/subscribe.json

@@ -9,7 +9,6 @@
     "originalPrice": "Original Price (Monthly)",
     "price": "Price",
     "productDiscount": "Product Discount",
-    "promoDiscount": "Promo Discount",
     "total": "Total"
   },
   "buy": "Buy",
@@ -38,10 +37,6 @@
   "passwordHint": "If you do not enter a password, we will automatically generate one and send it to your email.",
   "paymentMethod": "Payment Method",
   "productDescription": "productDescription",
-  "promo": {
-    "available": "Promo Available",
-    "validUntil": "Valid until"
-  },
   "purchaseDuration": "Purchase Duration",
   "recharge": "Recharge",
   "rechargeAmount": "Recharge Amount",

apps/user/public/assets/locales/zh-CN/affiliate.json

@@ -16,10 +16,6 @@
   "inviteCode": "邀请码",
   "inviteRecords": "邀请记录",
   "noReason": "无",
-  "recordsTabs": {
-    "withdrawal": "提现记录",
-    "refund": "退款记录"
-  },
   "rejectReason": "拒绝原因",
   "registrationTime": "注册时间",
   "submitWithdraw": "提交申请",
@@ -32,27 +28,10 @@
   "withdrawDescription": "填写提现金额和收款信息后提交申请，等待后台审核。",
   "withdrawError": "提现申请提交失败",
   "withdrawRecords": "提现记录",
-  "withdrawalRecordsDescription": "查看你的提现申请、审核状态和收款信息。",
-  "withdrawalEmpty": "暂无提现记录",
   "withdrawStatus": {
     "approved": "已通过",
     "pending": "审核中",
     "rejected": "已拒绝"
   },
-  "withdrawSuccess": "提现申请已提交",
+  "withdrawSuccess": "提现申请已提交"
-  "commissionReturn": {
-    "description": "查看订单退款和提现退回记录。",
-    "empty": "暂无退款记录",
-    "eventType": {
-      "orderRefund": "订单退款",
-      "withdrawRejectReturn": "提现拒绝退回",
-      "withdrawCancelReturn": "用户取消提现退回",
-      "unknown": "佣金返回"
-    },
-    "fields": {
-      "eventType": "类型",
-      "orderNo": "订单号",
-      "createdAt": "创建时间"
-    }
-  }
 }

apps/user/public/assets/locales/zh-CN/subscribe.json

@@ -9,7 +9,6 @@
     "originalPrice": "原价（按月）",
     "price": "价格",
     "productDiscount": "商品折扣",
-    "promoDiscount": "促销优惠",
     "total": "总价"
   },
   "buy": "购买",
@@ -38,10 +37,6 @@
   "passwordHint": "如果您不输入密码，我们将自动生成一个并发送到您的邮箱。",
   "paymentMethod": "支付方式",
   "productDescription": "商品描述",
-  "promo": {
-    "available": "促销可用",
-    "validUntil": "有效期至"
-  },
   "purchaseDuration": "购买时长",
   "recharge": "充值",
   "rechargeAmount": "充值金额",

apps/user/src/sections/purchasing/content.tsx

@@ -17,7 +17,6 @@ import CouponInput from "@/sections/subscribe/coupon-input";
 import { SubscribeDetail } from "@/sections/subscribe/detail";
 import DurationSelector from "@/sections/subscribe/duration-selector";
 import PaymentMethods from "@/sections/subscribe/payment-methods";
-import { PromoInfo } from "@/sections/subscribe/promo-info";
 import { useGlobalStore } from "@/stores/global";
 
 export default function Content({
@@ -50,9 +49,6 @@ export default function Content({
     valid: false,
     message: "",
   });
-  const selectedDiscount = subscription?.discount?.find(
-    (item) => item.quantity === params.quantity
-  );
 
   const { data: order } = useQuery({
     enabled: !!subscription?.id && !!params.payment,
@@ -107,10 +103,7 @@ export default function Content({
           navigate({ to: "/purchasing/order", search: { order_no } });
         }
       } catch (error) {
-        setIsEmailValid((prev) => ({
+        console.log(error);
-          ...prev,
-          message: error instanceof Error ? error.message : prev.message,
-        }));
       }
     });
   }, [params, navigate]);
@@ -292,7 +285,6 @@ export default function Content({
                 show_original_price: subscription?.show_original_price,
               }}
             />
-            <PromoInfo discount={selectedDiscount} />
           </CardContent>
         </Card>
       </div>

apps/user/src/sections/subscribe/billing.tsx

@@ -10,7 +10,6 @@ interface SubscribeBillingProps {
       unit_price: number;
       unit_time: string;
       subscribe_discount: number;
-      promo_discount: number;
       show_original_price?: boolean;
     }
   >;
@@ -67,14 +66,6 @@ export function SubscribeBilling({ order }: Readonly<SubscribeBillingProps>) {
             <Display type="currency" value={order?.discount} />
           </span>
         </li>
-        <li>
-          <span className="text-muted-foreground">
-            {t("billing.promoDiscount", "Promo Discount")}
-          </span>
-          <span>
-            <Display type="currency" value={order?.promo_discount} />
-          </span>
-        </li>
         <li>
           <span className="text-muted-foreground">
             {t("billing.couponDiscount", "Coupon Discount")}

apps/user/src/sections/subscribe/promo-info.tsx

@@ -1,33 +0,0 @@
-import { Badge } from "@workspace/ui/components/badge";
-import { useTranslation } from "react-i18next";
-import { Display } from "@/components/display";
-
-interface PromoInfoProps {
-  discount?: API.SubscribeDiscount;
-}
-
-export function PromoInfo({ discount }: Readonly<PromoInfoProps>) {
-  const { t } = useTranslation("subscribe");
-  const promo = discount?.promo;
-
-  if (!promo) return null;
-
-  return (
-    <div className="flex flex-wrap items-center justify-between gap-2 rounded-md border bg-muted/40 p-3 text-sm">
-      <div className="grid gap-1">
-        <span className="font-medium">
-          {promo.rule_name || t("promo.available", "Promo Available")}
-        </span>
-        {promo.expires_at && (
-          <span className="text-muted-foreground text-xs">
-            {t("promo.validUntil", "Valid until")}:{" "}
-            {new Date(promo.expires_at * 1000).toLocaleString()}
-          </span>
-        )}
-      </div>
-      <Badge variant="secondary">
-        <Display type="currency" value={promo.promo_price} />
-      </Badge>
-    </div>
-  );
-}

apps/user/src/sections/subscribe/purchase.tsx

@@ -18,7 +18,6 @@ import { useTranslation } from "react-i18next";
 import CouponInput from "@/sections/subscribe/coupon-input";
 import DurationSelector from "@/sections/subscribe/duration-selector";
 import PaymentMethods from "@/sections/subscribe/payment-methods";
-import { PromoInfo } from "@/sections/subscribe/promo-info";
 import { useGlobalStore } from "@/stores/global";
 import { SubscribeBilling } from "./billing";
 import { SubscribeDetail } from "./detail";
@@ -42,12 +41,7 @@ export default function Purchase({
     coupon: "",
   });
   const [loading, startTransition] = useTransition();
-  const lastSuccessOrderRef = useRef<API.PreOrderResponse | undefined>(
+  const lastSuccessOrderRef = useRef<any>(null);
-    undefined
-  );
-  const selectedDiscount = subscribe?.discount?.find(
-    (item) => item.quantity === params.quantity
-  );
 
   const { data: order } = useQuery({
     enabled: !!subscribe?.id,
@@ -146,7 +140,6 @@ export default function Purchase({
                   show_original_price: subscribe?.show_original_price,
                 }}
               />
-              <PromoInfo discount={selectedDiscount} />
             </CardContent>
           </Card>
           <div className="flex flex-col justify-between text-sm">

apps/user/src/sections/user/affiliate/commission-return.test.ts

@@ -1,37 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { getCommissionReturnEventLabel } from "./commission-return";
-
-const translations = {
-  "commissionReturn.eventType.orderRefund": "订单退款",
-  "commissionReturn.eventType.withdrawRejectReturn": "提现拒绝退回",
-  "commissionReturn.eventType.withdrawCancelReturn": "用户取消提现退回",
-  "commissionReturn.eventType.unknown": "佣金返回",
-} as const;
-
-describe("getCommissionReturnEventLabel", () => {
-  const t = (key: string, defaultValue: string) =>
-    translations[key as keyof typeof translations] ?? defaultValue ?? key;
-
-  it("maps 333 to order refund", () => {
-    expect(getCommissionReturnEventLabel(333, t)).toBe("订单退款");
-  });
-
-  it("maps 337 to withdraw reject return", () => {
-    expect(getCommissionReturnEventLabel(337, t)).toBe("提现拒绝退回");
-  });
-
-  it("maps 338 to withdraw cancel return", () => {
-    expect(getCommissionReturnEventLabel(338, t)).toBe("用户取消提现退回");
-  });
-
-  it("falls back for unknown event types and warns", () => {
-    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {
-      /* intentional noop */
-    });
-
-    expect(getCommissionReturnEventLabel(999, t)).toBe("佣金返回");
-    expect(warnSpy).toHaveBeenCalledWith(999);
-
-    warnSpy.mockRestore();
-  });
-});

apps/user/src/sections/user/affiliate/commission-return.ts

@@ -1,27 +0,0 @@
-export type AffiliateTranslation = (
-  key: string,
-  defaultValue: string
-) => string;
-
-export function getCommissionReturnEventLabel(
-  eventType: number,
-  t: AffiliateTranslation
-) {
-  switch (eventType) {
-    case 333:
-      return t("commissionReturn.eventType.orderRefund", "Order Refund");
-    case 337:
-      return t(
-        "commissionReturn.eventType.withdrawRejectReturn",
-        "Withdrawal Rejected Return"
-      );
-    case 338:
-      return t(
-        "commissionReturn.eventType.withdrawCancelReturn",
-        "Withdrawal Cancel Return"
-      );
-    default:
-      console.warn(eventType);
-      return t("commissionReturn.eventType.unknown", "Commission Return");
-  }
-}

apps/user/src/sections/user/affiliate/index.tsx

@@ -35,21 +35,13 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@workspace/ui/components/select";
-import {
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
-} from "@workspace/ui/components/tabs";
 import { Textarea } from "@workspace/ui/components/textarea";
 import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
-import Empty from "@workspace/ui/composed/empty";
 import type { ProListActions } from "@workspace/ui/composed/pro-list/pro-list";
 import { ProList } from "@workspace/ui/composed/pro-list/pro-list";
 import { UploadImage } from "@workspace/ui/composed/upload-image";
 import {
   commissionWithdraw,
-  queryCommissionReturnLog,
   queryUserAffiliate,
   queryUserAffiliateList,
   queryWithdrawalLog,
@@ -67,7 +59,6 @@ import { toast } from "sonner";
 import { z } from "zod";
 import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
-import { getCommissionReturnEventLabel } from "./commission-return";
 
 const WITHDRAWAL_METHODS = [
   { value: 1, label: "支付宝" },
@@ -120,21 +111,13 @@ function QrCodeView({ url }: { url: string }) {
         <img
           alt="收款码"
           className="h-16 w-16 cursor-zoom-in object-cover"
-          height={64}
           src={url}
-          width={64}
         />
       </button>
       {zoomOpen && (
         <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
           <DialogContent className="max-w-sm">
-            <img
+            <img alt="收款码" className="w-full" src={url} />
-              alt="收款码"
-              className="w-full"
-              height={512}
-              src={url}
-              width={512}
-            />
           </DialogContent>
         </Dialog>
       )}
@@ -174,12 +157,14 @@ const withdrawalFormSchema = z
           path: ["account"],
         });
       }
-    } else if (data.method === 0 && !(data.account || data.content)) {
+    } else if (data.method === 0) {
-      ctx.addIssue({
+      if (!data.account && !data.content) {
-        code: z.ZodIssueCode.custom,
+        ctx.addIssue({
-        message: "收款账号和备注至少填一项",
+          code: z.ZodIssueCode.custom,
-        path: ["account"],
+          message: "收款账号和备注至少填一项",
-      });
+          path: ["account"],
+        });
+      }
     }
   });
 
@@ -188,7 +173,6 @@ type WithdrawalFormValues = z.infer<typeof withdrawalFormSchema>;
 export default function Affiliate() {
   const { t } = useTranslation("affiliate");
   const { user, common, getUserInfo } = useGlobalStore();
-  const [activeRecordTab, setActiveRecordTab] = useState("withdrawal");
   const [withdrawalOpen, setWithdrawalOpen] = useState(false);
   const [submitting, startTransition] = useTransition();
   const [qrUploading, setQrUploading] = useState(false);
@@ -437,7 +421,9 @@ export default function Affiliate() {
                             <FormItem>
                               <FormLabel>
                                 收款码
-                                <span className="ml-1 text-destructive">*</span>
+                                <span className="ml-1 text-destructive">
+                                  *
+                                </span>
                               </FormLabel>
                               {watchedQrCodeUrl ? (
                                 <div className="relative inline-block">
@@ -460,9 +446,7 @@ export default function Affiliate() {
                                   returnType="file"
                                 >
                                   <div className="flex h-24 w-24 flex-col items-center justify-center rounded border-2 border-dashed text-muted-foreground text-xs">
-                                    {qrUploading
+                                    {qrUploading ? "上传中..." : "点击上传\n收款码"}
-                                      ? "上传中..."
-                                      : "点击上传\n收款码"}
                                   </div>
                                 </UploadImage>
                               )}
@@ -535,7 +519,9 @@ export default function Affiliate() {
                     </Button>
                     <Button
                       disabled={
-                        submitting || qrUploading || availableCommission <= 0
+                        submitting ||
+                        qrUploading ||
+                        availableCommission <= 0
                       }
                       form="withdrawal-form"
                       type="submit"
@@ -578,218 +564,107 @@ export default function Affiliate() {
           </div>
         </CardContent>
       </Card>
-      <Card>
+      <ProList<API.WithdrawalLog, Record<string, unknown>>
-        <CardHeader className="gap-3">
+        action={withdrawalListActionRef}
-          <CardTitle>{t("withdrawRecords", "Withdrawal Records")}</CardTitle>
+        header={{
-          <CardDescription>
+          title: t("withdrawal.records", "Withdrawal Records"),
-            {activeRecordTab === "withdrawal"
+        }}
-              ? t(
+        renderItem={(item) => {
-                  "withdrawalRecordsDescription",
+          const statusMeta = getWithdrawalStatusMeta(item.status, t);
-                  "Review your withdrawal requests, statuses, and payout details."
+          return (
-                )
+            <Card className="overflow-hidden">
-              : t(
+              <CardContent className="space-y-3 p-4 text-sm">
-                  "commissionReturn.description",
+                <div className="flex flex-wrap items-center justify-between gap-2">
-                  "Review order refunds and returned withdrawal commissions."
+                  <div className="font-semibold text-lg">
-                )}
+                    <Display type="currency" value={item.amount} />
-          </CardDescription>
+                  </div>
-          <Tabs
+                  <div className="flex items-center gap-2">
-            defaultValue="withdrawal"
+                    <span
-            onValueChange={setActiveRecordTab}
+                      className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
-            value={activeRecordTab}
+                    >
-          >
+                      {statusMeta.label}
-            <TabsList className="grid w-full grid-cols-2 md:w-fit">
+                    </span>
-              <TabsTrigger value="withdrawal">
+                    {item.status === 0 && (
-                {t("recordsTabs.withdrawal", "Withdrawal Records")}
+                      <ConfirmButton
-              </TabsTrigger>
+                        cancelText="取消"
-              <TabsTrigger value="refund">
+                        confirmText="确认取消"
-                {t("recordsTabs.refund", "Refund Records")}
+                        description="取消后该提现申请将关闭，佣金不会退还。确定取消吗？"
-              </TabsTrigger>
+                        onConfirm={async () => {
-            </TabsList>
+                          await cancelMutation.mutateAsync(item.id);
-
+                        }}
-            <TabsContent className="mt-4" value="withdrawal">
+                        title="取消提现申请"
-              <ProList<API.WithdrawalLog, Record<string, unknown>>
+                        trigger={
-                action={withdrawalListActionRef}
+                          <Button
-                empty={
+                            disabled={cancelMutation.isPending}
-                  <Empty
+                            size="sm"
-                    description={t(
+                            variant="outline"
-                      "withdrawalEmpty",
+                          >
-                      "No withdrawal records yet"
+                            取消申请
+                          </Button>
+                        }
+                      />
                     )}
-                  />
+                  </div>
-                }
+                </div>
-                renderItem={(item) => {
+                <ul className="grid gap-3 md:grid-cols-2">
-                  const statusMeta = getWithdrawalStatusMeta(item.status, t);
+                  <li className="flex flex-col gap-1">
-                  return (
+                    <span className="text-muted-foreground">收款方式</span>
-                    <Card className="overflow-hidden">
+                    <span>{getWithdrawalMethodLabel(item.method)}</span>
-                      <CardContent className="space-y-3 p-4 text-sm">
+                  </li>
-                        <div className="flex flex-wrap items-center justify-between gap-2">
+                  {item.account && (
-                          <div className="font-semibold text-lg">
+                    <li className="flex flex-col gap-1">
-                            <Display type="currency" value={item.amount} />
+                      <span className="text-muted-foreground">收款账号</span>
-                          </div>
+                      <span className="break-all">{item.account}</span>
-                          <div className="flex items-center gap-2">
+                    </li>
-                            <span
+                  )}
-                              className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
+                  {item.qr_code_url && (
-                            >
+                    <li className="flex flex-col gap-1">
-                              {statusMeta.label}
+                      <span className="text-muted-foreground">收款码</span>
-                            </span>
+                      <QrCodeView url={item.qr_code_url} />
-                            {item.status === 0 && (
+                    </li>
-                              <ConfirmButton
+                  )}
-                                cancelText="取消"
+                  {item.content && (
-                                confirmText="确认取消"
+                    <li className="flex flex-col gap-1">
-                                description="取消后该提现申请将关闭，佣金不会退还。确定取消吗？"
+                      <span className="text-muted-foreground">
-                                onConfirm={async () => {
+                        {t("withdrawal.record.content", "Payout Information")}
-                                  await cancelMutation.mutateAsync(item.id);
+                      </span>
-                                }}
+                      <span className="whitespace-pre-wrap break-words">
-                                title="取消提现申请"
+                        {item.content}
-                                trigger={
+                      </span>
-                                  <Button
+                    </li>
-                                    disabled={cancelMutation.isPending}
+                  )}
-                                    size="sm"
+                  <li className="flex flex-col gap-1">
-                                    variant="outline"
+                    <span className="text-muted-foreground">
-                                  >
+                      {t("withdrawal.record.createdAt", "Created At")}
-                                    取消申请
+                    </span>
-                                  </Button>
+                    <time>{formatDate(item.created_at)}</time>
-                                }
+                  </li>
-                              />
+                  {item.reason && (
-                            )}
+                    <li className="flex flex-col gap-1 md:col-span-2">
-                          </div>
+                      <span className="text-muted-foreground">
-                        </div>
+                        {t("withdrawal.record.reason", "Reject Reason")}
-                        <ul className="grid gap-3 md:grid-cols-2">
+                      </span>
-                          <li className="flex flex-col gap-1">
+                      <span className="whitespace-pre-wrap break-words text-destructive">
-                            <span className="text-muted-foreground">
+                        {item.reason}
-                              收款方式
+                      </span>
-                            </span>
+                    </li>
-                            <span>{getWithdrawalMethodLabel(item.method)}</span>
+                  )}
-                          </li>
+                </ul>
-                          {item.account && (
+              </CardContent>
-                            <li className="flex flex-col gap-1">
+            </Card>
-                              <span className="text-muted-foreground">
+          );
-                                收款账号
+        }}
-                              </span>
+        request={async (pagination) => {
-                              <span className="break-all">{item.account}</span>
+          const response = await queryWithdrawalLog({
-                            </li>
+            page: pagination.page,
-                          )}
+            size: pagination.size,
-                          {item.qr_code_url && (
+          });
-                            <li className="flex flex-col gap-1">
+          return {
-                              <span className="text-muted-foreground">
+            list: response.data.data?.list || [],
-                                收款码
+            total: response.data.data?.total || 0,
-                              </span>
+          };
-                              <QrCodeView url={item.qr_code_url} />
+        }}
-                            </li>
+      />
-                          )}
-                          {item.content && (
-                            <li className="flex flex-col gap-1">
-                              <span className="text-muted-foreground">
-                                {t(
-                                  "withdrawal.record.content",
-                                  "Payout Information"
-                                )}
-                              </span>
-                              <span className="whitespace-pre-wrap break-words">
-                                {item.content}
-                              </span>
-                            </li>
-                          )}
-                          <li className="flex flex-col gap-1">
-                            <span className="text-muted-foreground">
-                              {t("withdrawal.record.createdAt", "Created At")}
-                            </span>
-                            <time>{formatDate(item.created_at)}</time>
-                          </li>
-                          {item.reason && (
-                            <li className="flex flex-col gap-1 md:col-span-2">
-                              <span className="text-muted-foreground">
-                                {t("withdrawal.record.reason", "Reject Reason")}
-                              </span>
-                              <span className="whitespace-pre-wrap break-words text-destructive">
-                                {item.reason}
-                              </span>
-                            </li>
-                          )}
-                        </ul>
-                      </CardContent>
-                    </Card>
-                  );
-                }}
-                request={async (pagination) => {
-                  const response = await queryWithdrawalLog({
-                    page: pagination.page,
-                    size: pagination.size,
-                  });
-                  return {
-                    list: response.data.data?.list || [],
-                    total: response.data.data?.total || 0,
-                  };
-                }}
-              />
-            </TabsContent>
-
-            <TabsContent className="mt-4" value="refund">
-              <ProList<API.CommissionReturnLog, Record<string, unknown>>
-                empty={
-                  <Empty
-                    description={t(
-                      "commissionReturn.empty",
-                      "No refund records yet"
-                    )}
-                  />
-                }
-                renderItem={(item) => (
-                  <Card className="overflow-hidden">
-                    <CardContent className="space-y-3 p-4 text-sm">
-                      <div className="flex flex-wrap items-center justify-between gap-2">
-                        <div className="font-semibold text-lg">
-                          <Display type="currency" value={item.amount} />
-                        </div>
-                        <span className="inline-flex rounded-full bg-primary/10 px-3 py-1 font-medium text-primary text-xs">
-                          {getCommissionReturnEventLabel(item.event_type, t)}
-                        </span>
-                      </div>
-                      <ul className="grid gap-3 md:grid-cols-2">
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t("commissionReturn.fields.eventType", "Type")}
-                          </span>
-                          <span>
-                            {getCommissionReturnEventLabel(item.event_type, t)}
-                          </span>
-                        </li>
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t("commissionReturn.fields.orderNo", "Order No.")}
-                          </span>
-                          <span className="break-all">
-                            {item.order_no || "-"}
-                          </span>
-                        </li>
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t(
-                              "commissionReturn.fields.createdAt",
-                              "Created At"
-                            )}
-                          </span>
-                          <time>{formatDate(item.created_at)}</time>
-                        </li>
-                      </ul>
-                    </CardContent>
-                  </Card>
-                )}
-                request={async (pagination) => {
-                  const response = await queryCommissionReturnLog({
-                    page: pagination.page,
-                    size: pagination.size,
-                  });
-                  return {
-                    list: response.data.data?.list || [],
-                    total: response.data.data?.total || 0,
-                  };
-                }}
-              />
-            </TabsContent>
-          </Tabs>
-        </CardHeader>
-      </Card>
       <ProList<API.UserAffiliate, Record<string, unknown>>
         header={{
           title: t("inviteRecords", "Invite Records"),

packages/ui/src/services/admin/index.ts

@@ -15,7 +15,6 @@ import * as log from "./log";
 import * as marketing from "./marketing";
 import * as order from "./order";
 import * as payment from "./payment";
-import * as promo from "./promo";
 import * as redemption from "./redemption";
 import * as server from "./server";
 import * as subscribe from "./subscribe";
@@ -38,7 +37,6 @@ export default {
   marketing,
   order,
   payment,
-  promo,
   redemption,
   server,
   subscribe,

packages/ui/src/services/admin/promo.ts

@@ -1,150 +0,0 @@
-/* eslint-disable */
-import request from "@workspace/ui/lib/request";
-
-/** Create promo rule POST /v1/admin/promo/rule */
-export async function createPromoRule(
-  body: API.CreatePromoRuleRequest,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.PromoRule }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      data: body,
-      ...(options || {}),
-    }
-  );
-}
-
-/** Get promo rule list GET /v1/admin/promo/rule/list */
-export async function getPromoRuleList(
-  params: API.GetPromoRuleListParams,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.GetPromoRuleListResponse }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/list`,
-    {
-      method: "GET",
-      params: {
-        ...params,
-      },
-      ...(options || {}),
-    }
-  );
-}
-
-/** Get promo rule detail GET /v1/admin/promo/rule/:id */
-export async function getPromoRuleDetail(
-  params: API.GetPromoRuleDetailParams,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.PromoRule }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
-    {
-      method: "GET",
-      ...(options || {}),
-    }
-  );
-}
-
-/** Update promo rule PUT /v1/admin/promo/rule/:id */
-export async function updatePromoRule(
-  params: API.UpdatePromoRuleParams,
-  body: API.UpdatePromoRuleRequest,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.PromoRule }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
-    {
-      method: "PUT",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      data: body,
-      ...(options || {}),
-    }
-  );
-}
-
-/** Delete promo rule DELETE /v1/admin/promo/rule/:id */
-export async function deletePromoRule(
-  params: API.DeletePromoRuleParams,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: unknown }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
-    {
-      method: "DELETE",
-      ...(options || {}),
-    }
-  );
-}
-
-/** Create promo price POST /v1/admin/promo/price */
-export async function createPromoPrice(
-  body: API.CreatePromoPriceRequest,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.PromoPrice }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      data: body,
-      ...(options || {}),
-    }
-  );
-}
-
-/** Get promo price list GET /v1/admin/promo/price/list */
-export async function getPromoPriceList(
-  params: API.GetPromoPriceListParams,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.GetPromoPriceListResponse }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price/list`,
-    {
-      method: "GET",
-      params: {
-        ...params,
-      },
-      ...(options || {}),
-    }
-  );
-}
-
-/** Delete promo price DELETE /v1/admin/promo/price/:id */
-export async function deletePromoPrice(
-  params: API.DeletePromoPriceParams,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: unknown }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price/${params.id}`,
-    {
-      method: "DELETE",
-      ...(options || {}),
-    }
-  );
-}
-
-/** Get promo usage list GET /v1/admin/promo/usage/list */
-export async function getPromoUsageList(
-  params: API.GetPromoUsageListParams,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.GetPromoUsageListResponse }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/usage/list`,
-    {
-      method: "GET",
-      params: {
-        ...params,
-      },
-      ...(options || {}),
-    }
-  );
-}

packages/ui/src/services/admin/typings.d.ts

@@ -272,76 +272,6 @@ declare namespace API {
     enabled: boolean;
   };
 
-  type PromoRuleType = "new_user" | "inactive_user" | "campaign";
-
-  type PromoRuleParams = {
-    inactive_months?: number;
-    window_hours?: number;
-    [key: string]: unknown;
-  };
-
-  type PromoRule = {
-    id: number;
-    name: string;
-    type: PromoRuleType;
-    params: PromoRuleParams;
-    priority: number;
-    enabled: boolean;
-    start_time?: number;
-    end_time?: number;
-    created_at?: number;
-    updated_at?: number;
-  };
-
-  type CreatePromoRuleRequest = {
-    name: string;
-    type: PromoRuleType;
-    params: PromoRuleParams;
-    priority: number;
-    enabled: boolean;
-    start_time?: number;
-    end_time?: number;
-  };
-
-  type UpdatePromoRuleRequest = CreatePromoRuleRequest;
-
-  type PromoPrice = {
-    id: number;
-    promo_rule_id: number;
-    subscribe_id: number;
-    subscribe_name?: string;
-    quantity: number;
-    unit_price: number;
-    promo_price: number;
-    created_at?: number;
-    updated_at?: number;
-  };
-
-  type CreatePromoPriceItem = {
-    subscribe_id: number;
-    quantity: number;
-    promo_price: number;
-  };
-
-  type CreatePromoPriceRequest = {
-    promo_rule_id: number;
-    items: CreatePromoPriceItem[];
-  };
-
-  type PromoUsage = {
-    id: number;
-    promo_rule_id: number;
-    rule_name?: string;
-    subscribe_id: number;
-    subscribe_name?: string;
-    quantity: number;
-    user_id: number;
-    order_no: string;
-    unit_price: number;
-    promo_price: number;
-    used_at: number;
-  };
-
   type CreateOrderRequest = {
     user_id: number;
     type: number;
@@ -469,8 +399,7 @@ declare namespace API {
     traffic: number;
     subscribe_id: number;
     speed_limit?: number;
-    device_limit?: number;
+    traffic_limit?: TrafficLimitRule[];
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
   };
 
   type CurrencyConfig = {
@@ -999,61 +928,6 @@ declare namespace API {
     list: Coupon[];
   };
 
-  type GetPromoRuleListParams = {
-    page: number;
-    size: number;
-    type?: PromoRuleType;
-    enabled?: boolean;
-    search?: string;
-  };
-
-  type GetPromoRuleListResponse = {
-    total: number;
-    list: PromoRule[];
-  };
-
-  type GetPromoRuleDetailParams = {
-    id: number;
-  };
-
-  type UpdatePromoRuleParams = {
-    id: number;
-  };
-
-  type DeletePromoRuleParams = {
-    id: number;
-  };
-
-  type GetPromoPriceListParams = {
-    page: number;
-    size: number;
-    promo_rule_id?: number;
-    subscribe_id?: number;
-  };
-
-  type GetPromoPriceListResponse = {
-    total: number;
-    list: PromoPrice[];
-  };
-
-  type DeletePromoPriceParams = {
-    id: number;
-  };
-
-  type GetPromoUsageListParams = {
-    page: number;
-    size: number;
-    promo_rule_id?: number;
-    subscribe_id?: number;
-    user_id?: number;
-    order_no?: string;
-  };
-
-  type GetPromoUsageListResponse = {
-    total: number;
-    list: PromoUsage[];
-  };
-
   type GetDetailRequest = {
     id: number;
   };
@@ -2179,6 +2053,7 @@ declare namespace API {
     replacement: number;
     inventory: number;
     traffic: number;
+    traffic_limit?: TrafficLimitRule[];
     speed_limit: number;
     device_limit: number;
     quota: number;
@@ -2226,13 +2101,6 @@ declare namespace API {
     quantity: number;
     discount: number;
     map_apple?: string;
-    promo?: SubscribeDiscountPromo;
-  };
-
-  type SubscribeDiscountPromo = {
-    rule_name?: string;
-    promo_price: number;
-    end_time?: number;
   };
 
   type SubscribeGroup = {
@@ -2563,7 +2431,6 @@ declare namespace API {
   };
 
   type UpdateUserSubscribeRequest = {
-    user_id?: number;
     user_subscribe_id: number;
     subscribe_id: number;
     traffic: number;
@@ -2571,8 +2438,7 @@ declare namespace API {
     upload: number;
     download: number;
     speed_limit?: number;
-    device_limit?: number;
+    traffic_limit?: TrafficLimitRule[];
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
   };
 
   type User = {
@@ -2661,14 +2527,10 @@ declare namespace API {
     finished_at: number;
     reset_time: number;
     traffic: number;
+    traffic_limit?: TrafficLimitRule[];
+    speed_limit?: number;
     download: number;
     upload: number;
-    speed_limit?: number;
-    device_limit?: number;
-    effective_speed?: number;
-    is_throttled?: boolean;
-    throttle_rule?: string;
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
     token: string;
     status: number;
     short: string;
@@ -2678,13 +2540,6 @@ declare namespace API {
     updated_at: number;
   };
 
-  type UserSubscribeTrafficLimitRule = {
-    stat_type: string;
-    stat_value: number;
-    traffic_usage: number;
-    speed_limit: number;
-  };
-
   type UserSubscribeDetail = {
     id: number;
     user_id: number;
@@ -2696,11 +2551,10 @@ declare namespace API {
     expire_time: number;
     reset_time: number;
     traffic: number;
+    traffic_limit?: TrafficLimitRule[];
+    speed_limit?: number;
     download: number;
     upload: number;
-    speed_limit?: number;
-    device_limit?: number;
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
     token: string;
     status: number;
     effective_speed: number;
@@ -2714,6 +2568,13 @@ declare namespace API {
     updated_at: number;
   };
 
+  type TrafficLimitRule = {
+    stat_type: "hour" | "day";
+    stat_value: number;
+    traffic_usage: number;
+    speed_limit: number;
+  };
+
   type UserSubscribeLog = {
     id: number;
     user_id: number;

packages/ui/src/services/common/typings.d.ts

@@ -910,13 +910,6 @@ declare namespace API {
     quantity: number;
     discount: number;
     map_apple?: string;
-    promo?: SubscribeDiscountPromo;
-  };
-
-  type SubscribeDiscountPromo = {
-    rule_name?: string;
-    promo_price: number;
-    end_time?: number;
   };
 
   type SubscribeGroup = {

packages/ui/src/services/user/typings.d.ts

@@ -170,17 +170,6 @@ declare namespace API {
     timestamp: number;
   };
 
-  type CommissionReturnLog = {
-    id: number;
-    user_id: number;
-    amount: number;
-    event_type: number;
-    order_no?: string;
-    content?: string;
-    created_at: number;
-    updated_at: number;
-  };
-
   type CommissionWithdrawRequest = {
     amount: number;
     method: number;
@@ -559,7 +548,6 @@ declare namespace API {
     price: number;
     amount: number;
     discount: number;
-    promo_discount: number;
     gift_amount: number;
     coupon: string;
     coupon_discount: number;
@@ -832,21 +820,6 @@ declare namespace API {
     size: number;
   };
 
-  type QueryCommissionReturnLogListRequest = {
-    page: number;
-    size: number;
-  };
-
-  type QueryCommissionReturnLogListResponse = {
-    list: CommissionReturnLog[];
-    total: number;
-  };
-
-  type QueryCommissionReturnLogParams = {
-    page: number;
-    size: number;
-  };
-
   type QueryUserSubscribeListResponse = {
     list: UserSubscribe[];
     total: number;
@@ -1046,14 +1019,6 @@ declare namespace API {
     quantity: number;
     discount: number;
     map_apple?: string;
-    promo?: SubscribeDiscountPromo;
-  };
-
-  type SubscribeDiscountPromo = {
-    rule_name?: string;
-    rule_type?: string;
-    promo_price: number;
-    expires_at?: number;
   };
 
   type SubscribeGroup = {

packages/ui/src/services/user/user.ts

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 
@@ -470,25 +471,6 @@ export async function queryWithdrawalLog(
   );
 }
 
-/** Query Commission Return Log GET /v1/public/user/commission_return_log */
-export async function queryCommissionReturnLog(
-  params: API.QueryCommissionReturnLogParams,
-  options?: { [key: string]: any }
-) {
-  return request<
-    API.Response & { data?: API.QueryCommissionReturnLogListResponse }
-  >(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/public/user/commission_return_log`,
-    {
-      method: "GET",
-      params: {
-        ...params,
-      },
-      ...(options || {}),
-    }
-  );
-}
-
 /** Cancel Withdrawal POST /v1/public/user/withdrawal_cancel */
 export async function withdrawalCancel(
   body: API.WithdrawalCancelRequest,