fix: set admin api base url

.github/workflows/auto-merge.yml

@@ -1,29 +1,30 @@
 name: Dependabot Auto Merge
-
 on:
   pull_request_target:
-    types: [opened, reopened, synchronize, ready_for_review, labeled]
-
-permissions:
-  contents: write
-  pull-requests: write
-
-concurrency:
-  group: dependabot-auto-merge-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
+    types: [labeled, edited]
 
 jobs:
   merge:
-    if: >
-      github.actor == 'dependabot[bot]' &&
-      github.event.pull_request.user.login == 'dependabot[bot]' &&
-      contains(github.event.pull_request.labels.*.name, 'dependencies')
+    if: contains(github.event.pull_request.labels.*.name, 'dependencies')
     name: Dependabot Auto Merge
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
-      - name: Enable auto-merge
-        env:
-          GH_TOKEN: ${{ github.token }}
-          PR_URL: ${{ github.event.pull_request.html_url }}
-        run: gh pr merge "$PR_URL" --auto --merge
+      - uses: actions/checkout@v4
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install deps
+        run: pnpm install
+
+      - name: Merge
+        uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          command: merge
+          target: minor
+          github-token: ${{ secrets.GH_TOKEN }}

.github/workflows/pr-check.yml

@@ -1,48 +0,0 @@
-name: PR Check
-
-on:
-  push:
-    branches:
-      - main
-      - internal
-  pull_request:
-    branches:
-      - main
-      - internal
-
-permissions:
-  contents: read
-
-concurrency:
-  group: pr-check-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  validate:
-    name: Lint, Check, Test and Build
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: '1.3.1'
-
-      - name: Install dependencies
-        run: bun install --frozen-lockfile
-
-      - name: Lint
-        run: bun run lint
-
-      - name: Check
-        run: bun run check
-
-      - name: Test
-        run: bun run test
-
-      - name: Build
-        run: bun run build

.github/workflows/release.yml

@@ -9,25 +9,20 @@ on:
 permissions:
   contents: write
 
-concurrency:
-  group: release-${{ github.ref }}
-  cancel-in-progress: false
-
 jobs:
   release:
     name: Build
     runs-on: ubuntu-latest
-    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
+        uses: oven-sh/setup-bun@v1
         with:
-          bun-version: '1.3.1'
+          bun-version: 'latest'
 
       - name: Cache Bun dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: |
             ~/.bun
@@ -37,7 +32,7 @@ jobs:
             ${{ runner.os }}-bun-cache-
 
       - name: Install deps
-        run: bun install --frozen-lockfile
+        run: bun install
 
       - name: Build
         run: bun run build

apps/admin/.env.example

@@ -1,5 +1,5 @@
 # API base URL
-VITE_API_BASE_URL=
+VITE_API_BASE_URL=https://tapi.hifast.biz
 # API prefix path
 VITE_API_PREFIX=
 

apps/admin/.env.production

@@ -0,0 +1 @@
+VITE_API_BASE_URL=https://tapi.hifast.biz

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

@@ -1,23 +0,0 @@
-{
-  "commission": "Commission",
-  "days": "{{count}} days",
-  "disabled": "Disabled",
-  "empty": "No invite records",
-  "enabled": "Enabled",
-  "hasPurchased": "Purchased",
-  "invitee": "Invitee",
-  "inviteeGiftDays": "Invitee Gift Days",
-  "inviteeId": "Invitee ID",
-  "invitedAt": "Invited At",
-  "inviter": "Inviter",
-  "inviterGiftDays": "Inviter Gift Days",
-  "inviterId": "Inviter ID",
-  "loadErrorDescription": "Refresh the table or try again later.",
-  "loadErrorTitle": "Failed to load invites",
-  "no": "No",
-  "orderCount": "Orders",
-  "searchPlaceholder": "Email or phone",
-  "status": "Status",
-  "title": "Invite Management",
-  "yes": "Yes"
-}

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

@@ -11,7 +11,6 @@
   "Email": "Email",
   "Gift": "Gift",
   "Group Management": "Group Management",
-  "Invite Management": "Invite Management",
   "Login": "Login",
   "Logs & Analytics": "Logs & Analytics",
   "Maintenance": "Maintenance",
@@ -21,7 +20,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/order.json

@@ -16,11 +16,10 @@
     "0": "Status",
     "1": "Pending",
     "2": "Paid",
-    "3": "Closed",
-    "4": "Failed",
-    "5": "Finished",
-    "6": "Claimed",
-    "7": "Refunded"
+    "3": "Cancelled",
+    "4": "Closed",
+    "5": "Completed",
+    "6": "Refunded"
   },
   "subscribe": "Subscribe",
   "subscribePrice": "Subscription Price",
@@ -34,8 +33,5 @@
     "4": "Recharge"
   },
   "updateTime": "Update Time",
-  "user": "User",
-  "refundFailed": "Refund failed. Please try again.",
-  "statusClaimedBlocked": "Claimed and refunded states must use the dedicated processing flow.",
-  "statusUpdateFailed": "Status update failed. Please try again."
+  "user": "User"
 }

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/invite.json

@@ -1,23 +0,0 @@
-{
-  "commission": "佣金",
-  "days": "{{count}} 天",
-  "disabled": "禁用",
-  "empty": "暂无邀请记录",
-  "enabled": "启用",
-  "hasPurchased": "已购买",
-  "invitee": "被邀请人",
-  "inviteeGiftDays": "被邀请人赠送天数",
-  "inviteeId": "被邀请人 ID",
-  "invitedAt": "邀请时间",
-  "inviter": "邀请人",
-  "inviterGiftDays": "邀请人赠送天数",
-  "inviterId": "邀请人 ID",
-  "loadErrorDescription": "刷新表格或稍后重试。",
-  "loadErrorTitle": "邀请记录加载失败",
-  "no": "否",
-  "orderCount": "订单数",
-  "searchPlaceholder": "邮箱/手机号关键词",
-  "status": "状态",
-  "title": "邀请管理",
-  "yes": "是"
-}

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

@@ -11,7 +11,6 @@
   "Email": "邮件",
   "Gift": "赠送",
   "Group Management": "分组管理",
-  "Invite Management": "邀请管理",
   "Login": "登录",
   "Logs & Analytics": "日志与分析",
   "Maintenance": "维护",
@@ -21,7 +20,6 @@
   "Order Management": "订单管理",
   "Payment Config": "支付配置",
   "Product Management": "商品管理",
-  "Promo Management": "促销管理",
   "Redemption Management": "兑换码管理",
   "Register": "注册",
   "Reset Subscribe": "重置订阅",

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

@@ -16,11 +16,10 @@
     "0": "状态",
     "1": "待支付",
     "2": "已支付",
-    "3": "已关闭",
-    "4": "失败",
+    "3": "已取消",
+    "4": "已关闭",
     "5": "已完成",
-    "6": "处理中",
-    "7": "已退费"
+    "6": "已退费"
   },
   "subscribe": "订阅",
   "subscribePrice": "订阅价格",
@@ -34,8 +33,5 @@
     "4": "充值"
   },
   "updateTime": "更新时间",
-  "user": "用户",
-  "refundFailed": "退费失败，请重试。",
-  "statusClaimedBlocked": "处理中和已退费状态必须走专用流程，不能通过通用改状态提交。",
-  "statusUpdateFailed": "状态更新失败，请重试。"
+  "user": "用户"
 }

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",
-          },
         ],
       },
 
@@ -103,11 +98,6 @@ export function useNavs() {
             url: "/dashboard/withdrawal",
             icon: "flat-color-icons:money-transfer",
           },
-          {
-            title: t("Invite Management", "Invite Management"),
-            url: "/dashboard/invite-management",
-            icon: "flat-color-icons:add-user",
-          },
           {
             title: t("Device Group", "Device Group"),
             url: "/dashboard/family",

apps/admin/src/main.tsx

@@ -35,14 +35,12 @@ initializeI18n({
     "coupon",
     "dashboard",
     "document",
-    "invite",
     "log",
     "marketing",
     "menu",
     "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/',
 )()
@@ -47,9 +45,6 @@ const DashboardOrderIndexLazyRouteImport =
 const DashboardMarketingIndexLazyRouteImport = createFileRoute(
   '/dashboard/marketing/',
 )()
-const DashboardInviteManagementIndexLazyRouteImport = createFileRoute(
-  '/dashboard/invite-management/',
-)()
 const DashboardGroupIndexLazyRouteImport =
   createFileRoute('/dashboard/group/')()
 const DashboardFamilyIndexLazyRouteImport =
@@ -143,9 +138,9 @@ const DashboardNodesLazyRoute = DashboardNodesLazyRouteImport.update({
 )
 const DashboardWithdrawalIndexLazyRoute =
   DashboardWithdrawalIndexLazyRouteImport.update({
-    id: '/',
-    path: '/',
-    getParentRoute: () => DashboardWithdrawalLazyRoute,
+    id: '/withdrawal/',
+    path: '/withdrawal/',
+    getParentRoute: () => DashboardRouteLazyRoute,
   } as any).lazy(() =>
     import('./routes/dashboard/withdrawal/index.lazy').then((d) => d.Route),
   )
@@ -188,13 +183,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/',
@@ -226,16 +214,6 @@ const DashboardMarketingIndexLazyRoute =
   } as any).lazy(() =>
     import('./routes/dashboard/marketing/index.lazy').then((d) => d.Route),
   )
-const DashboardInviteManagementIndexLazyRoute =
-  DashboardInviteManagementIndexLazyRouteImport.update({
-    id: '/invite-management/',
-    path: '/invite-management/',
-    getParentRoute: () => DashboardRouteLazyRoute,
-  } as any).lazy(() =>
-    import('./routes/dashboard/invite-management/index.lazy').then(
-      (d) => d.Route,
-    ),
-  )
 const DashboardGroupIndexLazyRoute = DashboardGroupIndexLazyRouteImport.update({
   id: '/group/',
   path: '/group/',
@@ -389,7 +367,7 @@ export interface FileRoutesByFullPath {
   '/dashboard': typeof DashboardRouteLazyRouteWithChildren
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
+  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
   '/dashboard/': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -410,23 +388,22 @@ export interface FileRoutesByFullPath {
   '/dashboard/document': typeof DashboardDocumentIndexLazyRoute
   '/dashboard/family': typeof DashboardFamilyIndexLazyRoute
   '/dashboard/group': typeof DashboardGroupIndexLazyRoute
-  '/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
   '/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
   '/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
   '/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
   '/dashboard/user': typeof DashboardUserIndexLazyRoute
-  '/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
+  '/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
 }
 export interface FileRoutesByTo {
   '/': typeof IndexLazyRoute
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
+  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
   '/dashboard': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -447,12 +424,10 @@ export interface FileRoutesByTo {
   '/dashboard/document': typeof DashboardDocumentIndexLazyRoute
   '/dashboard/family': typeof DashboardFamilyIndexLazyRoute
   '/dashboard/group': typeof DashboardGroupIndexLazyRoute
-  '/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
   '/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
   '/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
@@ -466,7 +441,7 @@ export interface FileRoutesById {
   '/dashboard': typeof DashboardRouteLazyRouteWithChildren
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
+  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
   '/dashboard/': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -487,12 +462,10 @@ export interface FileRoutesById {
   '/dashboard/document/': typeof DashboardDocumentIndexLazyRoute
   '/dashboard/family/': typeof DashboardFamilyIndexLazyRoute
   '/dashboard/group/': typeof DashboardGroupIndexLazyRoute
-  '/dashboard/invite-management/': typeof DashboardInviteManagementIndexLazyRoute
   '/dashboard/marketing/': typeof DashboardMarketingIndexLazyRoute
   '/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
@@ -528,23 +501,22 @@ export interface FileRouteTypes {
     | '/dashboard/document'
     | '/dashboard/family'
     | '/dashboard/group'
-    | '/dashboard/invite-management'
     | '/dashboard/marketing'
     | '/dashboard/order'
     | '/dashboard/payment'
     | '/dashboard/product'
-    | '/dashboard/promo'
     | '/dashboard/redemption'
     | '/dashboard/subscribe'
     | '/dashboard/system'
     | '/dashboard/ticket'
     | '/dashboard/user'
-    | '/dashboard/withdrawal/'
+    | '/dashboard/withdrawal'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/'
     | '/dashboard/nodes'
     | '/dashboard/servers'
+    | '/dashboard/withdrawal'
     | '/dashboard'
     | '/dashboard/log/balance'
     | '/dashboard/log/commission'
@@ -565,12 +537,10 @@ export interface FileRouteTypes {
     | '/dashboard/document'
     | '/dashboard/family'
     | '/dashboard/group'
-    | '/dashboard/invite-management'
     | '/dashboard/marketing'
     | '/dashboard/order'
     | '/dashboard/payment'
     | '/dashboard/product'
-    | '/dashboard/promo'
     | '/dashboard/redemption'
     | '/dashboard/subscribe'
     | '/dashboard/system'
@@ -604,12 +574,10 @@ export interface FileRouteTypes {
     | '/dashboard/document/'
     | '/dashboard/family/'
     | '/dashboard/group/'
-    | '/dashboard/invite-management/'
     | '/dashboard/marketing/'
     | '/dashboard/order/'
     | '/dashboard/payment/'
     | '/dashboard/product/'
-    | '/dashboard/promo/'
     | '/dashboard/redemption/'
     | '/dashboard/subscribe/'
     | '/dashboard/system/'
@@ -669,10 +637,10 @@ declare module '@tanstack/react-router' {
     }
     '/dashboard/withdrawal/': {
       id: '/dashboard/withdrawal/'
-      path: '/'
-      fullPath: '/dashboard/withdrawal/'
+      path: '/withdrawal'
+      fullPath: '/dashboard/withdrawal'
       preLoaderRoute: typeof DashboardWithdrawalIndexLazyRouteImport
-      parentRoute: typeof DashboardWithdrawalLazyRoute
+      parentRoute: typeof DashboardRouteLazyRoute
     }
     '/dashboard/user/': {
       id: '/dashboard/user/'
@@ -709,13 +677,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'
@@ -744,13 +705,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof DashboardMarketingIndexLazyRouteImport
       parentRoute: typeof DashboardRouteLazyRoute
     }
-    '/dashboard/invite-management/': {
-      id: '/dashboard/invite-management/'
-      path: '/invite-management'
-      fullPath: '/dashboard/invite-management'
-      preLoaderRoute: typeof DashboardInviteManagementIndexLazyRouteImport
-      parentRoute: typeof DashboardRouteLazyRoute
-    }
     '/dashboard/group/': {
       id: '/dashboard/group/'
       path: '/group'
@@ -887,24 +841,10 @@ declare module '@tanstack/react-router' {
   }
 }
 
-interface DashboardWithdrawalLazyRouteChildren {
-  DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
-}
-
-const DashboardWithdrawalLazyRouteChildren: DashboardWithdrawalLazyRouteChildren =
-  {
-    DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
-  }
-
-const DashboardWithdrawalLazyRouteWithChildren =
-  DashboardWithdrawalLazyRoute._addFileChildren(
-    DashboardWithdrawalLazyRouteChildren,
-  )
-
 interface DashboardRouteLazyRouteChildren {
   DashboardNodesLazyRoute: typeof DashboardNodesLazyRoute
   DashboardServersLazyRoute: typeof DashboardServersLazyRoute
-  DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRouteWithChildren
+  DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRoute
   DashboardIndexLazyRoute: typeof DashboardIndexLazyRoute
   DashboardLogBalanceLazyRoute: typeof DashboardLogBalanceLazyRoute
   DashboardLogCommissionLazyRoute: typeof DashboardLogCommissionLazyRoute
@@ -925,23 +865,22 @@ interface DashboardRouteLazyRouteChildren {
   DashboardDocumentIndexLazyRoute: typeof DashboardDocumentIndexLazyRoute
   DashboardFamilyIndexLazyRoute: typeof DashboardFamilyIndexLazyRoute
   DashboardGroupIndexLazyRoute: typeof DashboardGroupIndexLazyRoute
-  DashboardInviteManagementIndexLazyRoute: typeof DashboardInviteManagementIndexLazyRoute
   DashboardMarketingIndexLazyRoute: typeof DashboardMarketingIndexLazyRoute
   DashboardOrderIndexLazyRoute: typeof DashboardOrderIndexLazyRoute
   DashboardPaymentIndexLazyRoute: typeof DashboardPaymentIndexLazyRoute
   DashboardProductIndexLazyRoute: typeof DashboardProductIndexLazyRoute
-  DashboardPromoIndexLazyRoute: typeof DashboardPromoIndexLazyRoute
   DashboardRedemptionIndexLazyRoute: typeof DashboardRedemptionIndexLazyRoute
   DashboardSubscribeIndexLazyRoute: typeof DashboardSubscribeIndexLazyRoute
   DashboardSystemIndexLazyRoute: typeof DashboardSystemIndexLazyRoute
   DashboardTicketIndexLazyRoute: typeof DashboardTicketIndexLazyRoute
   DashboardUserIndexLazyRoute: typeof DashboardUserIndexLazyRoute
+  DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
 }
 
 const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
   DashboardNodesLazyRoute: DashboardNodesLazyRoute,
   DashboardServersLazyRoute: DashboardServersLazyRoute,
-  DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRouteWithChildren,
+  DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRoute,
   DashboardIndexLazyRoute: DashboardIndexLazyRoute,
   DashboardLogBalanceLazyRoute: DashboardLogBalanceLazyRoute,
   DashboardLogCommissionLazyRoute: DashboardLogCommissionLazyRoute,
@@ -962,18 +901,16 @@ const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
   DashboardDocumentIndexLazyRoute: DashboardDocumentIndexLazyRoute,
   DashboardFamilyIndexLazyRoute: DashboardFamilyIndexLazyRoute,
   DashboardGroupIndexLazyRoute: DashboardGroupIndexLazyRoute,
-  DashboardInviteManagementIndexLazyRoute:
-    DashboardInviteManagementIndexLazyRoute,
   DashboardMarketingIndexLazyRoute: DashboardMarketingIndexLazyRoute,
   DashboardOrderIndexLazyRoute: DashboardOrderIndexLazyRoute,
   DashboardPaymentIndexLazyRoute: DashboardPaymentIndexLazyRoute,
   DashboardProductIndexLazyRoute: DashboardProductIndexLazyRoute,
-  DashboardPromoIndexLazyRoute: DashboardPromoIndexLazyRoute,
   DashboardRedemptionIndexLazyRoute: DashboardRedemptionIndexLazyRoute,
   DashboardSubscribeIndexLazyRoute: DashboardSubscribeIndexLazyRoute,
   DashboardSystemIndexLazyRoute: DashboardSystemIndexLazyRoute,
   DashboardTicketIndexLazyRoute: DashboardTicketIndexLazyRoute,
   DashboardUserIndexLazyRoute: DashboardUserIndexLazyRoute,
+  DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
 }
 
 const DashboardRouteLazyRouteWithChildren =

apps/admin/src/routes/dashboard/invite-management/index.lazy.tsx

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

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/invite/index.test.tsx

@@ -1,159 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import { cleanup, render, screen, waitFor } from "@testing-library/react";
-import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
-import type { AxiosResponse } from "axios";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import InviteManagement from ".";
-
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({
-    t: (
-      _key: string,
-      fallback: string,
-      options?: { count?: number }
-    ): string => {
-      if (typeof options?.count === "number") {
-        return `${options.count} days`;
-      }
-      return fallback;
-    },
-  }),
-}));
-
-vi.mock("@/stores/global", () => ({
-  useGlobalStore: () => ({
-    common: {
-      currency: {
-        currency_symbol: "$",
-      },
-    },
-  }),
-}));
-
-vi.mock("@/utils/common", () => ({
-  formatDate: (timestamp: number) => `date-${timestamp}`,
-}));
-
-vi.mock("@workspace/ui/services/admin/invite", () => ({
-  getAdminInviteList: vi.fn(),
-}));
-
-const mockedGetAdminInviteList = vi.mocked(getAdminInviteList);
-
-function createInviteListResponse(
-  data: API.GetAdminInviteListResponse
-): AxiosResponse<API.Response & { data?: API.GetAdminInviteListResponse }> {
-  return {
-    data: {
-      code: 200,
-      data,
-    },
-    status: 200,
-    statusText: "OK",
-    headers: {},
-    config: {
-      headers: {} as AxiosResponse["config"]["headers"],
-    },
-  };
-}
-
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-beforeEach(() => {
-  localStorage.setItem("timezone", "UTC");
-});
-
-describe("InviteManagement", () => {
-  it("renders invite rows with status, purchase state, commission, and gift days", async () => {
-    mockedGetAdminInviteList.mockResolvedValue(
-      createInviteListResponse({
-        total: 1,
-        list: [
-          {
-            inviter_id: 10,
-            inviter_identifier: "agent@example.com",
-            invitee_id: 123,
-            invitee_identifier: "user@example.com",
-            invitee_avatar: "",
-            invitee_enable: true,
-            invited_at: 1_716_800_000,
-            order_count: 3,
-            has_purchased: true,
-            inviter_commission: 1500,
-            inviter_gift_days: 30,
-            invitee_gift_days: 7,
-          },
-        ],
-      })
-    );
-
-    render(<InviteManagement />);
-
-    await waitFor(() =>
-      expect(mockedGetAdminInviteList).toHaveBeenCalledWith({
-        page: 1,
-        size: 200,
-        search: undefined,
-        inviter_id: undefined,
-        invitee_id: undefined,
-      })
-    );
-
-    expect(await screen.findByText("agent@example.com")).not.toBeNull();
-    expect(screen.getByText("user@example.com")).not.toBeNull();
-    expect(screen.getByText("Enabled")).not.toBeNull();
-    expect(screen.getByText("Yes")).not.toBeNull();
-    expect(screen.getByText("$15.00")).not.toBeNull();
-    expect(screen.getByText("30 days")).not.toBeNull();
-    expect(screen.getByText("7 days")).not.toBeNull();
-    expect(screen.getByText("date-1716800000")).not.toBeNull();
-  });
-
-  it("shows the empty state when the API returns no rows", async () => {
-    mockedGetAdminInviteList.mockResolvedValue(
-      createInviteListResponse({
-        total: 0,
-        list: [],
-      })
-    );
-
-    render(<InviteManagement />);
-
-    expect(await screen.findByText("No invite records")).not.toBeNull();
-  });
-
-  it("shows a loading state while invites are being fetched", () => {
-    let resolveRequest:
-      | ((
-          value: AxiosResponse<
-            API.Response & { data?: API.GetAdminInviteListResponse }
-          >
-        ) => void)
-      | undefined;
-    mockedGetAdminInviteList.mockReturnValue(
-      new Promise((resolve) => {
-        resolveRequest = resolve;
-      })
-    );
-
-    render(<InviteManagement />);
-
-    expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
-    expect(resolveRequest).toBeTypeOf("function");
-  });
-
-  it("shows an error state when the request fails", async () => {
-    mockedGetAdminInviteList.mockRejectedValue(new Error("network failed"));
-
-    render(<InviteManagement />);
-
-    await waitFor(() => expect(mockedGetAdminInviteList).toHaveBeenCalled());
-    expect(await screen.findByText("Failed to load invites")).not.toBeNull();
-    expect(screen.queryByText("No invite records")).toBeNull();
-  });
-});

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

@@ -1,213 +0,0 @@
-"use client";
-
-import {
-  Alert,
-  AlertDescription,
-  AlertTitle,
-} from "@workspace/ui/components/alert";
-import {
-  Avatar,
-  AvatarFallback,
-  AvatarImage,
-} from "@workspace/ui/components/avatar";
-import { Badge } from "@workspace/ui/components/badge";
-import Empty from "@workspace/ui/composed/empty";
-import {
-  ProTable,
-  type ProTableActions,
-} from "@workspace/ui/composed/pro-table/pro-table";
-import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
-import { CircleAlert } from "lucide-react";
-import { useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { Display } from "@/components/display";
-import { formatDate } from "@/utils/common";
-
-type InviteFilters = {
-  search?: string;
-  inviter_id?: string;
-  invitee_id?: string;
-};
-
-function toOptionalNumber(value?: string) {
-  if (!value) return;
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : undefined;
-}
-
-function InviteUserCell({
-  id,
-  identifier,
-  avatar,
-}: {
-  id: number;
-  identifier: string;
-  avatar?: string;
-}) {
-  const fallback = identifier?.charAt(0)?.toUpperCase() || "U";
-
-  return (
-    <div className="flex min-w-48 items-center gap-2">
-      <Avatar className="h-8 w-8">
-        <AvatarImage alt={identifier || `#${id}`} src={avatar} />
-        <AvatarFallback className="text-xs">{fallback}</AvatarFallback>
-      </Avatar>
-      <div className="min-w-0">
-        <div className="font-medium text-sm">#{id}</div>
-        <div className="max-w-52 truncate text-muted-foreground text-xs">
-          {identifier || "--"}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function InviteIdentifierCell({
-  id,
-  identifier,
-}: {
-  id: number;
-  identifier: string;
-}) {
-  return (
-    <div className="min-w-44">
-      <div className="font-medium text-sm">#{id}</div>
-      <div className="max-w-52 truncate text-muted-foreground text-xs">
-        {identifier || "--"}
-      </div>
-    </div>
-  );
-}
-
-export default function InviteManagement() {
-  const { t } = useTranslation("invite");
-  const ref = useRef<ProTableActions>(null);
-
-  return (
-    <ProTable<API.AdminInviteRelation, InviteFilters>
-      action={ref}
-      columns={[
-        {
-          accessorKey: "inviter_id",
-          header: t("inviter", "Inviter"),
-          cell: ({ row }) => (
-            <InviteIdentifierCell
-              id={row.original.inviter_id}
-              identifier={row.original.inviter_identifier}
-            />
-          ),
-        },
-        {
-          accessorKey: "invitee_id",
-          header: t("invitee", "Invitee"),
-          cell: ({ row }) => (
-            <InviteUserCell
-              avatar={row.original.invitee_avatar}
-              id={row.original.invitee_id}
-              identifier={row.original.invitee_identifier}
-            />
-          ),
-        },
-        {
-          accessorKey: "invitee_enable",
-          header: t("status", "Status"),
-          cell: ({ row }) => (
-            <Badge
-              variant={row.original.invitee_enable ? "default" : "secondary"}
-            >
-              {row.original.invitee_enable
-                ? t("enabled", "Enabled")
-                : t("disabled", "Disabled")}
-            </Badge>
-          ),
-        },
-        {
-          accessorKey: "invited_at",
-          header: t("invitedAt", "Invited At"),
-          cell: ({ row }) => formatDate(row.original.invited_at),
-        },
-        {
-          accessorKey: "order_count",
-          header: t("orderCount", "Orders"),
-        },
-        {
-          accessorKey: "has_purchased",
-          header: t("hasPurchased", "Purchased"),
-          cell: ({ row }) => (
-            <Badge variant={row.original.has_purchased ? "default" : "outline"}>
-              {row.original.has_purchased ? t("yes", "Yes") : t("no", "No")}
-            </Badge>
-          ),
-        },
-        {
-          accessorKey: "inviter_commission",
-          header: t("commission", "Commission"),
-          cell: ({ row }) => (
-            <Display type="currency" value={row.original.inviter_commission} />
-          ),
-        },
-        {
-          accessorKey: "inviter_gift_days",
-          header: t("inviterGiftDays", "Inviter Gift Days"),
-          cell: ({ row }) =>
-            t("days", "{{count}} days", {
-              count: row.original.inviter_gift_days,
-            }),
-        },
-        {
-          accessorKey: "invitee_gift_days",
-          header: t("inviteeGiftDays", "Invitee Gift Days"),
-          cell: ({ row }) =>
-            t("days", "{{count}} days", {
-              count: row.original.invitee_gift_days,
-            }),
-        },
-      ]}
-      empty={<Empty description={t("empty", "No invite records")} />}
-      error={
-        <Alert className="mx-auto max-w-md" variant="destructive">
-          <CircleAlert aria-hidden="true" />
-          <AlertTitle>
-            {t("loadErrorTitle", "Failed to load invites")}
-          </AlertTitle>
-          <AlertDescription>
-            {t("loadErrorDescription", "Refresh the table or try again later.")}
-          </AlertDescription>
-        </Alert>
-      }
-      header={{ title: t("title", "Invite Management") }}
-      params={[
-        {
-          key: "search",
-          placeholder: t("searchPlaceholder", "Email or phone"),
-        },
-        {
-          key: "inviter_id",
-          placeholder: t("inviterId", "Inviter ID"),
-        },
-        {
-          key: "invitee_id",
-          placeholder: t("inviteeId", "Invitee ID"),
-        },
-      ]}
-      request={async (pagination, filters) => {
-        const { data } = await getAdminInviteList({
-          page: pagination.page,
-          size: pagination.size,
-          search: filters.search?.trim() || undefined,
-          inviter_id: toOptionalNumber(filters.inviter_id),
-          invitee_id: toOptionalNumber(filters.invitee_id),
-        });
-
-        return {
-          list:
-            data.data?.list.map((item) => ({
-              ...item,
-              id: `${item.inviter_id}-${item.invitee_id}-${item.invited_at}`,
-            })) || [],
-          total: data.data?.total || 0,
-        };
-      }}
-    />
-  );
-}

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

@@ -1,466 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import {
-  cleanup,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from "@testing-library/react";
-import {
-  activateOrder,
-  getOrderList,
-  refundOrder,
-  updateOrderStatus,
-} from "@workspace/ui/services/admin/order";
-import type { AxiosResponse } from "axios";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import Order, { canManuallyUpdateOrderStatus, canRefundOrderStatus } from ".";
-
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({
-    t: (_key: string, fallback: string): string => fallback,
-  }),
-}));
-
-vi.mock("@tanstack/react-router", () => ({
-  useSearch: () => ({}),
-}));
-
-vi.mock("@/stores/global", () => ({
-  useGlobalStore: (
-    selector?: (state: {
-      user: { is_admin: boolean };
-      common: { currency: { currency_symbol: string } };
-    }) => unknown
-  ) => {
-    const state = {
-      user: {
-        is_admin: true,
-      },
-      common: {
-        currency: {
-          currency_symbol: "$",
-        },
-      },
-    };
-
-    return typeof selector === "function" ? selector(state) : state;
-  },
-}));
-
-vi.mock("@/stores/subscribe", () => ({
-  useSubscribe: () => ({
-    subscribes: [
-      {
-        id: 9,
-        name: "Pro Plan",
-      },
-    ],
-    getSubscribeName: (id?: number) => (id === 9 ? "Pro Plan" : "--"),
-  }),
-}));
-
-vi.mock("@/utils/common", () => ({
-  formatDate: (timestamp: number) => `date-${timestamp}`,
-}));
-
-vi.mock("../user/user-detail", () => ({
-  UserDetail: ({ id }: { id: number }) => <span>User #{id}</span>,
-}));
-
-vi.mock("@/components/display", () => ({
-  Display: ({ value }: { value: number }) => <span>{value}</span>,
-}));
-
-const toastSuccess = vi.fn();
-const toastError = vi.fn();
-
-vi.mock("sonner", () => ({
-  toast: {
-    success: (...args: unknown[]) => toastSuccess(...args),
-    error: (...args: unknown[]) => toastError(...args),
-  },
-}));
-
-vi.mock("@workspace/ui/services/admin/order", () => ({
-  activateOrder: vi.fn(),
-  getOrderList: vi.fn(),
-  refundOrder: vi.fn(),
-  updateOrderStatus: vi.fn(),
-}));
-
-vi.mock("@workspace/ui/components/alert-dialog", () => ({
-  AlertDialog: ({ children }: { children: React.ReactNode }) => (
-    <div>{children}</div>
-  ),
-  AlertDialogTrigger: ({ children }: { children: React.ReactNode }) => (
-    <div>{children}</div>
-  ),
-  AlertDialogContent: ({ children }: { children: React.ReactNode }) => (
-    <div>{children}</div>
-  ),
-  AlertDialogHeader: ({ children }: { children: React.ReactNode }) => (
-    <div>{children}</div>
-  ),
-  AlertDialogTitle: ({ children }: { children: React.ReactNode }) => (
-    <div>{children}</div>
-  ),
-  AlertDialogDescription: ({ children }: { children: React.ReactNode }) => (
-    <div>{children}</div>
-  ),
-  AlertDialogFooter: ({ children }: { children: React.ReactNode }) => (
-    <div>{children}</div>
-  ),
-  AlertDialogCancel: ({
-    children,
-    ...props
-  }: React.ComponentProps<"button">) => <button {...props}>{children}</button>,
-  AlertDialogAction: ({
-    children,
-    ...props
-  }: React.ComponentProps<"button">) => <button {...props}>{children}</button>,
-}));
-
-vi.mock("@workspace/ui/composed/combobox", () => ({
-  Combobox: ({
-    options = [],
-    value,
-    onChange,
-    placeholder,
-  }: {
-    options?: Array<{ label: string; value: number | string }>;
-    value?: number | string;
-    onChange: (value: number) => void;
-    placeholder?: string;
-  }) => (
-    <label>
-      <span>{placeholder}</span>
-      <select
-        aria-label={placeholder}
-        onChange={(event) => onChange(Number(event.target.value))}
-        value={String(value ?? "")}
-      >
-        {options.map((option) => (
-          <option key={String(option.value)} value={String(option.value)}>
-            {option.label}
-          </option>
-        ))}
-      </select>
-    </label>
-  ),
-}));
-
-vi.mock("@workspace/ui/composed/pro-table/pro-table", async () => {
-  const React = await import("react");
-
-  type Column = {
-    accessorKey?: string;
-    cell?: (props: {
-      row: {
-        original: Record<string, unknown>;
-        getValue: (key: string) => unknown;
-      };
-    }) => React.ReactNode;
-  };
-
-  return {
-    ProTable: ({
-      columns,
-      request,
-      actions,
-    }: {
-      columns: Column[];
-      request: (
-        pagination: { page: number; size: number },
-        filter: Record<string, unknown>
-      ) => Promise<{ list: Record<string, unknown>[]; total: number }>;
-      actions?: {
-        render?: (row: Record<string, unknown>) => React.ReactNode[];
-      };
-    }) => {
-      const [state, setState] = React.useState<{
-        data: Record<string, unknown>[];
-        error: boolean;
-        loading: boolean;
-      }>({
-        data: [],
-        error: false,
-        loading: true,
-      });
-
-      React.useEffect(() => {
-        let cancelled = false;
-        request({ page: 1, size: 200 }, {})
-          .then((response) => {
-            if (cancelled) return;
-            setState({
-              data: response.list,
-              error: false,
-              loading: false,
-            });
-          })
-          .catch(() => {
-            if (cancelled) return;
-            setState({
-              data: [],
-              error: true,
-              loading: false,
-            });
-          });
-
-        return () => {
-          cancelled = true;
-        };
-      }, [request]);
-
-      if (state.loading) {
-        return <div aria-label="Loading data" role="status" />;
-      }
-
-      if (state.error) {
-        return <div>Failed to load orders</div>;
-      }
-
-      if (state.data.length === 0) {
-        return <div>No orders</div>;
-      }
-
-      return (
-        <div>
-          {state.data.map((row) => (
-            <article key={String(row.id)}>
-              {columns.map((column, index) => {
-                const value = column.accessorKey
-                  ? row[column.accessorKey]
-                  : undefined;
-                const rowApi = {
-                  original: row,
-                  getValue: (key: string) => row[key],
-                };
-
-                return (
-                  <div key={`${row.id}-${index}`}>
-                    {column.cell
-                      ? column.cell({ row: rowApi })
-                      : typeof value === "object"
-                        ? JSON.stringify(value)
-                        : String(value ?? "")}
-                  </div>
-                );
-              })}
-              <div>{actions?.render?.(row)}</div>
-            </article>
-          ))}
-        </div>
-      );
-    },
-  };
-});
-
-const mockedGetOrderList = vi.mocked(getOrderList);
-const mockedRefundOrder = vi.mocked(refundOrder);
-const mockedUpdateOrderStatus = vi.mocked(updateOrderStatus);
-const mockedActivateOrder = vi.mocked(activateOrder);
-
-function createOrderListResponse(
-  list: API.Order[]
-): AxiosResponse<API.Response & { data?: API.GetOrderListResponse }> {
-  return {
-    data: {
-      code: 200,
-      data: {
-        list,
-        total: list.length,
-      },
-    },
-    status: 200,
-    statusText: "OK",
-    headers: {},
-    config: {
-      headers: {} as AxiosResponse["config"]["headers"],
-    },
-  };
-}
-
-function createSuccessResponse(): AxiosResponse<
-  API.Response & { data?: unknown }
-> {
-  return {
-    data: {
-      code: 200,
-    },
-    status: 200,
-    statusText: "OK",
-    headers: {},
-    config: {
-      headers: {} as AxiosResponse["config"]["headers"],
-    },
-  };
-}
-
-function createOrder(status: number): API.Order {
-  return {
-    id: status,
-    amount: 1999,
-    coupon_discount: 0,
-    discount: 0,
-    fee_amount: 0,
-    order_no: `ORDER-${status}`,
-    payment: {
-      name: "Stripe",
-      platform: "stripe",
-    },
-    price: 1999,
-    quantity: 1,
-    status,
-    status_name:
-      status === 6 ? "claimed" : status === 7 ? "refunded" : "pending",
-    subscribe_id: 9,
-    trade_no: `TRADE-${status}`,
-    type: 1,
-    updated_at: 1_716_800_000,
-    user_id: 88,
-  } as API.Order;
-}
-
-function renderOrderPage() {
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        retry: false,
-      },
-    },
-  });
-
-  return render(
-    <QueryClientProvider client={queryClient}>
-      <Order />
-    </QueryClientProvider>
-  );
-}
-
-beforeEach(() => {
-  localStorage.setItem("timezone", "UTC");
-});
-
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("Order", () => {
-  it("uses the dedicated refund endpoint for refundable orders", async () => {
-    mockedGetOrderList.mockResolvedValue(
-      createOrderListResponse([createOrder(2)])
-    );
-    mockedRefundOrder.mockResolvedValue(createSuccessResponse());
-
-    renderOrderPage();
-
-    expect(await screen.findByText("ORDER-2")).not.toBeNull();
-    fireEvent.click(screen.getByRole("button", { name: "Confirm refund" }));
-
-    await waitFor(() =>
-      expect(mockedRefundOrder).toHaveBeenCalledWith(
-        { id: 2 },
-        { skipErrorHandler: true }
-      )
-    );
-    expect(toastSuccess).toHaveBeenCalledWith("Refund completed.");
-  });
-
-  it("blocks status 6 and 7 from the generic status editor", async () => {
-    mockedGetOrderList.mockResolvedValue(
-      createOrderListResponse([createOrder(1)])
-    );
-    mockedUpdateOrderStatus.mockResolvedValue(createSuccessResponse());
-
-    renderOrderPage();
-
-    const statusSelect = await screen.findByLabelText("Status");
-    const optionValues = Array.from(
-      statusSelect.querySelectorAll("option")
-    ).map((option) => option.textContent);
-
-    expect(optionValues).not.toContain("Claimed");
-    expect(optionValues).not.toContain("Refunded");
-    expect(canManuallyUpdateOrderStatus(6)).toBe(false);
-    expect(canManuallyUpdateOrderStatus(7)).toBe(false);
-
-    fireEvent.change(statusSelect, { target: { value: "2" } });
-
-    await waitFor(() =>
-      expect(mockedUpdateOrderStatus).toHaveBeenCalledWith(
-        { id: 1, status: 2 },
-        { skipErrorHandler: true }
-      )
-    );
-  });
-
-  it("renders loading state while orders are being fetched", () => {
-    mockedGetOrderList.mockReturnValue(
-      new Promise(() => {
-        // Keep the request pending so the loading UI remains visible.
-      }) as ReturnType<typeof getOrderList>
-    );
-
-    renderOrderPage();
-
-    expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
-  });
-
-  it("renders the empty state when there are no orders", async () => {
-    mockedGetOrderList.mockResolvedValue(createOrderListResponse([]));
-
-    renderOrderPage();
-
-    expect(await screen.findByText("No orders")).not.toBeNull();
-  });
-
-  it("shows an error toast when refund fails", async () => {
-    mockedGetOrderList.mockResolvedValue(
-      createOrderListResponse([createOrder(5)])
-    );
-    mockedRefundOrder.mockRejectedValue(new Error("refund failed"));
-
-    renderOrderPage();
-
-    expect(await screen.findByText("ORDER-5")).not.toBeNull();
-    fireEvent.click(screen.getByRole("button", { name: "Confirm refund" }));
-
-    await waitFor(() =>
-      expect(toastError).toHaveBeenCalledWith(
-        "Refund failed. Please try again."
-      )
-    );
-  });
-
-  it("renders the error state when the order list request fails", async () => {
-    mockedGetOrderList.mockRejectedValue(new Error("network failed"));
-
-    renderOrderPage();
-
-    expect(await screen.findByText("Failed to load orders")).not.toBeNull();
-  });
-
-  it("keeps the order actions visible on a narrow viewport", async () => {
-    window.innerWidth = 375;
-    window.dispatchEvent(new Event("resize"));
-    mockedGetOrderList.mockResolvedValue(
-      createOrderListResponse([createOrder(2), createOrder(6), createOrder(7)])
-    );
-
-    renderOrderPage();
-
-    expect(await screen.findByText("ORDER-2")).not.toBeNull();
-    expect(screen.getByText("Claimed")).not.toBeNull();
-    expect(screen.getAllByText("Refund").length).toBe(1);
-    expect(canRefundOrderStatus(2)).toBe(true);
-    expect(canRefundOrderStatus(6)).toBe(false);
-    expect(canRefundOrderStatus(7)).toBe(false);
-    expect(mockedActivateOrder).not.toHaveBeenCalled();
-  });
-});

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

@@ -40,31 +40,7 @@ import { useSubscribe } from "@/stores/subscribe";
 import { formatDate } from "@/utils/common";
 import { UserDetail } from "../user/user-detail";
 
-const ORDER_STATUS_PENDING = 1;
-const ORDER_STATUS_PAID = 2;
-const ORDER_STATUS_CLOSED = 3;
-const ORDER_STATUS_FAILED = 4;
-const ORDER_STATUS_FINISHED = 5;
-const ORDER_STATUS_CLAIMED = 6;
-const ORDER_STATUS_REFUNDED = 7;
-
-const MANUALLY_EDITABLE_ORDER_STATUSES = [
-  ORDER_STATUS_PENDING,
-  ORDER_STATUS_PAID,
-  ORDER_STATUS_CLOSED,
-  ORDER_STATUS_FAILED,
-  ORDER_STATUS_FINISHED,
-] as const;
-
-export function canManuallyUpdateOrderStatus(status: number) {
-  return MANUALLY_EDITABLE_ORDER_STATUSES.includes(
-    status as (typeof MANUALLY_EDITABLE_ORDER_STATUSES)[number]
-  );
-}
-
-export function canRefundOrderStatus(status: number) {
-  return [ORDER_STATUS_PAID, ORDER_STATUS_FINISHED].includes(status);
-}
+const REFUNDED_ORDER_STATUS = 6;
 
 export default function Order() {
   const { t } = useTranslation("order");
@@ -80,46 +56,30 @@ export default function Order() {
     subscribe_id: sp.subscribe_id || undefined,
   };
 
-  const displayStatusOptions = [
+  const statusOptions = [
     {
-      value: ORDER_STATUS_PENDING,
+      value: 1,
       label: t("status.1", "Pending"),
       className: "bg-orange-500",
     },
+    { value: 2, label: t("status.2", "Paid"), className: "bg-green-500" },
     {
-      value: ORDER_STATUS_PAID,
-      label: t("status.2", "Paid"),
-      className: "bg-green-500",
-    },
-    {
-      value: ORDER_STATUS_CLOSED,
-      label: t("status.3", "Closed"),
+      value: 3,
+      label: t("status.3", "Cancelled"),
       className: "bg-gray-500",
     },
+    { value: 4, label: t("status.4", "Closed"), className: "bg-red-500" },
     {
-      value: ORDER_STATUS_FAILED,
-      label: t("status.4", "Failed"),
-      className: "bg-red-500",
-    },
-    {
-      value: ORDER_STATUS_FINISHED,
-      label: t("status.5", "Finished"),
+      value: 5,
+      label: t("status.5", "Completed"),
       className: "bg-green-500",
     },
     {
-      value: ORDER_STATUS_CLAIMED,
-      label: t("status.6", "Claimed"),
-      className: "bg-amber-500",
-    },
-    {
-      value: ORDER_STATUS_REFUNDED,
-      label: t("status.7", "Refunded"),
+      value: REFUNDED_ORDER_STATUS,
+      label: t("status.6", "Refunded"),
       className: "bg-red-500",
     },
   ];
-  const editableStatusOptions = displayStatusOptions.filter((option) =>
-    canManuallyUpdateOrderStatus(option.value)
-  );
 
   const typeOptions = [
     { value: 1, label: t("type.1", "New Purchase") },
@@ -135,36 +95,29 @@ export default function Order() {
 
   const refundMutation = useMutation({
     mutationFn: async (order: API.Order) => {
-      await refundOrder(
-        { id: order.id },
-        {
-          skipErrorHandler: true,
-        }
-      );
+      await refundOrder({ id: order.id });
     },
     onSuccess: () => {
       toast.success(t("refundSuccess", "Refund completed."));
       setConfirmingOrderId(null);
       ref.current?.refresh();
     },
-    onError: () => {
-      toast.error(t("refundFailed", "Refund failed. Please try again."));
+    onError: (error) => {
+      console.error("Refund order failed", error);
       setConfirmingOrderId(null);
     },
   });
 
   const isRefundedOrder = (order: API.Order) =>
-    order.status === ORDER_STATUS_REFUNDED ||
-    order.status_name === t("status.7", "Refunded") ||
+    order.status === REFUNDED_ORDER_STATUS ||
+    order.status_name === t("status.6", "Refunded") ||
     order.status_name?.toLowerCase() === "refunded";
 
   const canRefundOrder = (order: API.Order) =>
-    canRefundOrders &&
-    canRefundOrderStatus(order.status) &&
-    !isRefundedOrder(order);
+    canRefundOrders && !isRefundedOrder(order);
 
   return (
-    <ProTable<API.Order, Record<string, unknown>>
+    <ProTable<API.Order, any>
       action={ref}
       actions={{
         render: (order) => {
@@ -220,11 +173,7 @@ export default function Order() {
                     onClick={async (event) => {
                       event.preventDefault();
                       if (isPending) return;
-                      try {
-                        await refundMutation.mutateAsync(order);
-                      } catch {
-                        // Errors are surfaced through the mutation onError handler.
-                      }
+                      await refundMutation.mutateAsync(order);
                     }}
                   >
                     {isPending
@@ -386,55 +335,26 @@ export default function Order() {
           header: t("status.0", "Status"),
           cell: ({ row }) => {
             const order = row.original as API.Order;
-            const option = displayStatusOptions.find(
+            const option = statusOptions.find(
               (opt) => opt.value === order.status
             );
-            if (
-              [ORDER_STATUS_PENDING, ORDER_STATUS_CLOSED, ORDER_STATUS_FAILED]
-                .map(String)
-                .includes(String(row.getValue("status")))
-            ) {
+            if ([1, 3, 4].includes(row.getValue("status"))) {
               return (
                 <div className="flex items-center gap-1">
                   <Combobox<number, false>
                     className={cn(option?.className)}
                     onChange={async (value) => {
-                      if (!canManuallyUpdateOrderStatus(value)) {
-                        toast.error(
-                          t(
-                            "statusClaimedBlocked",
-                            "Claimed and refunded states must use the dedicated processing flow."
-                          )
-                        );
-                        return;
-                      }
-                      try {
-                        await updateOrderStatus(
-                          {
-                            id: order.id,
-                            status: value,
-                          },
-                          {
-                            skipErrorHandler: true,
-                          }
-                        );
-                        ref.current?.refresh();
-                      } catch {
-                        toast.error(
-                          t(
-                            "statusUpdateFailed",
-                            "Status update failed. Please try again."
-                          )
-                        );
-                      }
+                      await updateOrderStatus({
+                        id: order.id,
+                        status: value,
+                      });
+                      ref.current?.refresh();
                     }}
-                    options={editableStatusOptions}
+                    options={statusOptions}
                     placeholder={t("status.0", "Status")}
                     value={order.status}
                   />
-                  {[ORDER_STATUS_PENDING, ORDER_STATUS_CLOSED].includes(
-                    order.status
-                  ) && (
+                  {[1, 3].includes(order.status) && (
                     <Button
                       onClick={async () => {
                         await activateOrder({ order_no: order.order_no });
@@ -467,7 +387,7 @@ export default function Order() {
         {
           key: "status",
           placeholder: t("status.0", "Status"),
-          options: displayStatusOptions.map((item) => ({
+          options: statusOptions.map((item) => ({
             label: item.label,
             value: String(item.value),
           })),

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/index.tsx

@@ -16,11 +16,6 @@ import {
   DropdownMenuTrigger,
 } from "@workspace/ui/components/dropdown-menu";
 import { Input } from "@workspace/ui/components/input";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@workspace/ui/components/popover";
 import { ScrollArea } from "@workspace/ui/components/scroll-area";
 import {
   Select,
@@ -36,6 +31,13 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@workspace/ui/components/sheet";
+import { FilePenLine } from 'lucide-react';
+import {
+  Popover,
+  PopoverClose,
+  PopoverContent,
+  PopoverTrigger,
+} from '@workspace/ui/components/popover';
 import { Switch } from "@workspace/ui/components/switch";
 import {
   Tabs,
@@ -61,16 +63,13 @@ import {
   updateUserBasicInfo,
 } from "@workspace/ui/services/admin/user";
 import { parseDeviceType } from "@workspace/ui/utils/device";
-import { FilePenLine } from "lucide-react";
-import { useCallback, useRef, useState } from "react";
+import React, { useRef, useState, useCallback } from 'react';
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { Display } from "@/components/display";
 import { useSubscribe } from "@/stores/subscribe";
 import { formatDate } from "@/utils/common";
 import FamilyManagement from "./family";
-import { RemarkForm } from "./remark-form";
-import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
 import { UserDetail } from "./user-detail";
 import UserForm from "./user-form";
 import { UserInviteStatsSheet } from "./user-invite-stats-sheet";
@@ -78,11 +77,44 @@ import { AuthMethodsForm } from "./user-profile/auth-methods-form";
 import { BasicInfoForm } from "./user-profile/basic-info-form";
 import { NotifySettingsForm } from "./user-profile/notify-settings-form";
 import UserSubscription from "./user-subscription";
-
 // import EditUserGroupDialog from "./edit-user-group-dialog";
 
-type UserDeviceWithDeviceNo = API.UserDevice & {
-  device_no?: string;
+
+// 为 RemarkForm 组件定义 props 类型
+interface RemarkFormProps {
+  initialRemark?: string | null;
+  onSave: (remark: string) => void;
+  CloseComponent: React.ComponentType<{ asChild?: boolean; children: React.ReactNode }>;
+}
+// 新的子组件，在管理它自己的备注状态
+const RemarkForm: React.FC<RemarkFormProps> = ({ onSave, initialRemark, CloseComponent }) => {
+  const [remark, setRemark] = useState<string>(initialRemark ?? '');
+
+  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setRemark(event.target.value);
+  };
+
+  const handleSaveClick = () => {
+    onSave(remark);
+  };
+
+  return (
+      <>
+        <div className='mb-2 text-sm font-semibold'>备注</div>
+        <Input
+            type='text'
+            value={remark}
+            onChange={handleInputChange}
+            placeholder='在此输入备注...'
+            className='w-full'
+        />
+        <CloseComponent asChild>
+          <Button onClick={handleSaveClick} variant='default' size={'sm'} className={'mt-2'}>
+            保存
+          </Button>
+        </CloseComponent>
+      </>
+  );
 };
 
 export default function User() {
@@ -152,7 +184,7 @@ export default function User() {
             userId={row.id}
           />,
           <PreviewNodesDialog key="preview-nodes" userId={row.id} />,
-          /* <ConfirmButton
+         /* <ConfirmButton
             cancelText={t("cancel", "Cancel")}
             confirmText={t("confirm", "Confirm")}
             description={t(
@@ -261,57 +293,61 @@ export default function User() {
         {
           id: "auth_methods",
           accessorKey: "auth_methods",
-          header: "设备码/邮箱",
+          header: '设备码/邮箱',
           cell: ({ row }) => {
             const method = row.original.auth_methods?.[0];
             const identifier = method?.auth_identifier || "";
             const isDevice = method?.auth_type === "device";
-            const firstDevice = row.original.user_devices?.[0] as
-              | UserDeviceWithDeviceNo
-              | undefined;
+            const firstDevice = row.original.user_devices?.[0] as any;
             const deviceNo = firstDevice?.device_no;
             const deviceType = parseDeviceType(firstDevice?.user_agent || "");
             const display = isDevice ? deviceNo || identifier : identifier;
             return (
               <div className="flex items-center">
-                {/* <Badge
+               {/* <Badge
                   className="mr-1 uppercase"
                   title={method?.verified ? t("verified", "Verified") : ""}
                 >
                   {method?.auth_type}
                 </Badge>*/}
                 {deviceType && (
-                  <Badge className="mr-1" variant="secondary">
-                    {deviceType}
-                  </Badge>
+                    <Badge className="mr-1" variant="secondary">
+                      {deviceType}
+                    </Badge>
                 )}
                 <span title={isDevice ? display : undefined}>{display}</span>
                 <Popover>
                   <PopoverTrigger>
-                    <div className={"flex items-center"}>
-                      {row.original?.remark ? `（${row.original.remark}）` : ""}
-                      <FilePenLine className={"ml-2 text-primary"} size={14} />
+                    <div className={'flex items-center'}>
+                      {row.original?.remark ? `（${row.original.remark}）` : ''}
+                      <FilePenLine size={14} className={'text-primary ml-2'} />
                     </div>
                   </PopoverTrigger>
-                  <PopoverContent className={"w-64"}>
+                  <PopoverContent className={'w-64'}>
                     <RemarkForm
-                      initialRemark={row.original.remark}
-                      onSave={async (remark) => {
-                        const { data } = await getUserDetail({
-                          id: row.original.id,
-                        });
-                        const user = data.data;
-
-                        if (!user) {
-                          throw new Error("User detail not found");
-                        }
-
-                        await updateUserBasicInfo(
-                          buildUserBasicInfoPayload(user, remark)
-                        );
-                        toast.success(t("updateSuccess"));
-                        ref.current?.refresh();
-                      }}
+                        initialRemark={row.original.remark}
+                        CloseComponent={PopoverClose}
+                        onSave={async (remark) => {
+                          const {
+                            auth_methods: _auth_methods,
+                            user_devices: _user_devices,
+                            enable_balance_notify: _enable_balance_notify,
+                            enable_login_notify: _enable_login_notify,
+                            enable_subscribe_notify: _enable_subscribe_notify,
+                            enable_trade_notify: _enable_trade_notify,
+                            updated_at: _updated_at,
+                            created_at: _created_at,
+                            id,
+                            ...rest
+                          } = row.original;
+                          await updateUserBasicInfo({
+                            user_id: id,
+                            ...rest,
+                            remark,
+                          } as unknown as API.UpdateUserBasiceInfoRequest);
+                          toast.success(t('updateSuccess'));
+                          ref.current?.refresh();
+                        }}
                     />
                   </PopoverContent>
                 </Popover>
@@ -319,7 +355,7 @@ export default function User() {
             );
           },
         },
-        /* {
+       /* {
           id: "balance",
           accessorKey: "balance",
           header: t("balance", "Balance"),

apps/admin/src/sections/user/remark-form.test.tsx

@@ -1,85 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import {
-  cleanup,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from "@testing-library/react";
-import { Popover } from "@workspace/ui/components/popover";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { RemarkForm } from "./remark-form";
-
-afterEach(() => {
-  cleanup();
-});
-
-function renderRemarkForm(props: Parameters<typeof RemarkForm>[0]) {
-  return render(
-    <Popover open>
-      <RemarkForm {...props} />
-    </Popover>
-  );
-}
-
-describe("RemarkForm", () => {
-  it("submits an intentionally cleared remark", async () => {
-    const onSave = vi.fn<Parameters<typeof RemarkForm>[0]["onSave"]>();
-
-    renderRemarkForm({ initialRemark: "old remark", onSave });
-
-    fireEvent.change(screen.getByPlaceholderText("在此输入备注..."), {
-      target: { value: "" },
-    });
-    fireEvent.click(screen.getByRole("button", { name: "保存" }));
-
-    await waitFor(() => expect(onSave).toHaveBeenCalledWith(""));
-  });
-
-  it("shows loading and keeps the input disabled while saving", async () => {
-    let resolveSave: (() => void) | undefined;
-    const onSave = vi.fn(
-      () =>
-        new Promise<void>((resolve) => {
-          resolveSave = resolve;
-        })
-    );
-
-    renderRemarkForm({ initialRemark: "old remark", onSave });
-
-    fireEvent.click(screen.getByRole("button", { name: "保存" }));
-
-    expect(
-      screen.getByRole("button", { name: "保存中..." }).hasAttribute("disabled")
-    ).toBe(true);
-    expect(
-      screen.getByPlaceholderText("在此输入备注...").hasAttribute("disabled")
-    ).toBe(true);
-
-    resolveSave?.();
-    await waitFor(() =>
-      expect(
-        screen.getByRole("button", { name: "保存" }).hasAttribute("disabled")
-      ).toBe(false)
-    );
-  });
-
-  it("shows an error state and preserves input after save failure", async () => {
-    const onSave = vi.fn<Parameters<typeof RemarkForm>[0]["onSave"]>();
-    onSave.mockRejectedValue(new Error("failed"));
-
-    renderRemarkForm({ initialRemark: "old remark", onSave });
-
-    fireEvent.change(screen.getByPlaceholderText("在此输入备注..."), {
-      target: { value: "kept remark" },
-    });
-    fireEvent.click(screen.getByRole("button", { name: "保存" }));
-
-    expect((await screen.findByRole("alert")).textContent).toBe(
-      "备注保存失败，请重试"
-    );
-    expect(screen.getByDisplayValue("kept remark")).not.toBeNull();
-  });
-});

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

@@ -1,69 +0,0 @@
-import { Button } from "@workspace/ui/components/button";
-import { Input } from "@workspace/ui/components/input";
-import { PopoverClose } from "@workspace/ui/components/popover";
-import { useRef, useState } from "react";
-
-interface RemarkFormProps {
-  initialRemark?: string | null;
-  onSave: (remark: string) => Promise<void> | void;
-}
-
-export function RemarkForm({ onSave, initialRemark }: RemarkFormProps) {
-  const [remark, setRemark] = useState<string>(initialRemark ?? "");
-  const [saving, setSaving] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const closeRef = useRef<HTMLButtonElement>(null);
-
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setRemark(event.target.value);
-  };
-
-  const handleSave = async (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    setError(null);
-    setSaving(true);
-
-    try {
-      await onSave(remark);
-      closeRef.current?.click();
-    } catch {
-      setError("备注保存失败，请重试");
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  return (
-    <form onSubmit={handleSave}>
-      <div className="mb-2 font-semibold text-sm">备注</div>
-      <Input
-        aria-invalid={Boolean(error)}
-        className="w-full"
-        disabled={saving}
-        onChange={handleInputChange}
-        placeholder="在此输入备注..."
-        type="text"
-        value={remark}
-      />
-      {error ? (
-        <p className="mt-2 text-destructive text-sm" role="alert">
-          {error}
-        </p>
-      ) : null}
-      <Button
-        className="mt-2"
-        disabled={saving}
-        size="sm"
-        type="submit"
-        variant="default"
-      >
-        {saving ? "保存中..." : "保存"}
-      </Button>
-      <PopoverClose asChild>
-        <button className="sr-only" ref={closeRef} type="button">
-          关闭
-        </button>
-      </PopoverClose>
-    </form>
-  );
-}

apps/admin/src/sections/user/user-basic-info-payload.test.ts

@@ -1,53 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
-
-const user = {
-  id: 37,
-  avatar: "https://example.com/avatar.png",
-  balance: 1200,
-  commission: 300,
-  referral_percentage: 10,
-  only_first_purchase: true,
-  gift_amount: 500,
-  telegram: 123_456,
-  refer_code: "INVITE37",
-  referer_id: 7,
-  enable: true,
-  is_admin: false,
-  enable_balance_notify: true,
-  enable_login_notify: true,
-  enable_subscribe_notify: false,
-  enable_trade_notify: false,
-  user_group_id: 2,
-  group_locked: false,
-  auth_methods: [],
-  user_devices: [],
-  remark: "old remark",
-  rules: [],
-  created_at: 1_700_000_000,
-  updated_at: 1_700_000_100,
-} satisfies API.User;
-
-describe("buildUserBasicInfoPayload", () => {
-  it("keeps the full basic user fields when updating a remark", () => {
-    expect(buildUserBasicInfoPayload(user, "new remark")).toEqual({
-      user_id: 37,
-      avatar: "https://example.com/avatar.png",
-      balance: 1200,
-      commission: 300,
-      referral_percentage: 10,
-      only_first_purchase: true,
-      gift_amount: 500,
-      telegram: 123_456,
-      refer_code: "INVITE37",
-      referer_id: 7,
-      enable: true,
-      is_admin: false,
-      remark: "new remark",
-    });
-  });
-
-  it("preserves an intentionally cleared remark", () => {
-    expect(buildUserBasicInfoPayload(user, "").remark).toBe("");
-  });
-});

apps/admin/src/sections/user/user-basic-info-payload.ts

@@ -1,26 +0,0 @@
-import type { UpdateUserBasicInfoBody } from "@workspace/ui/services/admin/user";
-
-export type UserBasicInfoPayload = Omit<UpdateUserBasicInfoBody, "remark"> & {
-  remark: string;
-};
-
-export function buildUserBasicInfoPayload(
-  user: API.User,
-  remark: string
-): UserBasicInfoPayload {
-  return {
-    user_id: user.id,
-    avatar: user.avatar,
-    balance: user.balance,
-    commission: user.commission,
-    referral_percentage: user.referral_percentage,
-    only_first_purchase: user.only_first_purchase,
-    gift_amount: user.gift_amount,
-    telegram: user.telegram,
-    refer_code: user.refer_code,
-    referer_id: user.referer_id,
-    enable: user.enable,
-    is_admin: user.is_admin ?? false,
-    remark,
-  };
-}

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

@@ -30,30 +30,13 @@ import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
 import { formatDate } from "@/utils/common";
 import { SubscriptionDetail } from "./subscription-detail";
-import {
-  SubscriptionForm,
-  type SubscriptionFormValues,
-} from "./subscription-form";
+import { SubscriptionForm } from "./subscription-form";
 
 interface SharedInfo {
   ownerUserId: number;
   familyId: number;
 }
 
-function toUserSubscribePayload(values: SubscriptionFormValues) {
-  return {
-    ...values,
-    expired_at: values.expired_at || 0,
-    subscribe_id: values.subscribe_id || 0,
-    traffic: values.traffic || 0,
-    upload: values.upload || 0,
-    download: values.download || 0,
-    speed_limit: values.speed_limit || 0,
-    device_limit: values.device_limit || 0,
-    traffic_limit: values.traffic_limit || [],
-  };
-}
-
 export default function UserSubscription({ userId }: { userId: number }) {
   const { t } = useTranslation("user");
   const [loading, setLoading] = useState(false);
@@ -183,7 +166,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
                       await updateUserSubscribe({
                         user_id: Number(userId),
                         user_subscribe_id: row.id,
-                        ...toUserSubscribePayload(values),
+                        ...values,
                       });
                       toast.success(t("updateSuccess", "Updated successfully"));
                       ref.current?.refresh();
@@ -313,39 +296,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 effectiveSpeed = row.original.effective_speed ?? 0;
-              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>
-              );
+              const speed = row.original?.subscribe?.speed_limit;
+              return <Display type="trafficSpeed" value={speed} />;
             },
           },
           {
             accessorKey: "device_limit",
             header: t("deviceLimit", "Device Limit"),
             cell: ({ row }) => {
-              const limit =
-                row.original.device_limit ||
-                row.original?.subscribe?.device_limit;
+              const limit = row.original?.subscribe?.device_limit;
               return <Display type="number" unlimited value={limit} />;
             },
           },
@@ -393,7 +352,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
                 setLoading(true);
                 await createUserSubscribe({
                   user_id: Number(userId),
-                  ...toUserSubscribePayload(values),
+                  ...values,
                 });
                 toast.success(t("createSuccess", "Created successfully"));
                 ref.current?.refresh();

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,7 +16,7 @@ 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";
@@ -27,81 +26,20 @@ import { formatDate } from "@/utils/common";
 function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
   const { t } = useTranslation("user");
   const [detail, setDetail] = useState<API.UserSubscribeDetail | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
-  const [isError, setIsError] = useState(false);
 
   useEffect(() => {
-    let ignore = false;
-
-    setIsLoading(true);
-    setIsError(false);
-    getUserSubscribeById({ id: subscriptionId })
-      .then(({ data }) => {
-        if (!ignore) setDetail(data.data || null);
-      })
-      .catch(() => {
-        if (!ignore) {
-          setDetail(null);
-          setIsError(true);
-        }
-      })
-      .finally(() => {
-        if (!ignore) setIsLoading(false);
-      });
-
-    return () => {
-      ignore = true;
-    };
+    getUserSubscribeById({ id: subscriptionId }).then(({ data }) => {
+      if (data.data) setDetail(data.data);
+    });
   }, [subscriptionId]);
 
-  if (isLoading) {
-    return (
-      <div className="mb-4 rounded-lg border bg-muted/30 p-3">
-        <Skeleton className="mb-3 h-5 w-40" />
-        <div className="grid grid-cols-2 gap-3">
-          <Skeleton className="h-16" />
-          <Skeleton className="h-16" />
-        </div>
-      </div>
-    );
-  }
-
-  if (isError) {
-    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">
-        <AlertCircle className="mt-0.5 h-4 w-4 shrink-0" />
-        <span>
-          {t("subscriptionDetailLoadFailed", "Failed to load speed settings.")}
-        </span>
-      </div>
-    );
-  }
-
-  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.")}
-      </div>
-    );
-  }
-
-  if (detail.status !== 1) return null;
+  if (!detail || 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 hasLimitConfig =
-    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>
-    );
-  }
+  if (baseSpeed === 0 && !isThrottled) return null;
 
   return (
     <div
@@ -116,7 +54,7 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
       ) : (
         <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="space-y-1">
         <div className="flex flex-wrap items-center gap-2 font-medium">
           {isThrottled ? (
             <>
@@ -126,7 +64,6 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
               </Badge>
               {baseSpeed > 0 && (
                 <span className="text-muted-foreground text-xs line-through">
-                  {t("subscriptionDefault", "Subscription Default")}:{" "}
                   {baseSpeed} Mbps
                 </span>
               )}
@@ -144,20 +81,6 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
             </>
           )}
         </div>
-        <div className="grid gap-2 sm:grid-cols-3">
-          <SpeedMetric
-            label={t("subscriptionDefault", "Subscription Default")}
-            value={baseSpeed}
-          />
-          <SpeedMetric
-            label={t("userOverride", "User Override")}
-            value={userSpeed}
-          />
-          <SpeedMetric
-            label={t("effectiveSpeed", "Effective Speed")}
-            value={effectiveSpeed}
-          />
-        </div>
         {isThrottled && detail.throttle_rule && (
           <p className="text-muted-foreground text-xs">
             {detail.throttle_rule}
@@ -169,46 +92,6 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
             {formatDate(detail.throttle_end)}
           </p>
         )}
-        {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>
-  );
-}
-
-function SpeedMetric({ label, value }: { label: string; value: number }) {
-  const { t } = useTranslation("user");
-
-  return (
-    <div className="rounded-md border bg-background/60 p-2">
-      <div className="text-muted-foreground text-xs">{label}</div>
-      <div className="font-medium text-foreground">
-        {value > 0 ? `${value} Mbps` : t("unlimited", "Unlimited")}
       </div>
     </div>
   );
@@ -272,7 +155,12 @@ export function SubscriptionDetail({
                 accessorKey: "enabled",
                 header: t("enable", "Enable"),
                 cell: ({ row }) => (
-                  <Switch checked={row.getValue("enabled")} disabled />
+                  <Switch
+                    checked={row.getValue("enabled")}
+                    onChange={(checked) => {
+                      console.log("Switch:", checked);
+                    }}
+                  />
                 ),
               },
               { accessorKey: "id", header: "ID" },

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

@@ -3,7 +3,6 @@ import { Button } from "@workspace/ui/components/button";
 import {
   Form,
   FormControl,
-  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -20,11 +19,10 @@ import {
 } from "@workspace/ui/components/sheet";
 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";
@@ -35,50 +33,18 @@ interface Props {
   title: string;
   loading?: boolean;
   initialData?: API.UserSubscribe;
-  onSubmit: (values: SubscriptionFormValues) => Promise<boolean>;
+  onSubmit: (values: any) => Promise<boolean>;
 }
 
-type SubscriptionTrafficLimitRule = API.UserSubscribeTrafficLimitRule;
-
-const defaultLimitRule: SubscriptionTrafficLimitRule = {
-  stat_type: "day",
-  stat_value: 1,
-  traffic_usage: 0,
-  speed_limit: 0,
-};
-
 const formSchema = z.object({
   subscribe_id: z.number().optional(),
-  traffic: z.number().min(0).optional(),
-  speed_limit: z.number().min(0).optional(),
-  device_limit: z.number().min(0).optional(),
+  traffic: z.number().optional(),
+  speed_limit: z.number().optional(),
+  device_limit: z.number().optional(),
   expired_at: z.number().nullish().optional(),
-  upload: z.number().min(0).optional(),
-  download: z.number().min(0).optional(),
+  upload: z.number().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 };
-
-const normalizeLimitRule = (
-  item: SubscriptionTrafficLimitRule
-): SubscriptionTrafficLimitRule => ({
-  stat_type: item.stat_type || "day",
-  stat_value: Math.max(1, Math.floor(Number(item.stat_value) || 1)),
-  traffic_usage: Math.max(0, Number(item.traffic_usage) || 0),
-  speed_limit: Math.max(0, Number(item.speed_limit) || 0),
 });
 
 export function SubscriptionForm({
@@ -91,14 +57,11 @@ export function SubscriptionForm({
   const { t } = useTranslation("user");
   const [open, setOpen] = useState(false);
 
-  const form = useForm<SubscriptionFormValues>({
+  const form = useForm({
     resolver: zodResolver(formSchema),
     defaultValues: {
       subscribe_id: initialData?.subscribe_id || 0,
       traffic: initialData?.traffic || 0,
-      speed_limit: initialData?.speed_limit || 0,
-      device_limit: initialData?.device_limit || 0,
-      traffic_limit: initialData?.traffic_limit || [],
       upload: initialData?.upload || 0,
       download: initialData?.download || 0,
       expired_at: initialData?.expire_time || 0,
@@ -106,7 +69,7 @@ export function SubscriptionForm({
     },
   });
 
-  const handleSubmit = async (values: SubscriptionFormValues) => {
+  const handleSubmit = async (values: any) => {
     const success = await onSubmit(values);
     if (success) {
       setOpen(false);
@@ -172,7 +135,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder={t("unlimited", "Unlimited")}
                           type="number"
                           {...field}
@@ -192,56 +154,6 @@ export function SubscriptionForm({
                     </FormItem>
                   )}
                 />
-                <FormField
-                  control={form.control}
-                  name="speed_limit"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t("speedLimit", "Speed Limit")}</FormLabel>
-                      <FormControl>
-                        <EnhancedInput
-                          min={0}
-                          placeholder={t("unlimited", "Unlimited")}
-                          type="number"
-                          {...field}
-                          onValueChange={(value) => {
-                            form.setValue(field.name, value as number);
-                          }}
-                          suffix="Mbps"
-                        />
-                      </FormControl>
-                      <FormDescription>
-                        {t(
-                          "userSpeedLimitDescription",
-                          "Set to 0 to use the subscription default speed 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,7 +164,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder="0"
                           type="number"
                           {...field}
@@ -282,7 +193,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder="0"
                           type="number"
                           {...field}
@@ -302,119 +212,6 @@ export function SubscriptionForm({
                     </FormItem>
                   )}
                 />
-                <FormField
-                  control={form.control}
-                  name="traffic_limit"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        {t("trafficLimitRules", "Traffic Limit Rules")}
-                      </FormLabel>
-                      <FormControl>
-                        <ArrayInput<SubscriptionTrafficLimitRule>
-                          className="grid grid-cols-2 gap-3 lg:grid-cols-4"
-                          fields={[
-                            {
-                              name: "stat_type",
-                              type: "select",
-                              placeholder: t("statType", "Statistics Type"),
-                              value: "day",
-                              options: [
-                                {
-                                  label: t("statTypeHour", "Hour"),
-                                  value: "hour",
-                                },
-                                {
-                                  label: t("statTypeDay", "Day"),
-                                  value: "day",
-                                },
-                              ],
-                            },
-                            {
-                              name: "stat_value",
-                              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",
-                                "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",
-                              type: "number",
-                              placeholder: t(
-                                "speedLimitMbps",
-                                "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));
-                          }}
-                          value={
-                            field.value && field.value.length > 0
-                              ? field.value
-                              : [defaultLimitRule]
-                          }
-                        />
-                      </FormControl>
-                      <FormDescription>
-                        {t(
-                          "trafficLimitDescription",
-                          "Limit speed when usage reaches the configured amount in the selected time window."
-                        )}
-                      </FormDescription>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
                 <FormField
                   control={form.control}
                   name="expired_at"

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

@@ -40,13 +40,6 @@ import { Display } from "@/components/display";
 import { UserDetail } from "@/sections/user/user-detail";
 import { formatDate } from "@/utils/common";
 
-const WITHDRAWAL_METHOD_MAP: Record<number, string> = {
-  0: "其他",
-  1: "支付宝",
-  2: "微信",
-  3: "银行卡",
-};
-
 const rejectSchema = z.object({
   reason: z
     .string()
@@ -55,48 +48,11 @@ const rejectSchema = z.object({
     .max(500, "拒绝原因不能超过 500 个字符"),
 });
 
-function QrCodeCell({ url }: { url?: string }) {
-  const [zoomOpen, setZoomOpen] = useState(false);
-  if (!url) return <span>--</span>;
-  return (
-    <>
-      <button
-        className="block overflow-hidden rounded border"
-        onClick={() => setZoomOpen(true)}
-        type="button"
-      >
-        <img
-          alt="收款码"
-          className="h-12 w-12 cursor-zoom-in object-cover"
-          height={48}
-          src={url}
-          width={48}
-        />
-      </button>
-      {zoomOpen && (
-        <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
-          <DialogContent className="max-w-sm">
-            <img
-              alt="收款码"
-              className="w-full"
-              height={320}
-              src={url}
-              width={320}
-            />
-          </DialogContent>
-        </Dialog>
-      )}
-    </>
-  );
-}
-
 export default function WithdrawalPage() {
   const { t } = useTranslation("user");
   const ref = useRef<ProTableActions>(null);
   const [rejectOpen, setRejectOpen] = useState(false);
-  const [currentRow, setCurrentRow] = useState<API.AdminWithdrawalLog | null>(
-    null
-  );
+  const [currentRow, setCurrentRow] = useState<API.WithdrawalLog | null>(null);
   const form = useForm<z.infer<typeof rejectSchema>>({
     resolver: zodResolver(rejectSchema),
     defaultValues: {
@@ -137,14 +93,6 @@ export default function WithdrawalPage() {
     { value: "0", label: "审核中" },
     { value: "1", label: "已通过" },
     { value: "2", label: "已拒绝" },
-    { value: "3", label: "已取消" },
-  ];
-
-  const methodOptions = [
-    { value: "1", label: "支付宝" },
-    { value: "2", label: "微信" },
-    { value: "3", label: "银行卡" },
-    { value: "0", label: "其他" },
   ];
 
   const statusMap: Record<number, { label: string; className: string }> = {
@@ -160,18 +108,11 @@ export default function WithdrawalPage() {
       label: "已拒绝",
       className: "bg-rose-100 text-rose-700 border-rose-200",
     },
-    3: {
-      label: "已取消",
-      className: "bg-gray-100 text-gray-500 border-gray-200",
-    },
   };
 
   return (
     <>
-      <ProTable<
-        API.AdminWithdrawalLog,
-        { status?: string; user_id?: string; method?: string }
-      >
+      <ProTable<API.WithdrawalLog, { status?: string; user_id?: string }>
         action={ref}
         actions={{
           render: (row) => {
@@ -228,31 +169,11 @@ export default function WithdrawalPage() {
               <Display type="currency" value={row.original.amount} />
             ),
           },
-          {
-            accessorKey: "method",
-            header: "收款方式",
-            cell: ({ row }) =>
-              WITHDRAWAL_METHOD_MAP[row.original.method] ?? "--",
-          },
-          {
-            accessorKey: "account",
-            header: "收款账号",
-            cell: ({ row }) => (
-              <div className="max-w-[200px] break-all text-sm">
-                {row.original.account || "--"}
-              </div>
-            ),
-          },
-          {
-            accessorKey: "qr_code_url",
-            header: "收款码",
-            cell: ({ row }) => <QrCodeCell url={row.original.qr_code_url} />,
-          },
           {
             accessorKey: "content",
-            header: "备注",
+            header: "收款信息",
             cell: ({ row }) => (
-              <div className="max-w-[200px] break-all text-sm">
+              <div className="max-w-[360px] break-all text-sm">
                 {row.original.content || "--"}
               </div>
             ),
@@ -295,11 +216,6 @@ export default function WithdrawalPage() {
             options: statusOptions,
             placeholder: "状态",
           },
-          {
-            key: "method",
-            options: methodOptions,
-            placeholder: "收款方式",
-          },
           {
             key: "user_id",
             placeholder: "用户 ID",
@@ -310,7 +226,6 @@ export default function WithdrawalPage() {
             page: pagination.page,
             size: pagination.size,
             status: filter.status ? Number(filter.status) : undefined,
-            method: filter.method ? Number(filter.method) : undefined,
             user_id: filter.user_id ? Number(filter.user_id) : undefined,
           });
 

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/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/auth/local-captcha.tsx

@@ -2,12 +2,7 @@ import { Button } from "@workspace/ui/components/button";
 import { Input } from "@workspace/ui/components/input";
 import { Icon } from "@workspace/ui/composed/icon";
 import { generateCaptcha } from "@workspace/ui/services/common/auth";
-import {
-  type RefObject,
-  useEffect,
-  useImperativeHandle,
-  useState,
-} from "react";
+import { useEffect, useImperativeHandle, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 export interface LocalCaptchaRef {

apps/user/src/sections/auth/slider-captcha.tsx

@@ -10,13 +10,7 @@ import {
   generateCaptcha,
   verifyCaptchaSlider,
 } from "@workspace/ui/services/common/auth";
-import {
-  type RefObject,
-  useCallback,
-  useImperativeHandle,
-  useRef,
-  useState,
-} from "react";
+import { useCallback, useImperativeHandle, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 export interface SliderCaptchaRef {

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) => ({
-          ...prev,
-          message: error instanceof Error ? error.message : prev.message,
-        }));
+        console.log(error);
       }
     });
   }, [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>(
-    undefined
-  );
-  const selectedDiscount = subscribe?.discount?.find(
-    (item) => item.quantity === params.quantity
-  );
+  const lastSuccessOrderRef = useRef<any>(null);
 
   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/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { Button } from "@workspace/ui/components/button";
 import {
   Card,
@@ -28,29 +28,18 @@ import {
   FormMessage,
 } from "@workspace/ui/components/form";
 import { Input } from "@workspace/ui/components/input";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@workspace/ui/components/select";
 import { Textarea } from "@workspace/ui/components/textarea";
-import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
 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,
   queryUserAffiliate,
   queryUserAffiliateList,
   queryWithdrawalLog,
-  uploadFile,
-  withdrawalCancel,
 } from "@workspace/ui/services/user/user";
 import { formatDate } from "@workspace/ui/utils/formatting";
 import { unitConversion } from "@workspace/ui/utils/unit-conversions";
-import { Copy, X } from "lucide-react";
+import { Copy } from "lucide-react";
 import { useRef, useState, useTransition } from "react";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import { useForm } from "react-hook-form";
@@ -60,17 +49,6 @@ import { z } from "zod";
 import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
 
-const WITHDRAWAL_METHODS = [
-  { value: 1, label: "支付宝" },
-  { value: 2, label: "微信" },
-  { value: 3, label: "银行卡" },
-  { value: 0, label: "其他" },
-] as const;
-
-function getWithdrawalMethodLabel(method: number): string {
-  return WITHDRAWAL_METHODS.find((m) => m.value === method)?.label ?? "未知";
-}
-
 function getWithdrawalStatusMeta(
   status: number,
   t: ReturnType<typeof useTranslation<"affiliate">>["t"]
@@ -86,11 +64,6 @@ function getWithdrawalStatusMeta(
         label: t("withdrawal.status.rejected", "Rejected"),
         className: "bg-destructive/10 text-destructive",
       };
-    case 3:
-      return {
-        label: t("withdrawal.status.cancelled", "Cancelled"),
-        className: "bg-muted text-muted-foreground",
-      };
     default:
       return {
         label: t("withdrawal.status.pending", "Pending"),
@@ -99,83 +72,11 @@ function getWithdrawalStatusMeta(
   }
 }
 
-function QrCodeView({ url }: { url: string }) {
-  const [zoomOpen, setZoomOpen] = useState(false);
-  return (
-    <>
-      <button
-        className="block overflow-hidden rounded border"
-        onClick={() => setZoomOpen(true)}
-        type="button"
-      >
-        <img
-          alt="收款码"
-          className="h-16 w-16 cursor-zoom-in object-cover"
-          src={url}
-        />
-      </button>
-      {zoomOpen && (
-        <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
-          <DialogContent className="max-w-sm">
-            <img alt="收款码" className="w-full" src={url} />
-          </DialogContent>
-        </Dialog>
-      )}
-    </>
-  );
-}
-
-const withdrawalFormSchema = z
-  .object({
-    amount: z.number(),
-    method: z.number(),
-    account: z.string().trim().max(200).optional(),
-    qr_code_url: z.string().optional(),
-    content: z.string().trim().max(1000).optional(),
-  })
-  .superRefine((data, ctx) => {
-    if (!data.amount || data.amount <= 0) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "提现金额必须大于 0",
-        path: ["amount"],
-      });
-    }
-    if (data.method === 1 || data.method === 2) {
-      if (!data.qr_code_url) {
-        ctx.addIssue({
-          code: z.ZodIssueCode.custom,
-          message: "请上传收款码",
-          path: ["qr_code_url"],
-        });
-      }
-    } else if (data.method === 3) {
-      if (!data.account) {
-        ctx.addIssue({
-          code: z.ZodIssueCode.custom,
-          message: "银行卡收款账号为必填",
-          path: ["account"],
-        });
-      }
-    } else if (data.method === 0) {
-      if (!data.account && !data.content) {
-        ctx.addIssue({
-          code: z.ZodIssueCode.custom,
-          message: "收款账号和备注至少填一项",
-          path: ["account"],
-        });
-      }
-    }
-  });
-
-type WithdrawalFormValues = z.infer<typeof withdrawalFormSchema>;
-
 export default function Affiliate() {
   const { t } = useTranslation("affiliate");
   const { user, common, getUserInfo } = useGlobalStore();
   const [withdrawalOpen, setWithdrawalOpen] = useState(false);
   const [submitting, startTransition] = useTransition();
-  const [qrUploading, setQrUploading] = useState(false);
   const withdrawalListActionRef = useRef<ProListActions | undefined>(undefined);
 
   const affiliateQuery = useQuery({
@@ -188,69 +89,51 @@ export default function Affiliate() {
   const availableCommission = Number(
     user?.commission ?? affiliateQuery.data?.total_commission ?? 0
   );
-
-  const withdrawalForm = useForm<WithdrawalFormValues>({
+  const withdrawalFormSchema = z.object({
+    amount: z
+      .number()
+      .int(t("withdrawal.validation.amountInvalid", "Amount is invalid"))
+      .positive(
+        t(
+          "withdrawal.validation.amountPositive",
+          "Amount must be greater than 0"
+        )
+      )
+      .max(
+        availableCommission,
+        t(
+          "withdrawal.validation.amountExceeded",
+          "Amount cannot exceed available commission"
+        )
+      ),
+    content: z
+      .string()
+      .trim()
+      .min(
+        1,
+        t(
+          "withdrawal.validation.contentRequired",
+          "Withdrawal info is required"
+        )
+      )
+      .max(
+        1000,
+        t("withdrawal.validation.contentTooLong", "Withdrawal info is too long")
+      ),
+  });
+  const withdrawalForm = useForm<z.infer<typeof withdrawalFormSchema>>({
     resolver: zodResolver(withdrawalFormSchema),
     defaultValues: {
       amount: 0,
-      method: 1,
-      account: "",
-      qr_code_url: "",
       content: "",
     },
   });
 
-  const watchedMethod = withdrawalForm.watch("method");
-  const watchedQrCodeUrl = withdrawalForm.watch("qr_code_url");
-
-  const handleQrUpload = async (file: string | File) => {
-    if (!(file instanceof File)) return;
-    setQrUploading(true);
-    try {
-      const formData = new FormData();
-      formData.append("file", file);
-      formData.append("biz_type", "withdrawal_qrcode");
-      const response = await uploadFile(formData);
-      const uploadedUrl =
-        response.data.data?.url || response.data.data?.key || "";
-      withdrawalForm.setValue("qr_code_url", uploadedUrl);
-      withdrawalForm.clearErrors("qr_code_url");
-    } catch {
-      toast.error("收款码上传失败，请重试");
-    } finally {
-      setQrUploading(false);
-    }
-  };
-
-  const cancelMutation = useMutation({
-    mutationFn: async (withdrawalId: number) =>
-      withdrawalCancel({ withdrawal_id: withdrawalId }),
-    onSuccess: () => {
-      toast.success("提现申请已取消");
-      withdrawalListActionRef.current?.refresh();
-    },
-    onError: () => {
-      toast.error("取消失败，请重试");
-    },
-  });
-
-  const submitWithdrawal = (values: WithdrawalFormValues) => {
-    if (values.amount > availableCommission) {
-      withdrawalForm.setError("amount", {
-        message: t(
-          "withdrawal.validation.amountExceeded",
-          "Amount cannot exceed available commission"
-        ),
-      });
-      return;
-    }
+  const submitWithdrawal = (values: z.infer<typeof withdrawalFormSchema>) => {
     startTransition(async () => {
       await commissionWithdraw({
         amount: values.amount,
-        method: values.method,
-        account: values.account || undefined,
-        qr_code_url: values.qr_code_url || undefined,
-        content: values.content || undefined,
+        content: values.content.trim(),
       });
       toast.success(
         t("withdrawal.submitSuccess", "Withdrawal request submitted")
@@ -263,9 +146,6 @@ export default function Affiliate() {
       setWithdrawalOpen(false);
       withdrawalForm.reset({
         amount: 0,
-        method: 1,
-        account: "",
-        qr_code_url: "",
         content: "",
       });
     });
@@ -312,7 +192,7 @@ export default function Affiliate() {
                     {t("withdrawal.apply", "Apply for Withdrawal")}
                   </Button>
                 </DialogTrigger>
-                <DialogContent className="max-h-[90vh] overflow-y-auto">
+                <DialogContent>
                   <DialogHeader>
                     <DialogTitle>
                       {t("withdrawal.applyTitle", "Apply for Withdrawal")}
@@ -376,130 +256,21 @@ export default function Affiliate() {
                           </FormItem>
                         )}
                       />
-
-                      <FormField
-                        control={withdrawalForm.control}
-                        name="method"
-                        render={({ field }) => (
-                          <FormItem>
-                            <FormLabel>收款方式</FormLabel>
-                            <Select
-                              onValueChange={(val) => {
-                                field.onChange(Number(val));
-                                withdrawalForm.setValue("qr_code_url", "");
-                                withdrawalForm.setValue("account", "");
-                                withdrawalForm.clearErrors();
-                              }}
-                              value={String(field.value)}
-                            >
-                              <FormControl>
-                                <SelectTrigger>
-                                  <SelectValue placeholder="请选择收款方式" />
-                                </SelectTrigger>
-                              </FormControl>
-                              <SelectContent>
-                                {WITHDRAWAL_METHODS.map((m) => (
-                                  <SelectItem
-                                    key={m.value}
-                                    value={String(m.value)}
-                                  >
-                                    {m.label}
-                                  </SelectItem>
-                                ))}
-                              </SelectContent>
-                            </Select>
-                            <FormMessage />
-                          </FormItem>
-                        )}
-                      />
-
-                      {(watchedMethod === 1 || watchedMethod === 2) && (
-                        <FormField
-                          control={withdrawalForm.control}
-                          name="qr_code_url"
-                          render={() => (
-                            <FormItem>
-                              <FormLabel>
-                                收款码
-                                <span className="ml-1 text-destructive">
-                                  *
-                                </span>
-                              </FormLabel>
-                              {watchedQrCodeUrl ? (
-                                <div className="relative inline-block">
-                                  <QrCodeView url={watchedQrCodeUrl} />
-                                  <button
-                                    className="-top-2 -right-2 absolute flex h-5 w-5 items-center justify-center rounded-full bg-destructive text-destructive-foreground"
-                                    onClick={() =>
-                                      withdrawalForm.setValue("qr_code_url", "")
-                                    }
-                                    type="button"
-                                  >
-                                    <X className="h-3 w-3" />
-                                  </button>
-                                </div>
-                              ) : (
-                                <UploadImage
-                                  className="h-24 w-24"
-                                  id="qr-code-upload"
-                                  onChange={handleQrUpload}
-                                  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 ? "上传中..." : "点击上传\n收款码"}
-                                  </div>
-                                </UploadImage>
-                              )}
-                              <FormMessage />
-                            </FormItem>
-                          )}
-                        />
-                      )}
-
-                      {(watchedMethod === 3 || watchedMethod === 0) && (
-                        <FormField
-                          control={withdrawalForm.control}
-                          name="account"
-                          render={({ field }) => (
-                            <FormItem>
-                              <FormLabel>
-                                收款账号
-                                {watchedMethod === 3 && (
-                                  <span className="ml-1 text-destructive">
-                                    *
-                                  </span>
-                                )}
-                              </FormLabel>
-                              <FormControl>
-                                <Input
-                                  placeholder={
-                                    watchedMethod === 3
-                                      ? "请输入银行卡号或账户信息"
-                                      : "请输入收款账号（与备注至少填一项）"
-                                  }
-                                  {...field}
-                                />
-                              </FormControl>
-                              <FormMessage />
-                            </FormItem>
-                          )}
-                        />
-                      )}
-
                       <FormField
                         control={withdrawalForm.control}
                         name="content"
                         render={({ field }) => (
                           <FormItem>
-                            <FormLabel>备注</FormLabel>
+                            <FormLabel>
+                              {t("withdrawal.content", "Payout Information")}
+                            </FormLabel>
                             <FormControl>
                               <Textarea
-                                placeholder={
-                                  watchedMethod === 0
-                                    ? "备注（与账号至少填一项）"
-                                    : "备注（可选）"
-                                }
-                                rows={3}
+                                placeholder={t(
+                                  "withdrawal.contentPlaceholder",
+                                  "Bank account, wallet address, recipient name, or other payout details"
+                                )}
+                                rows={4}
                                 {...field}
                               />
                             </FormControl>
@@ -518,11 +289,7 @@ export default function Affiliate() {
                       {t("withdrawal.cancel", "Cancel")}
                     </Button>
                     <Button
-                      disabled={
-                        submitting ||
-                        qrUploading ||
-                        availableCommission <= 0
-                      }
+                      disabled={submitting || availableCommission <= 0}
                       form="withdrawal-form"
                       type="submit"
                     >
@@ -578,68 +345,28 @@ export default function Affiliate() {
                   <div className="font-semibold text-lg">
                     <Display type="currency" value={item.amount} />
                   </div>
-                  <div className="flex items-center gap-2">
-                    <span
-                      className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
-                    >
-                      {statusMeta.label}
-                    </span>
-                    {item.status === 0 && (
-                      <ConfirmButton
-                        cancelText="取消"
-                        confirmText="确认取消"
-                        description="取消后该提现申请将关闭，佣金不会退还。确定取消吗？"
-                        onConfirm={async () => {
-                          await cancelMutation.mutateAsync(item.id);
-                        }}
-                        title="取消提现申请"
-                        trigger={
-                          <Button
-                            disabled={cancelMutation.isPending}
-                            size="sm"
-                            variant="outline"
-                          >
-                            取消申请
-                          </Button>
-                        }
-                      />
-                    )}
-                  </div>
+                  <span
+                    className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
+                  >
+                    {statusMeta.label}
+                  </span>
                 </div>
                 <ul className="grid gap-3 md:grid-cols-2">
                   <li className="flex flex-col gap-1">
-                    <span className="text-muted-foreground">收款方式</span>
-                    <span>{getWithdrawalMethodLabel(item.method)}</span>
+                    <span className="text-muted-foreground">
+                      {t("withdrawal.record.content", "Payout Information")}
+                    </span>
+                    <span className="whitespace-pre-wrap break-words">
+                      {item.content}
+                    </span>
                   </li>
-                  {item.account && (
-                    <li className="flex flex-col gap-1">
-                      <span className="text-muted-foreground">收款账号</span>
-                      <span className="break-all">{item.account}</span>
-                    </li>
-                  )}
-                  {item.qr_code_url && (
-                    <li className="flex flex-col gap-1">
-                      <span className="text-muted-foreground">收款码</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 && (
+                  {item.reason ? (
                     <li className="flex flex-col gap-1 md:col-span-2">
                       <span className="text-muted-foreground">
                         {t("withdrawal.record.reason", "Reject Reason")}
@@ -648,7 +375,7 @@ export default function Affiliate() {
                         {item.reason}
                       </span>
                     </li>
-                  )}
+                  ) : null}
                 </ul>
               </CardContent>
             </Card>

apps/user/src/sections/user/profile/notify-settings.tsx

@@ -27,52 +27,23 @@ const FormSchema = z.object({
   enable_balance_notify: z.boolean(),
   enable_login_notify: z.boolean(),
   enable_subscribe_notify: z.boolean(),
-  enable_trade_notify: z.boolean(),
+  // enable_trade_notify: z.boolean(),
 });
 
-type NotifyFormValues = z.infer<typeof FormSchema>;
-
-const notificationFields = [
-  {
-    name: "enable_balance_notify",
-    labelKey: "notify.balanceChange",
-    fallbackLabel: "Balance Change",
-  },
-  {
-    name: "enable_login_notify",
-    labelKey: "notify.login",
-    fallbackLabel: "Login",
-  },
-  {
-    name: "enable_subscribe_notify",
-    labelKey: "notify.subscribe",
-    fallbackLabel: "Subscribe",
-  },
-  {
-    name: "enable_trade_notify",
-    labelKey: "notify.finance",
-    fallbackLabel: "Finance",
-  },
-] satisfies Array<{
-  name: keyof NotifyFormValues;
-  labelKey: string;
-  fallbackLabel: string;
-}>;
-
 export default function NotifySettings() {
   const { t } = useTranslation("profile");
   const { user, getUserInfo } = useGlobalStore();
-  const form = useForm<NotifyFormValues>({
+  const form = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
     defaultValues: {
       enable_balance_notify: user?.enable_balance_notify ?? false,
       enable_login_notify: user?.enable_login_notify ?? false,
       enable_subscribe_notify: user?.enable_subscribe_notify ?? false,
-      enable_trade_notify: user?.enable_trade_notify ?? false,
+      // enable_trade_notify: user?.enable_trade_notify ?? false,
     },
   });
 
-  async function onSubmit(data: NotifyFormValues) {
+  async function onSubmit(data: z.infer<typeof FormSchema>) {
     await updateUserNotify(data);
     toast.success(t("notify.updateSuccess", "Update Successful"));
     await getUserInfo();
@@ -96,15 +67,32 @@ export default function NotifySettings() {
             onSubmit={form.handleSubmit(onSubmit)}
           >
             <div className="space-y-4">
-              {notificationFields.map(({ fallbackLabel, labelKey, name }) => (
+              {[
+                {
+                  name: "enable_balance_notify",
+                  label: t("notify.balanceChange", "Balance Change"),
+                },
+                {
+                  name: "enable_login_notify",
+                  label: t("notify.login", "Login"),
+                },
+                {
+                  name: "enable_subscribe_notify",
+                  label: t("notify.subscribe", "Subscribe"),
+                },
+                // {
+                //   name: "enable_trade_notify",
+                //   label: t("notify.finance", "Finance"),
+                // },
+              ].map(({ name, label }) => (
                 <FormField
                   control={form.control}
                   key={name}
-                  name={name}
+                  name={name as any}
                   render={({ field }) => (
                     <FormItem className="flex items-center justify-between space-x-4">
                       <FormLabel className="text-muted-foreground">
-                        {t(labelKey, fallbackLabel)}
+                        {label}
                       </FormLabel>
                       <FormControl>
                         <Switch

packages/ui/src/composed/pro-table/pro-table.tsx

@@ -39,13 +39,7 @@ import { SortableRow } from "@workspace/ui/composed/pro-table/sortable-row";
 import { ProTableWrapper } from "@workspace/ui/composed/pro-table/wrapper";
 import { cn } from "@workspace/ui/lib/utils";
 import { useSize } from "ahooks";
-import {
-  CircleAlert,
-  GripVertical,
-  ListRestart,
-  Loader,
-  RefreshCcw,
-} from "lucide-react";
+import { GripVertical, ListRestart, Loader, RefreshCcw } from "lucide-react";
 import type React from "react";
 import {
   Fragment,
@@ -85,7 +79,6 @@ export interface ProTableProps<TData, TValue> {
     selectedRowsText: (total: number) => string;
   }>;
   empty?: React.ReactNode;
-  error?: React.ReactNode;
   onSort?: (
     sourceId: string | number,
     targetId: string | number | null,
@@ -111,7 +104,6 @@ export function ProTable<
   action,
   texts,
   empty,
-  error,
   onSort,
   initialFilters,
 }: ProTableProps<TData, TValue>) {
@@ -129,8 +121,6 @@ export function ProTable<
   const [rowSelection, setRowSelection] = useState({});
   const [data, setData] = useState<TData[]>([]);
   const [rowCount, setRowCount] = useState<number>(0);
-  const [isLoading, setIsLoading] = useState(false);
-  const [requestError, setRequestError] = useState(false);
   const [pagination, setPagination] = useState({
     pageIndex: 0,
     pageSize: 200,
@@ -203,8 +193,6 @@ export function ProTable<
   const fetchData = async () => {
     if (loading.current) return;
     loading.current = true;
-    setIsLoading(true);
-    setRequestError(false);
     try {
       const response = await request(
         {
@@ -217,13 +205,10 @@ export function ProTable<
       );
       setData(response.list);
       setRowCount(response.total);
-    } catch (_error) {
-      setData([]);
-      setRowCount(0);
-      setRequestError(true);
+    } catch (error) {
+      console.log("Fetch data error:", error);
     } finally {
       loading.current = false;
-      setIsLoading(false);
     }
   };
   const reset = async () => {
@@ -331,16 +316,7 @@ export function ProTable<
               ))}
             </TableHeader>
             <TableBody>
-              {requestError ? (
-                <TableRow>
-                  <TableCell
-                    className="py-12"
-                    colSpan={table.getAllLeafColumns().length}
-                  >
-                    {error || <ProTableErrorState />}
-                  </TableCell>
-                </TableRow>
-              ) : table.getRowModel()?.rows?.length ? (
+              {table.getRowModel()?.rows?.length ? (
                 onSort ? (
                   table.getRowModel().rows.map((row) => (
                     <SortableRow
@@ -395,10 +371,7 @@ export function ProTable<
                 )
               ) : (
                 <TableRow>
-                  <TableCell
-                    className="py-24"
-                    colSpan={table.getAllLeafColumns().length}
-                  >
+                  <TableCell className="py-24" colSpan={columns.length + 2}>
                     {empty || <Empty />}
                   </TableCell>
                 </TableRow>
@@ -407,12 +380,8 @@ export function ProTable<
           </Table>
         </ProTableWrapper>
 
-        {isLoading && (
-          <div
-            aria-label="Loading data"
-            className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80"
-            role="status"
-          >
+        {loading.current && (
+          <div className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80">
             <Loader className="h-4 w-4 animate-spin" />
           </div>
         )}
@@ -422,16 +391,6 @@ export function ProTable<
   );
 }
 
-function ProTableErrorState() {
-  return (
-    <Alert className="mx-auto max-w-md" variant="destructive">
-      <CircleAlert aria-hidden="true" />
-      <AlertTitle>Failed to load data</AlertTitle>
-      <AlertDescription>Refresh the table or try again later.</AlertDescription>
-    </Alert>
-  );
-}
-
 function createSelectColumn<TData, TValue>(): ColumnDef<TData, TValue> {
   return {
     id: "selected",

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/invite.ts

@@ -1,19 +0,0 @@
-/* eslint-disable */
-import request from "@workspace/ui/lib/request";
-
-/** Get global invite list GET /v1/admin/invite/list */
-export async function getAdminInviteList(
-  params: API.GetAdminInviteListParams,
-  options?: Record<string, unknown>
-) {
-  return request<API.Response & { data?: API.GetAdminInviteListResponse }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/invite/list`,
-    {
-      method: "GET",
-      params: {
-        ...params,
-      },
-      ...(options || {}),
-    }
-  );
-}

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

@@ -28,6 +28,21 @@ declare namespace API {
     updated_at: number;
   };
 
+  type AdminWithdrawalLog = {
+    id: number;
+    user_id: number;
+    amount: number;
+    content: string;
+    status: number;
+    reason?: string;
+    created_at: number;
+    updated_at: number;
+  };
+
+  type ApproveWithdrawalRequest = {
+    withdrawal_id: number;
+  };
+
   type AnyTLS = {
     port: number;
     security_config: SecurityConfig;
@@ -71,6 +86,18 @@ declare namespace API {
     is_default: boolean;
   };
 
+  type GetWithdrawalListParams = {
+    page: number;
+    size: number;
+    user_id?: number;
+    status?: number;
+  };
+
+  type GetWithdrawalListResponse = {
+    list: AdminWithdrawalLog[];
+    total: number;
+  };
+
   type AppUserSubcbribe = {
     id: number;
     name: string;
@@ -272,76 +299,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;
@@ -468,9 +425,6 @@ declare namespace API {
     expired_at: number;
     traffic: number;
     subscribe_id: number;
-    speed_limit?: number;
-    device_limit?: number;
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
   };
 
   type CurrencyConfig = {
@@ -999,61 +953,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;
   };
@@ -1291,7 +1190,6 @@ declare namespace API {
     size: number;
     user_id?: number;
     status?: number;
-    method?: number;
   };
 
   type GetWithdrawalListResponse = {
@@ -1903,6 +1801,11 @@ declare namespace API {
     total: number;
   };
 
+  type RejectWithdrawalRequest = {
+    withdrawal_id: number;
+    reason: string;
+  };
+
   type QuotaTask = {
     id: number;
     subscribers: number[];
@@ -2226,13 +2129,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,16 +2459,12 @@ declare namespace API {
   };
 
   type UpdateUserSubscribeRequest = {
-    user_id?: number;
     user_subscribe_id: number;
     subscribe_id: number;
     traffic: number;
     expired_at: number;
     upload: number;
     download: number;
-    speed_limit?: number;
-    device_limit?: number;
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
   };
 
   type User = {
@@ -2663,12 +2555,6 @@ declare namespace API {
     traffic: 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 +2564,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;
@@ -2698,9 +2577,6 @@ declare namespace API {
     traffic: number;
     download: number;
     upload: number;
-    speed_limit?: number;
-    device_limit?: number;
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
     token: string;
     status: number;
     effective_speed: number;
@@ -2897,35 +2773,6 @@ declare namespace API {
     list: AdminInvitedUser[];
   };
 
-  type GetAdminInviteListParams = {
-    page: number;
-    size: number;
-    search?: string;
-    inviter_id?: number;
-    invitee_id?: number;
-  };
-
-  type AdminInviteRelation = {
-    id?: string;
-    inviter_id: number;
-    inviter_identifier: string;
-    invitee_id: number;
-    invitee_identifier: string;
-    invitee_avatar: string;
-    invitee_enable: boolean;
-    invited_at: number;
-    order_count: number;
-    has_purchased: boolean;
-    inviter_commission: number;
-    inviter_gift_days: number;
-    invitee_gift_days: number;
-  };
-
-  type GetAdminInviteListResponse = {
-    total: number;
-    list: AdminInviteRelation[];
-  };
-
   type ActivateOrderRequest = {
     order_no: string;
   };
@@ -3282,15 +3129,10 @@ declare namespace API {
     id: number;
     user_id: number;
     amount: number;
-    method: number;
-    account?: string;
-    qr_code_url?: string;
-    content?: string;
+    content: string;
     status: number;
     reason?: string;
     created_at: number;
     updated_at: number;
   };
-
-  type AdminWithdrawalLog = WithdrawalLog;
 }

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

@@ -1,14 +1,6 @@
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 
-export type UpdateUserBasicInfoBody = Omit<
-  API.UpdateUserBasiceInfoRequest,
-  "password"
-> & {
-  password?: string;
-  remark?: string;
-};
-
 /** Create user POST /v1/admin/user/ */
 export async function createUser(
   body: API.CreateUserRequest,
@@ -112,7 +104,7 @@ export async function deleteUserAuthMethod(
 
 /** Update user basic info PUT /v1/admin/user/basic */
 export async function updateUserBasicInfo(
-  body: UpdateUserBasicInfoBody,
+  body: API.UpdateUserBasiceInfoRequest,
   options?: { [key: string]: any }
 ) {
   return request<API.Response & { data?: any }>(

packages/ui/src/services/common/oauth.ts

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

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/announcement.ts

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

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

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

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

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

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

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

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

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

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

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

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

@@ -172,14 +172,7 @@ declare namespace API {
 
   type CommissionWithdrawRequest = {
     amount: number;
-    method: number;
-    account?: string;
-    qr_code_url?: string;
-    content?: string;
-  };
-
-  type WithdrawalCancelRequest = {
-    withdrawal_id: number;
+    content: string;
   };
 
   type Coupon = {
@@ -548,7 +541,6 @@ declare namespace API {
     price: number;
     amount: number;
     discount: number;
-    promo_discount: number;
     gift_amount: number;
     coupon: string;
     coupon_discount: number;
@@ -1020,14 +1012,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 = {
@@ -1312,10 +1296,7 @@ declare namespace API {
     id: number;
     user_id: number;
     amount: number;
-    method: number;
-    account?: string;
-    qr_code_url?: string;
-    content?: string;
+    content: string;
     status: number;
     reason?: string;
     created_at: number;

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

@@ -470,36 +470,3 @@ export async function queryWithdrawalLog(
     }
   );
 }
-
-/** Cancel Withdrawal POST /v1/public/user/withdrawal_cancel */
-export async function withdrawalCancel(
-  body: API.WithdrawalCancelRequest,
-  options?: { [key: string]: any }
-) {
-  return request<API.Response & { data?: any }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/public/user/withdrawal_cancel`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      data: body,
-      ...(options || {}),
-    }
-  );
-}
-
-/** Upload File POST /v1/public/file/upload */
-export async function uploadFile(
-  formData: FormData,
-  options?: { [key: string]: any }
-) {
-  return request<API.Response & { data?: { url: string; key: string } }>(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/public/file/upload`,
-    {
-      method: "POST",
-      data: formData,
-      ...(options || {}),
-    }
-  );
-}