Compare commits

..

15 Commits

Author SHA1 Message Date
shanshanzhong147 497f654cdf feat(抽奖): 人工发放(crypto)奖品去掉金额/币种/网络/领奖窗口配置 + 重建 dist.zip
PR Check / Lint, Check, Test and Build (push) Has been cancelled
人工奖只留 名称+图标+概率+库存;中奖凭截图联系客服线下发放,无需 in-app 领奖表单。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 06:48:46 -07:00
shanshanzhong147 a98c7ecb52 fix(抽奖): 数字输入改 text 类型(时长/概率/库存/领奖窗口/发放次数)+ 重建 dist.zip
PR Check / Lint, Check, Test and Build (push) Has been cancelled
避开 EnhancedInput 在 type=number 下 min/max 实时钳制导致的"输入0/改数字跳变",
用 formatOutput 转 number,后端仍收 int。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 06:26:54 -07:00
shanshanzhong147 0d79e9a6fd chore(抽奖): crypto 显示名改「人工发放」+ 重建 dist.zip
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 02:09:19 -07:00
shanshanzhong147 93d4091254 feat(抽奖): 奖品类型精简为 免费时长+虚拟货币(人工发放)+谢谢参与;重建 dist.zip
PR Check / Lint, Check, Test and Build (push) Has been cancelled
- prize-form 只保留 vpn_duration / crypto / none(去掉佣金/实物/人工其他)
- crypto 标签改「虚拟货币」
- 重新 vite build 并打包 apps/admin/dist.zip(部署产物,含全部抽奖新功能)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 01:38:55 -07:00
shanshanzhong147 fd94fb80c1 feat(抽奖): 活动删除按钮 + 格子数可选(8/9,默认8)
PR Check / Lint, Check, Test and Build (push) Has been cancelled
- 活动列表加"删除"(ConfirmButton→DELETE /activities/:id)
- activity-form 格子数选项 [8,9],新建默认 8(原来写死只有 9)
- service: deleteLotteryActivity;i18n 删除文案

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 00:19:03 -07:00
shanshanzhong147 ccb81d62a3 feat(抽奖): 后台"抽奖记录"页 — 中奖/发放流水列表
- draws-panel(新): ProTable 列出中奖人/奖品/发放状态/发放结果,按 是否中奖/发放状态/用户ID 过滤
- activity-detail: 新增"抽奖记录"Tab
- service+types: getLotteryDrawList + AdminLotteryDraw
- i18n: draw.* zh/en

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 00:19:03 -07:00
shanshanzhong147 6e1e424eb2 fix(抽奖): 概率按 weight/1000 显示与录入(支持小数%,总权重100000=100%)
- prize-grid: 概率预览/合计/卡片改用 weightToPercent(weight/1000),
  合计校验对齐 FULL_TOTAL_WEIGHT=100000;修正原来把原始 weight 当 % 显示(如 49901%)
- prize-form: 概率输入按百分比(0-100,step 0.001),提交 ×1000 存 weight,回填 ÷1000

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 00:19:03 -07:00
shanshanzhong147 a30d83505f feat(抽奖): 开放人工奖(crypto/physical/manual_other) + 领奖工单管理 + REST 对齐
- prize-form: 解禁 crypto/physical/manual_other 并加各自 config;权重改为中奖概率(%),
  合计校验;vpn_duration 加"无订阅时新建订阅套餐"
- prize-grid: 概率合计=100% 校验告警;卡片渲染真实 config(时长/金额)
- claims-panel(新): 领奖工单列表 + 审核通过/驳回/标记发放
- activity-detail: 新增"领奖工单"Tab
- service: 奖品改/删 id 走 /prizes/:id(对齐后端 REST);新增 claims 5 个接口 + 类型
- i18n: 补齐 zh-CN/en-US lottery 文案

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-17 00:19:03 -07:00
shanshanzhong147 01591adb86 feat: 后台抽奖活动管理(Stage 1)
- 服务层:12 个 /v1/admin/lottery 接口封装与 API 类型定义
- 活动列表:状态筛选、上架/暂停(带确认)、编辑、管理、发次数
- 奖品管理:3×3 九宫格可视化编辑、概率预览、保底奖警告、佣金元↔分转换、无限库存
- 规则设置:chance_sources 动态编辑,eligibility 简单/高级(JSON)双模式,本地 rulecaps 校验(深度≤8/节点≤64/≤8KB),Stage 1 未接线警示
- 手动发次数:自动生成幂等 source_ref
- 路由 /dashboard/lottery、Commerce 菜单项、en-US/zh-CN 双语文案
- 对接文档见 vpn/aaaa.txt(Stage 1)
2026-07-17 00:19:03 -07:00
kxswman 39bc0c5c7b Merge pull request 'Fix/52 首页用户管理交互调整' (#3) from fix/52-首页用户管理交互调整 into internal
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Reviewed-on: #3
2026-06-23 11:33:24 -04:00
shanshanzhong147 7505d37af6 修复(#52): 补齐首页与用户状态文案
PR Check / Lint, Check, Test and Build (pull_request) Has been cancelled
Dependabot Auto Merge / Dependabot Auto Merge (pull_request_target) Has been cancelled
2026-06-23 07:17:27 -07:00
shanshanzhong147 f9c3b18249 修复(#52): 调整首页与用户管理交互 2026-06-22 09:06:25 -07:00
shanshanzhong147 1834b97fe2 修复(#134): 促销前端展示对齐 (expires_at / billing 补 promo_discount / 类型补字段)
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Squash merge of fix/134-促销前端展示对齐 (4702dee).

HIF-79/HIF-113 落地后前端有三处对齐缺失:

- promo-info.tsx 仍读 promo.end_time,但后端 SubscribeDiscountPromo
  JSON 字段是 expires_at(×2 处)
- billing.tsx 缺 Promo Discount 行,PreOrderResponse 拿到 promo_discount
  时无处可渲染
- typings.d.ts: SubscribeDiscountPromo 缺 expires_at/rule_type,
  PreOrderResponse 缺 promo_discount

本次仅修字段对齐与展示行,不动业务逻辑、不动 OrderDetail 类型 (后端
当前未透出 promo_discount)。新增 billing.promoDiscount 中英文文案。
2026-06-02 20:27:54 -07:00
shanshanzhong147 23f51a1ef4 修复(#122): 合并促销价档位提交到测试环境
PR Check / Lint, Check, Test and Build (push) Has been cancelled
2026-05-29 04:15:40 -07:00
shanshanzhong147 c46944aae1 新功能(#113): 新增促销管理后台页面
PR Check / Lint, Check, Test and Build (push) Has been cancelled
2026-05-29 00:34:37 -07:00
25 changed files with 1662 additions and 575 deletions
Binary file not shown.
@@ -9,7 +9,9 @@
"createSuccess": "Create Success",
"detail": {
"prizesTab": "Prizes",
"rulesTab": "Rules"
"rulesTab": "Rules",
"claimsTab": "Claims",
"drawsTab": "Draw records"
},
"edit": "Edit",
"editActivity": "Edit Activity",
@@ -58,10 +60,21 @@
"amountYuan": "Commission Amount (CNY)",
"cancel": "Cancel",
"centerSlotHint": "Usually the draw button",
"claimTtlHint": "How long the user has to submit claim info. Default 168h (7 days).",
"claimTtlHours": "Claim window (hours)",
"claimTtlInvalid": "Claim window (hours) must be a positive integer",
"confirm": "Confirm",
"confirmDelete": "Delete",
"createSuccess": "Prize created",
"createTitle": "Add Prize",
"cryptoAmount": "Amount",
"cryptoAmountPlaceholder": "e.g. 0.01",
"cryptoAmountRequired": "Amount is required",
"cryptoCurrency": "Currency",
"cryptoCurrencyRequired": "Currency is required",
"cryptoNetworks": "Networks",
"cryptoNetworksHint": "Comma-separated. The user picks one of these when claiming.",
"cryptoNetworksRequired": "At least one network is required (comma-separated)",
"daysSuffix": "days",
"delete": "Delete",
"deleteDescription": "This prize will be removed from the grid. This action cannot be undone.",
@@ -70,13 +83,16 @@
"durationDays": "Duration (days)",
"durationDaysPlaceholder": "e.g. 1",
"durationDaysRequired": "Duration days must be a positive integer",
"durationSummary": "{{days}} days",
"editTitle": "Edit Prize",
"fallbackBadge": "Fallback",
"fallbackIgnoresWeight": "Fallback prize ignores weight",
"fallbackIgnoresWeight": "Fallback prize ignores probability (never randomly drawn)",
"hoursSuffix": "hours",
"iconUrl": "Icon URL",
"iconUrlInvalid": "Must be a valid URL",
"isFallback": "Fallback Prize",
"isFallbackHint": "Awarded when limited prizes are sold out",
"manualPrizeHint": "Manual prize: no extra config. When won, the user contacts customer service with a screenshot to redeem — no in-app claim form.",
"name": "Prize Name",
"namePlaceholder": "e.g. 1-Day Pass",
"nameRequired": "Name is required",
@@ -85,18 +101,25 @@
"noRandomPrizes": "No prizes participate in the random draw yet",
"noneHint": "No config needed. Consider enabling fallback so users always land on this prize when limited prizes run out.",
"probabilityPreview": "Probability Preview",
"probabilityTotal": "Total",
"selectType": "Select type",
"skuName": "Item name (optional)",
"skuNamePlaceholder": "e.g. Limited T-shirt",
"slotLabel": "Slot",
"soldOutBadge": "Sold Out",
"stage2Hint": "Available in Stage 2",
"stockShort": "Stock",
"subscribePlan": "New-subscription plan",
"subscribePlanHint": "When the user has no active subscription, create one on this plan and grant the duration. Leave empty to skip granting.",
"subscribePlanPlaceholder": "None — skip if user has no active subscription",
"totalNot100Hint": "The drawable prizes currently total {{total}}%. Adjust each prize's win probability so they sum to exactly 100%.",
"totalNot100Title": "Probabilities must total 100%",
"totalStock": "Total Stock",
"totalStockPlaceholder": "e.g. 100",
"totalStockRequired": "Total stock must be a positive integer",
"type": "Prize Type",
"typeCommission": "Commission",
"typeCoupon": "Coupon",
"typeCrypto": "Crypto",
"typeCrypto": "Manual Grant",
"typeManualOther": "Manual (Other)",
"typeNone": "No Prize (Thanks)",
"typePhysical": "Physical",
@@ -104,11 +127,12 @@
"typeVpnDuration": "VPN Duration",
"unlimitedStock": "Unlimited Stock",
"updateSuccess": "Prize updated",
"weight": "Weight",
"weightHint": "0 = displayed but excluded from random draw",
"weightInteger": "Weight must be an integer",
"weightMin": "Weight must be at least 0",
"weightShort": "Weight",
"weight": "Win probability (%)",
"weightHint": "Percent chance in the grid. All drawable prizes must total 100%. 0 = shown but never drawn.",
"weightInteger": "Probability must be an integer",
"weightMax": "Probability cannot exceed 100",
"weightMin": "Probability must be at least 0",
"weightShort": "Prob",
"yuanSuffix": "CNY"
},
"publish": "Publish",
@@ -177,5 +201,73 @@
"statusAll": "All",
"statusLabel": "Status",
"title": "Title",
"updateSuccess": "Update Success"
"updateSuccess": "Update Success",
"claim": {
"approve": "Approve",
"approveDescription": "Approving moves this claim to the paying/shipping stage.",
"approveSuccess": "Claim approved",
"approveTitle": "Approve this claim?",
"cancel": "Cancel",
"claimData": "Claim info",
"confirm": "Confirm",
"confirmMarkPaid": "Confirm",
"confirmReject": "Confirm reject",
"createdAt": "Won at",
"deliveryRef": "Delivery ref",
"deliveryRefPlaceholder": "Tracking number",
"deliveryRefRequired": "Delivery ref is required for physical",
"expiresAt": "Expires",
"filterStatus": "Status",
"filterType": "Type",
"filterUserId": "User ID",
"fulfillment": "Tx / Delivery",
"markPaid": "Mark fulfilled",
"markPaidDescription": "Crypto requires a tx hash; physical requires a delivery ref; manual requires at least one.",
"markPaidSuccess": "Marked as fulfilled",
"markPaidTitle": "Mark as fulfilled",
"oneRefRequired": "Fill at least one field",
"prize": "Prize",
"reason": "Reason",
"reasonPlaceholder": "Reason shown to the user",
"reasonRequired": "Please enter a reason",
"reasonTooLong": "Reason cannot exceed 512 chars",
"reject": "Reject",
"rejectDescription": "The reason is shown to the user, who may then resubmit.",
"rejectSuccess": "Claim rejected",
"rejectTitle": "Reject claim",
"status": "Status",
"statusExpired": "Expired",
"statusPaid": "Fulfilled",
"statusPaying": "Paying / Shipping",
"statusPending": "Awaiting user",
"statusRejected": "Rejected",
"statusReviewing": "Reviewing",
"tableTitle": "Claims",
"txHash": "Tx hash",
"txHashRequired": "Tx hash is required for crypto",
"user": "User"
},
"draw": {
"dispatchAutoClaimed": "Auto-granted",
"dispatchExpired": "Expired",
"dispatchFailed": "Failed",
"dispatchNone": "Pending",
"dispatchPaid": "Fulfilled",
"dispatchPendingClaim": "Awaiting claim",
"dispatchState": "Dispatch",
"drawnAt": "Drawn at",
"filterDispatch": "Dispatch",
"filterUserId": "User ID",
"filterWin": "Won?",
"grant": "Grant result",
"loseOnly": "Not won",
"prize": "Prize",
"tableTitle": "Draw records",
"user": "User",
"winOnly": "Won"
},
"delete": "Delete",
"deleteSuccess": "Deleted",
"confirmDeleteActivity": "Delete this activity?",
"confirmDeleteActivityDesc": "This permanently deletes the activity and its prizes. A running activity must be paused first. This cannot be undone."
}
@@ -28,7 +28,6 @@
"createSubscription": "Create Subscription",
"createSuccess": "Created successfully",
"createUser": "Create User",
"current": "Current",
"currentCommission": "Current Commission",
"delete": "Delete",
"deleted": "Deleted",
@@ -118,8 +117,6 @@
"permanent": "Permanent",
"prev": "Prev",
"pleaseEnterEmail": "Enter email",
"hour": "Hour",
"day": "Day",
"referer": "Referer",
"refererId": "Referer ID",
"refererIdPlaceholder": "Enter referer ID",
@@ -152,12 +149,7 @@
"save": "Save",
"shortCode": "Short Code",
"speedLimit": "Speed Limit",
"speedLimitMbps": "Target Speed Limit (Mbps)",
"startTime": "startTime",
"statType": "Statistics Type",
"statTypeDay": "Day",
"statTypeHour": "Hour",
"statValue": "Time Value",
"status": "Status",
"statusActive": "Active",
"statusDeducted": "Deducted",
@@ -179,7 +171,6 @@
"subscriptionInfo": "subscriptionInfo",
"subscriptionList": "Subscription List",
"subscriptionLogs": "Subscription Logs",
"subscriptionDefault": "Subscription Default",
"subscriptionName": "subscriptionName",
"subscriptionNotifications": "Subscription Notifications",
"telephone": "Phone",
@@ -190,25 +181,17 @@
"tradeNotifications": "Trade Notifications",
"trafficDetails": "Traffic Details",
"trafficLimit": "Traffic Limit",
"trafficLimitRule": "Rule",
"trafficLimitRules": "Traffic Limit Rules",
"trafficLimitRuleSummary": "{{traffic}} GB in {{value}} {{type}} -> {{speed}} Mbps",
"trafficStats": "Traffic Stats",
"trafficUsage": "Traffic Threshold (GB)",
"throttled": "Throttled",
"trafficUsage": "Traffic Usage",
"remainingTraffic": "Remaining Traffic",
"unlimited": "unlimited",
"unverified": "Unverified",
"update": "Update",
"updateSuccess": "Updated successfully",
"userOverride": "User Override",
"effectiveSpeed": "Effective Speed",
"groupUpdated": "Group updated successfully",
"upload": "Upload",
"uploadTraffic": "Upload Traffic",
"userStatus": "User Status",
"subscribed": "Subscribed",
"unsubscribed": "No active subscription",
"userAgent": "User Agent",
"userEmail": "Email",
"userEmailPlaceholder": "Enter email",
@@ -9,7 +9,9 @@
"createSuccess": "创建成功",
"detail": {
"prizesTab": "奖品",
"rulesTab": "规则"
"rulesTab": "规则",
"claimsTab": "领奖工单",
"drawsTab": "抽奖记录"
},
"edit": "编辑",
"editActivity": "编辑活动",
@@ -58,10 +60,21 @@
"amountYuan": "佣金金额(元)",
"cancel": "取消",
"centerSlotHint": "通常为抽奖按钮",
"claimTtlHint": "用户提交领奖信息的时限,缺省 168 小时(7 天)。",
"claimTtlHours": "领奖窗口(小时)",
"claimTtlInvalid": "领奖窗口(小时)必须为正整数",
"confirm": "确认",
"confirmDelete": "删除",
"createSuccess": "奖品创建成功",
"createTitle": "添加奖品",
"cryptoAmount": "金额",
"cryptoAmountPlaceholder": "例如:0.01",
"cryptoAmountRequired": "请输入金额",
"cryptoCurrency": "币种",
"cryptoCurrencyRequired": "请输入币种",
"cryptoNetworks": "网络",
"cryptoNetworksHint": "逗号分隔,用户领奖时从中选择一个网络。",
"cryptoNetworksRequired": "至少填写一个网络(逗号分隔)",
"daysSuffix": "天",
"delete": "删除",
"deleteDescription": "该奖品将从九宫格中移除,此操作不可撤销。",
@@ -70,13 +83,16 @@
"durationDays": "时长(天)",
"durationDaysPlaceholder": "例如:1",
"durationDaysRequired": "时长天数必须为正整数",
"durationSummary": "{{days}} 天",
"editTitle": "编辑奖品",
"fallbackBadge": "保底",
"fallbackIgnoresWeight": "保底奖品不参与权重计算",
"fallbackIgnoresWeight": "保底奖品不参与概率(永不被随机抽中)",
"hoursSuffix": "小时",
"iconUrl": "图标 URL",
"iconUrlInvalid": "请输入有效的 URL",
"isFallback": "保底奖品",
"isFallbackHint": "限量奖品抽完后发放该奖品",
"manualPrizeHint": "人工发放奖品:无需额外配置。中奖后用户凭截图联系人工客服兑换,无需在 app 内填领奖表单。",
"name": "奖品名称",
"namePlaceholder": "例如:1 天时长卡",
"nameRequired": "请输入奖品名称",
@@ -85,18 +101,25 @@
"noRandomPrizes": "暂无参与随机抽取的奖品",
"noneHint": "无需额外配置。建议开启保底,限量奖品抽完后用户将始终抽中该奖品。",
"probabilityPreview": "概率预览",
"probabilityTotal": "合计",
"selectType": "选择类型",
"skuName": "物品名称(可选)",
"skuNamePlaceholder": "例如:限量 T 恤",
"slotLabel": "格子",
"soldOutBadge": "已抽完",
"stage2Hint": "Stage 2 开放",
"stockShort": "库存",
"subscribePlan": "无订阅时新建套餐",
"subscribePlanHint": "当用户无活跃订阅时,按该套餐新建订阅并发放时长;留空则跳过发放。",
"subscribePlanPlaceholder": "不选:用户无活跃订阅时跳过发放",
"totalNot100Hint": "当前可抽奖品概率合计 {{total}}%。请调整各奖品的中奖概率,使其精确等于 100%。",
"totalNot100Title": "概率合计必须为 100%",
"totalStock": "总库存",
"totalStockPlaceholder": "例如:100",
"totalStockRequired": "总库存必须为正整数",
"type": "奖品类型",
"typeCommission": "佣金",
"typeCoupon": "优惠券",
"typeCrypto": "加密货币",
"typeCrypto": "人工发放",
"typeManualOther": "人工发放(其他)",
"typeNone": "谢谢参与",
"typePhysical": "实物奖品",
@@ -104,11 +127,12 @@
"typeVpnDuration": "免费时长",
"unlimitedStock": "无限库存",
"updateSuccess": "奖品更新成功",
"weight": "权重",
"weightHint": "权重为 0 时仅展示不参与随机抽取",
"weightInteger": "权重必须为整数",
"weightMin": "权重不能小于 0",
"weightShort": "权重",
"weight": "中奖概率(%",
"weightHint": "九宫格内的中奖概率。所有参与随机的奖品合计须为 100%。0 = 展示不参与随机",
"weightInteger": "概率必须为整数",
"weightMax": "概率不能超过 100",
"weightMin": "概率不能小于 0",
"weightShort": "概率",
"yuanSuffix": "元"
},
"publish": "上架",
@@ -177,5 +201,73 @@
"statusAll": "全部",
"statusLabel": "状态",
"title": "标题",
"updateSuccess": "更新成功"
"updateSuccess": "更新成功",
"claim": {
"approve": "通过",
"approveDescription": "通过后工单进入待发放/发货阶段。",
"approveSuccess": "工单已通过",
"approveTitle": "确认通过该工单?",
"cancel": "取消",
"claimData": "领奖信息",
"confirm": "确认",
"confirmMarkPaid": "确认",
"confirmReject": "确认驳回",
"createdAt": "中奖时间",
"deliveryRef": "物流单号",
"deliveryRefPlaceholder": "快递单号",
"deliveryRefRequired": "实物奖品必须填写物流单号",
"expiresAt": "过期时间",
"filterStatus": "状态",
"filterType": "类型",
"filterUserId": "用户 ID",
"fulfillment": "交易/物流单号",
"markPaid": "标记发放",
"markPaidDescription": "加密货币需填交易哈希;实物需填物流单号;人工其他至少填一项。",
"markPaidSuccess": "已标记发放",
"markPaidTitle": "标记为已发放",
"oneRefRequired": "至少填写一项",
"prize": "奖品",
"reason": "驳回原因",
"reasonPlaceholder": "填写驳回原因,用户端会看到",
"reasonRequired": "请填写驳回原因",
"reasonTooLong": "驳回原因不能超过 512 字",
"reject": "驳回",
"rejectDescription": "驳回原因会展示给用户,用户可重新提交。",
"rejectSuccess": "工单已驳回",
"rejectTitle": "驳回工单",
"status": "状态",
"statusExpired": "已过期",
"statusPaid": "已发放",
"statusPaying": "待发放/发货",
"statusPending": "待用户填写",
"statusRejected": "已驳回",
"statusReviewing": "待审核",
"tableTitle": "领奖工单",
"txHash": "交易哈希",
"txHashRequired": "加密货币奖品必须填写交易哈希",
"user": "用户"
},
"draw": {
"dispatchAutoClaimed": "已自动发放",
"dispatchExpired": "已过期",
"dispatchFailed": "发放失败",
"dispatchNone": "待发放",
"dispatchPaid": "已发放",
"dispatchPendingClaim": "待领取",
"dispatchState": "发放状态",
"drawnAt": "抽奖时间",
"filterDispatch": "发放状态",
"filterUserId": "用户 ID",
"filterWin": "是否中奖",
"grant": "发放结果",
"loseOnly": "未中奖",
"prize": "奖品",
"tableTitle": "抽奖记录",
"user": "用户",
"winOnly": "已中奖"
},
"delete": "删除",
"deleteSuccess": "删除成功",
"confirmDeleteActivity": "确定删除该活动吗?",
"confirmDeleteActivityDesc": "将永久删除该活动及其奖品。运行中的活动请先暂停。此操作不可撤销。"
}
@@ -28,7 +28,6 @@
"createSubscription": "创建订阅",
"createSuccess": "创建成功",
"createUser": "创建用户",
"current": "当前",
"currentCommission": "当前佣金",
"delete": "删除",
"deleted": "已删除",
@@ -119,8 +118,6 @@
"permanent": "永久",
"prev": "上一页",
"pleaseEnterEmail": "输入邮箱",
"hour": "小时",
"day": "天",
"referer": "推荐人",
"refererId": "推荐人 ID",
"refererIdPlaceholder": "输入推荐人 ID",
@@ -153,12 +150,7 @@
"save": "保存",
"shortCode": "短码",
"speedLimit": "速度限制",
"speedLimitMbps": "目标限速 (Mbps)",
"startTime": "开始时间",
"statType": "统计周期",
"statTypeDay": "天",
"statTypeHour": "小时",
"statValue": "周期值",
"status": "状态",
"statusActive": "活跃",
"statusDeducted": "已扣除",
@@ -180,7 +172,6 @@
"subscriptionInfo": "订阅信息",
"subscriptionList": "订阅列表",
"subscriptionLogs": "订阅日志",
"subscriptionDefault": "套餐默认",
"subscriptionName": "订阅名称",
"subscriptionNotifications": "订阅通知",
"telephone": "电话",
@@ -191,25 +182,17 @@
"tradeNotifications": "交易通知",
"trafficDetails": "流量详情",
"trafficLimit": "流量限制",
"trafficLimitRule": "规则",
"trafficLimitRules": "流量限速规则",
"trafficLimitRuleSummary": "{{value}}{{type}}内达到 {{traffic}} GB 后限速到 {{speed}} Mbps",
"trafficStats": "流量统计",
"trafficUsage": "触发流量 (GB)",
"throttled": "已触发限速",
"trafficUsage": "流量使用",
"remainingTraffic": "剩余流量",
"unlimited": "无限制",
"unverified": "未验证",
"update": "更新",
"updateSuccess": "更新成功",
"userOverride": "用户覆盖",
"effectiveSpeed": "当前生效",
"groupUpdated": "分组更新成功",
"upload": "上传",
"uploadTraffic": "上传流量",
"userStatus": "用户状态",
"subscribed": "有有效订阅",
"unsubscribed": "无有效订阅",
"userAgent": "用户代理",
"userEmail": "邮箱",
"userEmailPlaceholder": "输入邮箱",
@@ -18,8 +18,10 @@ import { Separator } from "@workspace/ui/components/separator";
import { Tabs, TabsList, TabsTrigger } from "@workspace/ui/components/tabs";
import Empty from "@workspace/ui/composed/empty";
import { Icon } from "@workspace/ui/composed/icon";
import { queryServerTotalData } from "@workspace/ui/services/admin/console";
import { getWithdrawalList } from "@workspace/ui/services/admin/withdrawal";
import {
queryServerTotalData,
queryTicketWaitReply,
} from "@workspace/ui/services/admin/console";
import { formatBytes } from "@workspace/ui/utils/formatting";
import { useState } from "react";
import { useTranslation } from "react-i18next";
@@ -39,15 +41,11 @@ import { UserStatisticsCard } from "./user-statistics-card";
export default function Statistics() {
const { t } = useTranslation("dashboard");
const { data: PendingWithdrawalTotal } = useQuery({
queryKey: ["queryPendingWithdrawalTotal"],
const { data: TicketTotal } = useQuery({
queryKey: ["queryTicketWaitReply"],
queryFn: async () => {
const { data } = await getWithdrawalList({
page: 1,
size: 1,
status: 0,
});
return data.data?.total || 0;
const { data } = await queryTicketWaitReply();
return data.data?.count;
},
});
const { data: ServerTotal } = useQuery({
@@ -244,7 +242,7 @@ export default function Statistics() {
},
{
title: t("withdrawalManagement", "提现管理"),
value: PendingWithdrawalTotal || 0,
value: TicketTotal || 0,
subtitle: t("pending", "Pending"),
icon: "uil:clipboard-notes",
href: "/dashboard/withdrawal",
@@ -14,6 +14,8 @@ import {
import { getLotteryActivityDetail } from "@workspace/ui/services/admin/lottery";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import ClaimsPanel from "./claims-panel";
import DrawsPanel from "./draws-panel";
import PrizeGrid from "./prize-grid";
import RuleEditor from "./rule-editor";
@@ -102,6 +104,12 @@ export default function ActivityDetail({
<TabsTrigger value="rules">
{t("detail.rulesTab", "Rules")}
</TabsTrigger>
<TabsTrigger value="claims">
{t("detail.claimsTab", "Claims")}
</TabsTrigger>
<TabsTrigger value="draws">
{t("detail.drawsTab", "Draw records")}
</TabsTrigger>
</TabsList>
<TabsContent value="prizes">
<PrizeGrid activity={current} />
@@ -109,6 +117,12 @@ export default function ActivityDetail({
<TabsContent value="rules">
<RuleEditor activity={current} onSaved={onChanged} />
</TabsContent>
<TabsContent value="claims">
<ClaimsPanel activity={current} />
</TabsContent>
<TabsContent value="draws">
<DrawsPanel activity={current} />
</TabsContent>
</Tabs>
</div>
</>
@@ -33,7 +33,7 @@ import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { z } from "zod";
const GRID_SIZE_OPTIONS = [9] as const;
const GRID_SIZE_OPTIONS = [8, 9] as const;
const getFormSchema = (t: (key: string, defaultValue: string) => string) =>
z
@@ -0,0 +1,555 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation } from "@tanstack/react-query";
import { Badge } from "@workspace/ui/components/badge";
import { Button } from "@workspace/ui/components/button";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@workspace/ui/components/dialog";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@workspace/ui/components/form";
import { Input } from "@workspace/ui/components/input";
import { Textarea } from "@workspace/ui/components/textarea";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import {
ProTable,
type ProTableActions,
} from "@workspace/ui/composed/pro-table/pro-table";
import {
approveLotteryClaim,
getLotteryClaimList,
markPaidLotteryClaim,
rejectLotteryClaim,
} from "@workspace/ui/services/admin/lottery";
import { type ReactNode, useRef, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { z } from "zod";
import { formatDate } from "@/utils/common";
interface ClaimsPanelProps {
activity: API.LotteryActivity;
}
type TranslateFn = (key: string, defaultValue: string) => string;
const STATUS_META: Record<
API.LotteryClaimStatus,
{ labelKey: string; labelDefault: string; className: string }
> = {
pending_claim: {
labelKey: "claim.statusPending",
labelDefault: "Awaiting user",
className: "bg-gray-100 text-gray-600 border-gray-200",
},
reviewing: {
labelKey: "claim.statusReviewing",
labelDefault: "Reviewing",
className: "bg-amber-100 text-amber-700 border-amber-200",
},
paying: {
labelKey: "claim.statusPaying",
labelDefault: "Paying / Shipping",
className: "bg-blue-100 text-blue-700 border-blue-200",
},
paid: {
labelKey: "claim.statusPaid",
labelDefault: "Fulfilled",
className: "bg-emerald-100 text-emerald-700 border-emerald-200",
},
rejected: {
labelKey: "claim.statusRejected",
labelDefault: "Rejected",
className: "bg-rose-100 text-rose-700 border-rose-200",
},
expired: {
labelKey: "claim.statusExpired",
labelDefault: "Expired",
className: "bg-gray-100 text-gray-500 border-gray-200",
},
};
function prizeTypeLabel(type: API.LotteryPrizeType, t: TranslateFn): string {
const labels: Record<string, string> = {
crypto: t("prize.typeCrypto", "Crypto"),
physical: t("prize.typePhysical", "Physical"),
manual_other: t("prize.typeManualOther", "Manual (Other)"),
};
return labels[type] ?? type;
}
function ClaimDataCell({ data }: { data?: Record<string, any> }) {
if (!data || Object.keys(data).length === 0) {
return <span className="text-muted-foreground">--</span>;
}
return (
<div className="max-w-[240px] space-y-0.5 text-xs">
{Object.entries(data).map(([key, value]) => (
<div className="break-all" key={key}>
<span className="text-muted-foreground">{key}:</span>{" "}
<span className="font-medium">{String(value)}</span>
</div>
))}
</div>
);
}
const rejectSchema = (t: TranslateFn) =>
z.object({
reason: z
.string()
.trim()
.min(2, t("claim.reasonRequired", "Please enter a reason"))
.max(512, t("claim.reasonTooLong", "Reason cannot exceed 512 chars")),
});
const markPaidSchema = z.object({
tx_hash: z.string().trim().max(128).optional(),
delivery_ref: z.string().trim().max(128).optional(),
});
export default function ClaimsPanel({ activity }: ClaimsPanelProps) {
const { t } = useTranslation("lottery");
const ref = useRef<ProTableActions>(null);
const [rejectOpen, setRejectOpen] = useState(false);
const [paidOpen, setPaidOpen] = useState(false);
const [currentRow, setCurrentRow] = useState<API.AdminLotteryClaim | null>(
null
);
const rejectForm = useForm<{ reason: string }>({
resolver: zodResolver(rejectSchema(t)),
defaultValues: { reason: "" },
});
const paidForm = useForm<z.infer<typeof markPaidSchema>>({
resolver: zodResolver(markPaidSchema),
defaultValues: { tx_hash: "", delivery_ref: "" },
});
const approveMutation = useMutation({
mutationFn: (id: number) => approveLotteryClaim({ id }),
onSuccess: () => {
toast.success(t("claim.approveSuccess", "Claim approved"));
ref.current?.refresh();
},
});
const rejectMutation = useMutation({
mutationFn: (body: API.RejectLotteryClaimRequest) =>
rejectLotteryClaim(body),
onSuccess: () => {
toast.success(t("claim.rejectSuccess", "Claim rejected"));
setRejectOpen(false);
setCurrentRow(null);
rejectForm.reset({ reason: "" });
ref.current?.refresh();
},
});
const paidMutation = useMutation({
mutationFn: (body: API.MarkPaidLotteryClaimRequest) =>
markPaidLotteryClaim(body),
onSuccess: () => {
toast.success(t("claim.markPaidSuccess", "Marked as fulfilled"));
setPaidOpen(false);
setCurrentRow(null);
paidForm.reset({ tx_hash: "", delivery_ref: "" });
ref.current?.refresh();
},
});
const statusOptions = (
Object.keys(STATUS_META) as API.LotteryClaimStatus[]
).map((value) => ({
value,
label: t(STATUS_META[value].labelKey, STATUS_META[value].labelDefault),
}));
const typeOptions = [
{ value: "crypto", label: t("prize.typeCrypto", "Crypto") },
{ value: "physical", label: t("prize.typePhysical", "Physical") },
{
value: "manual_other",
label: t("prize.typeManualOther", "Manual (Other)"),
},
];
const openReject = (row: API.AdminLotteryClaim) => {
setCurrentRow(row);
rejectForm.reset({ reason: "" });
setRejectOpen(true);
};
const openPaid = (row: API.AdminLotteryClaim) => {
setCurrentRow(row);
paidForm.reset({ tx_hash: "", delivery_ref: "" });
setPaidOpen(true);
};
return (
<>
<ProTable<
API.AdminLotteryClaim,
{ type?: string; status?: string; user_id?: string }
>
action={ref}
actions={{
render: (row) => {
const actions: ReactNode[] = [];
if (row.status === "reviewing") {
actions.push(
<ConfirmButton
cancelText={t("claim.cancel", "Cancel")}
confirmText={t("claim.confirm", "Confirm")}
description={t(
"claim.approveDescription",
"Approving moves this claim to the paying/shipping stage."
)}
key="approve"
onConfirm={async () => {
await approveMutation.mutateAsync(row.id);
}}
title={t("claim.approveTitle", "Approve this claim?")}
trigger={
<Button size="sm" variant="default">
{t("claim.approve", "Approve")}
</Button>
}
/>
);
}
if (row.status === "paying") {
actions.push(
<Button
key="mark-paid"
onClick={() => openPaid(row)}
size="sm"
variant="default"
>
{t("claim.markPaid", "Mark fulfilled")}
</Button>
);
}
if (row.status === "reviewing" || row.status === "paying") {
actions.push(
<Button
key="reject"
onClick={() => openReject(row)}
size="sm"
variant="destructive"
>
{t("claim.reject", "Reject")}
</Button>
);
}
return actions;
},
}}
columns={[
{ accessorKey: "id", header: "ID" },
{
accessorKey: "user",
header: t("claim.user", "User"),
cell: ({ row }) => (
<div className="text-sm">
<div>#{row.original.user.id}</div>
{row.original.user.email && (
<div className="text-muted-foreground text-xs">
{row.original.user.email}
</div>
)}
</div>
),
},
{
accessorKey: "prize",
header: t("claim.prize", "Prize"),
cell: ({ row }) => (
<div className="text-sm">
<div className="font-medium">{row.original.prize.name}</div>
<Badge className="mt-0.5" variant="secondary">
{prizeTypeLabel(row.original.prize.type, t)}
</Badge>
</div>
),
},
{
accessorKey: "claim_data",
header: t("claim.claimData", "Claim info"),
cell: ({ row }) => <ClaimDataCell data={row.original.claim_data} />,
},
{
accessorKey: "status",
header: t("claim.status", "Status"),
cell: ({ row }) => {
const meta = STATUS_META[row.original.status];
return (
<Badge className={meta?.className} variant="outline">
{meta
? t(meta.labelKey, meta.labelDefault)
: row.original.status}
</Badge>
);
},
},
{
accessorKey: "fulfillment",
header: t("claim.fulfillment", "Tx / Delivery"),
cell: ({ row }) => (
<div className="max-w-[180px] break-all text-xs">
{row.original.tx_hash || row.original.delivery_ref || "--"}
{row.original.reject_reason && (
<div className="text-rose-600">
{row.original.reject_reason}
</div>
)}
</div>
),
},
{
accessorKey: "expires_at",
header: t("claim.expiresAt", "Expires"),
cell: ({ row }) =>
row.original.expires_at
? formatDate(row.original.expires_at)
: "--",
},
{
accessorKey: "created_at",
header: t("claim.createdAt", "Won at"),
cell: ({ row }) =>
row.original.created_at
? formatDate(row.original.created_at)
: "--",
},
]}
header={{ title: t("claim.tableTitle", "Claims") }}
params={[
{
key: "type",
options: typeOptions,
placeholder: t("claim.filterType", "Type"),
},
{
key: "status",
options: statusOptions,
placeholder: t("claim.filterStatus", "Status"),
},
{
key: "user_id",
placeholder: t("claim.filterUserId", "User ID"),
},
]}
request={async (pagination, filter) => {
const { data } = await getLotteryClaimList({
page: pagination.page,
size: pagination.size,
activity_id: activity.id,
type: (filter.type as API.LotteryPrizeType) || undefined,
status: (filter.status as API.LotteryClaimStatus) || undefined,
user_id: filter.user_id ? Number(filter.user_id) : undefined,
});
return {
list: data.data?.claims || [],
total: data.data?.total || 0,
};
}}
/>
{/* Reject dialog */}
<Dialog
onOpenChange={(open) => {
setRejectOpen(open);
if (!open) {
setCurrentRow(null);
rejectForm.reset({ reason: "" });
}
}}
open={rejectOpen}
>
<DialogContent>
<DialogHeader>
<DialogTitle>{t("claim.rejectTitle", "Reject claim")}</DialogTitle>
<DialogDescription>
{t(
"claim.rejectDescription",
"The reason is shown to the user, who may then resubmit."
)}
</DialogDescription>
</DialogHeader>
<Form {...rejectForm}>
<form
className="space-y-4"
onSubmit={rejectForm.handleSubmit(async (values) => {
if (!currentRow) return;
await rejectMutation.mutateAsync({
id: currentRow.id,
reason: values.reason.trim(),
});
})}
>
<FormField
control={rejectForm.control}
name="reason"
render={({ field }) => (
<FormItem>
<FormLabel>{t("claim.reason", "Reason")}</FormLabel>
<FormControl>
<Textarea
placeholder={t(
"claim.reasonPlaceholder",
"Reason shown to the user"
)}
rows={4}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<DialogFooter>
<Button
onClick={() => setRejectOpen(false)}
type="button"
variant="outline"
>
{t("claim.cancel", "Cancel")}
</Button>
<Button disabled={rejectMutation.isPending} type="submit">
{t("claim.confirmReject", "Confirm reject")}
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
{/* Mark-paid dialog */}
<Dialog
onOpenChange={(open) => {
setPaidOpen(open);
if (!open) {
setCurrentRow(null);
paidForm.reset({ tx_hash: "", delivery_ref: "" });
}
}}
open={paidOpen}
>
<DialogContent>
<DialogHeader>
<DialogTitle>
{t("claim.markPaidTitle", "Mark as fulfilled")}
</DialogTitle>
<DialogDescription>
{t(
"claim.markPaidDescription",
"Crypto requires a tx hash; physical requires a delivery ref; manual requires at least one."
)}
</DialogDescription>
</DialogHeader>
<Form {...paidForm}>
<form
className="space-y-4"
onSubmit={paidForm.handleSubmit(async (values) => {
if (!currentRow) return;
const txHash = values.tx_hash?.trim();
const deliveryRef = values.delivery_ref?.trim();
const prizeType = currentRow.prize.type;
if (prizeType === "crypto" && !txHash) {
paidForm.setError("tx_hash", {
message: t(
"claim.txHashRequired",
"Tx hash is required for crypto"
),
});
return;
}
if (prizeType === "physical" && !deliveryRef) {
paidForm.setError("delivery_ref", {
message: t(
"claim.deliveryRefRequired",
"Delivery ref is required for physical"
),
});
return;
}
if (!(txHash || deliveryRef)) {
paidForm.setError("tx_hash", {
message: t(
"claim.oneRefRequired",
"Fill at least one field"
),
});
return;
}
await paidMutation.mutateAsync({
id: currentRow.id,
tx_hash: txHash || undefined,
delivery_ref: deliveryRef || undefined,
});
})}
>
<FormField
control={paidForm.control}
name="tx_hash"
render={({ field }) => (
<FormItem>
<FormLabel>{t("claim.txHash", "Tx hash")}</FormLabel>
<FormControl>
<Input placeholder="0x..." {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={paidForm.control}
name="delivery_ref"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("claim.deliveryRef", "Delivery ref")}
</FormLabel>
<FormControl>
<Input
placeholder={t(
"claim.deliveryRefPlaceholder",
"Tracking number"
)}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<DialogFooter>
<Button
onClick={() => setPaidOpen(false)}
type="button"
variant="outline"
>
{t("claim.cancel", "Cancel")}
</Button>
<Button disabled={paidMutation.isPending} type="submit">
{t("claim.confirmMarkPaid", "Confirm")}
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
</>
);
}
@@ -0,0 +1,193 @@
import { Badge } from "@workspace/ui/components/badge";
import {
ProTable,
type ProTableActions,
} from "@workspace/ui/composed/pro-table/pro-table";
import { getLotteryDrawList } from "@workspace/ui/services/admin/lottery";
import { useRef } from "react";
import { useTranslation } from "react-i18next";
import { formatDate } from "@/utils/common";
interface DrawsPanelProps {
activity: API.LotteryActivity;
}
type TranslateFn = (key: string, defaultValue: string) => string;
const DISPATCH_META: Record<
string,
{ labelKey: string; labelDefault: string; className: string }
> = {
none: {
labelKey: "draw.dispatchNone",
labelDefault: "Pending",
className: "bg-gray-100 text-gray-500 border-gray-200",
},
auto_claimed: {
labelKey: "draw.dispatchAutoClaimed",
labelDefault: "Auto-granted",
className: "bg-emerald-100 text-emerald-700 border-emerald-200",
},
pending_claim: {
labelKey: "draw.dispatchPendingClaim",
labelDefault: "Awaiting claim",
className: "bg-amber-100 text-amber-700 border-amber-200",
},
paid: {
labelKey: "draw.dispatchPaid",
labelDefault: "Fulfilled",
className: "bg-emerald-100 text-emerald-700 border-emerald-200",
},
expired: {
labelKey: "draw.dispatchExpired",
labelDefault: "Expired",
className: "bg-gray-100 text-gray-500 border-gray-200",
},
failed: {
labelKey: "draw.dispatchFailed",
labelDefault: "Failed",
className: "bg-rose-100 text-rose-700 border-rose-200",
},
};
function prizeTypeLabel(type: API.LotteryPrizeType, t: TranslateFn): string {
const labels: Record<string, string> = {
vpn_duration: t("prize.typeVpnDuration", "VPN Duration"),
commission: t("prize.typeCommission", "Commission"),
none: t("prize.typeNone", "No Prize (Thanks)"),
crypto: t("prize.typeCrypto", "Crypto"),
physical: t("prize.typePhysical", "Physical"),
manual_other: t("prize.typeManualOther", "Manual (Other)"),
};
return labels[type] ?? type;
}
export default function DrawsPanel({ activity }: DrawsPanelProps) {
const { t } = useTranslation("lottery");
const ref = useRef<ProTableActions>(null);
const dispatchOptions = Object.entries(DISPATCH_META).map(
([value, meta]) => ({
value,
label: t(meta.labelKey, meta.labelDefault),
})
);
const winOptions = [
{ value: "1", label: t("draw.winOnly", "Won") },
{ value: "0", label: t("draw.loseOnly", "Not won") },
];
return (
<ProTable<
API.AdminLotteryDraw,
{ win?: string; dispatch_state?: string; user_id?: string }
>
action={ref}
columns={[
{ accessorKey: "draw_id", header: "ID" },
{
accessorKey: "user",
header: t("draw.user", "User"),
cell: ({ row }) => (
<div className="text-sm">
<div>#{row.original.user.id}</div>
{row.original.user.email && (
<div className="text-muted-foreground text-xs">
{row.original.user.email}
</div>
)}
</div>
),
},
{
accessorKey: "prize",
header: t("draw.prize", "Prize"),
cell: ({ row }) => {
const prize = row.original.prize;
if (!(row.original.is_win && prize)) {
return (
<span className="text-muted-foreground">
{t("prize.typeNone", "No Prize (Thanks)")}
</span>
);
}
return (
<div className="text-sm">
<div className="font-medium">{prize.name}</div>
<Badge className="mt-0.5" variant="secondary">
{prizeTypeLabel(prize.type, t)}
</Badge>
</div>
);
},
},
{
accessorKey: "dispatch_state",
header: t("draw.dispatchState", "Dispatch"),
cell: ({ row }) => {
const meta = DISPATCH_META[row.original.dispatch_state];
return (
<Badge className={meta?.className} variant="outline">
{meta
? t(meta.labelKey, meta.labelDefault)
: row.original.dispatch_state}
</Badge>
);
},
},
{
accessorKey: "grant_message",
header: t("draw.grant", "Grant result"),
cell: ({ row }) => (
<div className="max-w-[220px] break-all text-xs">
{row.original.grant_message || "--"}
{row.original.dispatch_error && (
<div className="text-rose-600">
{row.original.dispatch_error}
</div>
)}
</div>
),
},
{
accessorKey: "drawn_at",
header: t("draw.drawnAt", "Drawn at"),
cell: ({ row }) =>
row.original.drawn_at ? formatDate(row.original.drawn_at) : "--",
},
]}
header={{ title: t("draw.tableTitle", "Draw records") }}
params={[
{
key: "win",
options: winOptions,
placeholder: t("draw.filterWin", "Won?"),
},
{
key: "dispatch_state",
options: dispatchOptions,
placeholder: t("draw.filterDispatch", "Dispatch"),
},
{
key: "user_id",
placeholder: t("draw.filterUserId", "User ID"),
},
]}
request={async (pagination, filter) => {
const { data } = await getLotteryDrawList({
page: pagination.page,
size: pagination.size,
activity_id: activity.id,
win: (filter.win as "1" | "0") || undefined,
dispatch_state: filter.dispatch_state || undefined,
user_id: filter.user_id ? Number(filter.user_id) : undefined,
});
return {
list: data.data?.list || [],
total: data.data?.total || 0,
};
}}
/>
);
}
@@ -31,6 +31,16 @@ const grantSchema = z.object({
source_ref: z.string().trim().min(1),
});
// 数字输入统一用 type="text" + 该 formatOutput,避开 number 类型 input 的实时钳制问题。
const numberOutput = (v: string | number): number | undefined => {
const s = String(v ?? "").trim();
if (s === "") {
return;
}
const n = Number(s);
return Number.isNaN(n) ? undefined : n;
};
type GrantFormValues = z.infer<typeof grantSchema>;
const SOURCE_REF_RANDOM_LENGTH = 6;
@@ -123,10 +133,11 @@ export default function GrantDialog({
<FormLabel>{t("grant.userId", "User ID")}</FormLabel>
<FormControl>
<EnhancedInput
min={1}
formatOutput={numberOutput}
inputMode="numeric"
onValueChange={(value) => field.onChange(value)}
placeholder={t("grant.userIdPlaceholder", "e.g. 87433")}
type="number"
type="text"
value={field.value}
/>
</FormControl>
@@ -148,10 +159,11 @@ export default function GrantDialog({
<FormLabel>{t("grant.amount", "Amount")}</FormLabel>
<FormControl>
<EnhancedInput
min={1}
formatOutput={numberOutput}
inputMode="numeric"
onValueChange={(value) => field.onChange(value)}
placeholder="1"
type="number"
type="text"
value={field.value}
/>
</FormControl>
+26 -1
View File
@@ -7,6 +7,7 @@ import {
} from "@workspace/ui/composed/pro-table/pro-table";
import {
createLotteryActivity,
deleteLotteryActivity,
getLotteryActivityList,
pauseLotteryActivity,
publishLotteryActivity,
@@ -166,7 +167,31 @@ export default function Lottery() {
variant="outline"
>
{t("grantChances", "Grant Chances")}
</Button>
</Button>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("delete", "Delete")}
description={t(
"confirmDeleteActivityDesc",
"This permanently deletes the activity and its prizes. A running activity must be paused first. This cannot be undone."
)}
key="delete"
onConfirm={async () => {
try {
await deleteLotteryActivity({ id: row.id });
toast.success(t("deleteSuccess", "Deleted"));
ref.current?.refresh();
} catch {
// Request layer already surfaces the error toast
}
}}
title={t("confirmDeleteActivity", "Delete this activity?")}
trigger={
<Button size="sm" variant="destructive">
{t("delete", "Delete")}
</Button>
}
/>
);
return rowActions;
},
+120 -100
View File
@@ -35,13 +35,27 @@ import {
deleteLotteryPrize,
updateLotteryPrize,
} from "@workspace/ui/services/admin/lottery";
import { getSubscribeList } from "@workspace/ui/services/admin/subscribe";
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { z } from "zod";
const CENTS_PER_YUAN = 100;
// 概率单位约定:weight 1000 = 1%(支持 3 位小数概率,总权重 100000 = 100%)。
const WEIGHT_PER_PERCENT = 1000;
// numberOutput 把 text 输入转成数字(空/非法→undefined)。数字输入统一用 type="text"
// + 该 formatOutput,避开 EnhancedInput 在 type="number" 下 min/max 实时钳制导致的
// “输入 0 / 改中间位跳变”问题;提交仍是数字,后端收 int。
const numberOutput = (v: string | number): number | undefined => {
const s = String(v ?? "").trim();
if (s === "") {
return;
}
const n = Number(s);
return Number.isNaN(n) ? undefined : n;
};
type TranslateFn = (key: string, defaultValue: string) => string;
@@ -49,7 +63,6 @@ const PRIZE_TYPE_OPTIONS: {
value: API.LotteryPrizeType;
labelKey: string;
labelDefault: string;
disabled?: boolean;
}[] = [
{
value: "vpn_duration",
@@ -57,39 +70,21 @@ const PRIZE_TYPE_OPTIONS: {
labelDefault: "VPN Duration",
},
{
value: "commission",
labelKey: "prize.typeCommission",
labelDefault: "Commission",
value: "crypto",
labelKey: "prize.typeCrypto",
labelDefault: "Crypto",
},
{
value: "none",
labelKey: "prize.typeNone",
labelDefault: "No Prize (Thanks)",
},
{
value: "crypto",
labelKey: "prize.typeCrypto",
labelDefault: "Crypto",
disabled: true,
},
{
value: "physical",
labelKey: "prize.typePhysical",
labelDefault: "Physical",
disabled: true,
},
{
value: "manual_other",
labelKey: "prize.typeManualOther",
labelDefault: "Manual (Other)",
disabled: true,
},
];
const getPrizeSchema = (t: TranslateFn) =>
z
.object({
type: z.enum(["vpn_duration", "commission", "none"]),
type: z.enum(["vpn_duration", "crypto", "none"]),
name: z.string().min(1, t("prize.nameRequired", "Name is required")),
icon_url: z
.string()
@@ -98,13 +93,13 @@ const getPrizeSchema = (t: TranslateFn) =>
.optional(),
weight: z
.number()
.int(t("prize.weightInteger", "Weight must be an integer"))
.min(0, t("prize.weightMin", "Weight must be at least 0")),
.min(0, t("prize.weightMin", "Probability must be at least 0"))
.max(100, t("prize.weightMax", "Probability cannot exceed 100")),
unlimited_stock: z.boolean(),
total_stock: z.number().optional(),
is_fallback: z.boolean(),
duration_days: z.number().optional(),
amount_yuan: z.number().optional(),
subscribe_id: z.number().optional(),
})
.superRefine((data, ctx) => {
const issue = (path: string, message: string) => {
@@ -121,24 +116,6 @@ const getPrizeSchema = (t: TranslateFn) =>
)
);
}
if (data.type === "commission") {
const yuan = data.amount_yuan ?? 0;
const cents = yuan * CENTS_PER_YUAN;
if (yuan <= 0) {
issue(
"amount_yuan",
t("prize.amountRequired", "Amount must be greater than 0")
);
} else if (Math.abs(Math.round(cents) - cents) > 1e-6) {
issue(
"amount_yuan",
t(
"prize.amountPrecision",
"Amount supports at most 2 decimal places"
)
);
}
}
if (!(data.unlimited_stock || isPositiveInt(data.total_stock))) {
issue(
"total_stock",
@@ -162,31 +139,30 @@ interface PrizeFormProps {
}
function toFormValues(prize?: API.LotteryPrize): PrizeFormValues {
const config = prize?.config ?? {};
return {
type: (prize?.type as PrizeFormValues["type"]) ?? "vpn_duration",
name: prize?.name ?? "",
icon_url: prize?.icon_url ?? "",
weight: prize?.weight ?? 1,
weight: (prize?.weight ?? 0) / WEIGHT_PER_PERCENT,
unlimited_stock: prize ? prize.total_stock === null : true,
total_stock: prize?.total_stock ?? undefined,
is_fallback: prize?.is_fallback ?? false,
duration_days: prize?.config?.duration_days as number | undefined,
amount_yuan:
typeof prize?.config?.amount_cents === "number"
? prize.config.amount_cents / CENTS_PER_YUAN
: undefined,
duration_days: config.duration_days as number | undefined,
subscribe_id: config.subscribe_id as number | undefined,
};
}
function toConfig(values: PrizeFormValues): Record<string, any> {
if (values.type === "vpn_duration") {
return { duration_days: values.duration_days };
}
if (values.type === "commission") {
return {
amount_cents: Math.round((values.amount_yuan ?? 0) * CENTS_PER_YUAN),
};
const config: Record<string, any> = { duration_days: values.duration_days };
// 可选:无活跃订阅时按该套餐新建订阅发放时长。0/未选则沿用旧行为(跳过发放)。
if (values.subscribe_id && values.subscribe_id > 0) {
config.subscribe_id = values.subscribe_id;
}
return config;
}
// crypto(人工发放) / none 无需额外配置:中奖后凭截图联系客服线下发放。
return {};
}
@@ -200,6 +176,7 @@ export default function PrizeForm({
}: PrizeFormProps) {
const { t } = useTranslation("lottery");
const [loading, setLoading] = useState(false);
const [plans, setPlans] = useState<API.SubscribeItem[]>([]);
const form = useForm<PrizeFormValues>({
resolver: zodResolver(getPrizeSchema(t)),
defaultValues: toFormValues(initialValues),
@@ -214,6 +191,16 @@ export default function PrizeForm({
if (open) form.reset(toFormValues(initialValues));
}, [form, initialValues, open]);
// vpn_duration 需要一个可选的“新建订阅套餐”下拉,仅在面板打开且类型匹配时拉取。
useEffect(() => {
if (!(open && type === "vpn_duration") || plans.length > 0) return;
getSubscribeList({ page: 1, size: 100 })
.then(({ data }) => setPlans(data?.data?.list ?? []))
.catch(() => {
// Request layer already surfaces the error toast
});
}, [open, type, plans.length]);
async function handleSubmit(values: PrizeFormValues) {
setLoading(true);
try {
@@ -224,7 +211,9 @@ export default function PrizeForm({
name: values.name.trim(),
icon_url: values.icon_url?.trim() ?? "",
config: toConfig(values),
weight: values.weight,
weight: values.is_fallback
? 0
: Math.round(values.weight * WEIGHT_PER_PERCENT),
total_stock: values.unlimited_stock
? null
: (values.total_stock ?? null),
@@ -262,13 +251,7 @@ export default function PrizeForm({
}
const renderInput = (
name:
| "name"
| "icon_url"
| "weight"
| "total_stock"
| "duration_days"
| "amount_yuan",
name: "name" | "icon_url" | "weight" | "total_stock" | "duration_days",
label: string,
inputProps: Partial<EnhancedInputProps<any>>,
description?: string
@@ -322,8 +305,6 @@ export default function PrizeForm({
/>
);
const stage2Hint = t("prize.stage2Hint", "Available in Stage 2");
return (
<Sheet onOpenChange={onOpenChange} open={open}>
<SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
@@ -365,13 +346,8 @@ export default function PrizeForm({
</SelectTrigger>
<SelectContent>
{PRIZE_TYPE_OPTIONS.map((option) => (
<SelectItem
disabled={option.disabled}
key={option.value}
value={option.value}
>
<SelectItem key={option.value} value={option.value}>
{t(option.labelKey, option.labelDefault)}
{option.disabled ? ` · ${stage2Hint}` : ""}
</SelectItem>
))}
</SelectContent>
@@ -392,30 +368,60 @@ export default function PrizeForm({
"duration_days",
t("prize.durationDays", "Duration (days)"),
{
type: "number",
min: 1,
step: 1,
type: "text",
inputMode: "numeric",
formatOutput: numberOutput,
placeholder: t("prize.durationDaysPlaceholder", "e.g. 1"),
suffix: t("prize.daysSuffix", "days"),
}
)}
{type === "commission" &&
renderInput(
"amount_yuan",
t("prize.amountYuan", "Commission Amount (CNY)"),
{
type: "number",
min: 0,
step: 0.01,
placeholder: "0.00",
prefix: "¥",
suffix: t("prize.yuanSuffix", "CNY"),
},
t(
"prize.amountUnitHint",
"Entered in CNY (yuan), stored as cents; up to 2 decimal places"
)
)}
{type === "vpn_duration" && (
<FormField
control={form.control}
name="subscribe_id"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("prize.subscribePlan", "New-subscription plan")}
</FormLabel>
<FormControl>
<Select
onValueChange={(value) =>
form.setValue(
"subscribe_id",
value ? Number(value) : undefined
)
}
value={field.value ? String(field.value) : undefined}
>
<SelectTrigger className="w-full">
<SelectValue
placeholder={t(
"prize.subscribePlanPlaceholder",
"None — skip if user has no active subscription"
)}
/>
</SelectTrigger>
<SelectContent>
{plans.map((plan) => (
<SelectItem key={plan.id} value={String(plan.id)}>
{plan.name ?? `#${plan.id}`}
</SelectItem>
))}
</SelectContent>
</Select>
</FormControl>
<p className="text-muted-foreground text-xs">
{t(
"prize.subscribePlanHint",
"When the user has no active subscription, create one on this plan and grant the duration. Leave empty to skip granting."
)}
</p>
<FormMessage />
</FormItem>
)}
/>
)}
{type === "none" && (
<p className="rounded-md bg-muted/50 p-3 text-muted-foreground text-xs">
{t(
@@ -424,18 +430,32 @@ export default function PrizeForm({
)}
</p>
)}
{type === "crypto" && (
<p className="rounded-md bg-muted/50 p-3 text-muted-foreground text-xs">
{t(
"prize.manualPrizeHint",
"Manual prize: no extra config. When won, the user contacts customer service with a screenshot to redeem — no in-app claim form."
)}
</p>
)}
{renderInput(
"weight",
t("prize.weight", "Weight"),
{ type: "number", min: 0, step: 1, disabled: isFallback },
t("prize.weight", "Win probability (%)"),
{
type: "text",
inputMode: "decimal",
formatOutput: numberOutput,
suffix: "%",
disabled: isFallback,
},
isFallback
? t(
"prize.fallbackIgnoresWeight",
"Fallback prize ignores weight"
"Fallback prize ignores probability (never randomly drawn)"
)
: t(
"prize.weightHint",
"0 = displayed but excluded from random draw"
"Percent chance in the grid. All drawable prizes must total 100%. 0 = shown but never drawn."
)
)}
{renderSwitch(
@@ -447,9 +467,9 @@ export default function PrizeForm({
"total_stock",
t("prize.totalStock", "Total Stock"),
{
type: "number",
min: 1,
step: 1,
type: "text",
inputMode: "numeric",
formatOutput: numberOutput,
placeholder: t("prize.totalStockPlaceholder", "e.g. 100"),
}
)}
+75 -9
View File
@@ -14,7 +14,16 @@ import PrizeForm from "./prize-form";
const DEFAULT_GRID_SIZE = 9;
const CENTER_SLOT = 4;
const PERCENT_DECIMALS = 1;
const CENTS_PER_YUAN = 100;
// 概率单位约定:weight 1000 = 1%,总权重 100000 = 100.000%(支持 3 位小数概率)。
const WEIGHT_PER_PERCENT = 1000;
const FULL_TOTAL_WEIGHT = 100 * WEIGHT_PER_PERCENT;
// weightToPercent 把原始 weight 转成百分比字符串(最多 3 位小数,去尾零)。
function weightToPercent(weight: number): string {
const pct = weight / WEIGHT_PER_PERCENT;
return `${Number.parseFloat(pct.toFixed(3))}`;
}
interface PrizeGridProps {
activity: API.LotteryActivity;
@@ -36,6 +45,30 @@ function prizeTypeLabel(type: API.LotteryPrizeType, t: TranslateFn): string {
return labels[type] ?? type;
}
// prizeConfigSummary 把奖品的类型专属 config 渲染成一行可读文本,
// 让九宫格卡片显示真实配置值(免费时长天数 / 佣金金额),而不是只有类型徽章。
function prizeConfigSummary(
prize: API.LotteryPrize,
t: TranslateFn
): string | null {
const config = prize.config ?? {};
if (prize.type === "vpn_duration") {
const days = config.duration_days as number | undefined;
if (typeof days === "number" && days > 0) {
return `${days} ${t("prize.daysSuffix", "days")}`;
}
return null;
}
if (prize.type === "commission") {
const cents = config.amount_cents as number | undefined;
if (typeof cents === "number" && cents > 0) {
return `¥${(cents / CENTS_PER_YUAN).toFixed(2)}`;
}
return null;
}
return null;
}
interface FormState {
open: boolean;
slot: number;
@@ -84,6 +117,7 @@ export default function PrizeGrid({ activity }: PrizeGridProps) {
[randomPrizes]
);
const hasFallback = prizes.some((prize) => prize.is_fallback);
const totalIsValid = totalWeight === FULL_TOTAL_WEIGHT;
const gridSize = activity.grid_size || DEFAULT_GRID_SIZE;
const slots = Array.from({ length: gridSize }, (_, index) => index);
@@ -104,16 +138,22 @@ export default function PrizeGrid({ activity }: PrizeGridProps) {
return (
<div className="space-y-4">
<div className="rounded-lg border bg-muted/30 p-3">
<p className="mb-2 font-medium text-sm">
{t("prize.probabilityPreview", "Probability Preview")}
</p>
<div className="mb-2 flex items-center justify-between">
<p className="font-medium text-sm">
{t("prize.probabilityPreview", "Probability Preview")}
</p>
{randomPrizes.length > 0 && (
<Badge variant={totalIsValid ? "secondary" : "destructive"}>
{t("prize.probabilityTotal", "Total")}:{" "}
{weightToPercent(totalWeight)}%
</Badge>
)}
</div>
{randomPrizes.length > 0 ? (
<div className="flex flex-wrap gap-2">
{randomPrizes.map((prize) => (
<Badge key={prize.id} variant="secondary">
{prize.name}: {prize.weight}/{totalWeight} (
{((prize.weight / totalWeight) * 100).toFixed(PERCENT_DECIMALS)}
%)
{prize.name}: {weightToPercent(prize.weight)}%
</Badge>
))}
</div>
@@ -126,6 +166,21 @@ export default function PrizeGrid({ activity }: PrizeGridProps) {
</p>
)}
</div>
{randomPrizes.length > 0 && !totalIsValid && (
<Alert variant="destructive">
<AlertTriangle className="h-4 w-4" />
<AlertTitle>
{t("prize.totalNot100Title", "Probabilities must total 100%")}
</AlertTitle>
<AlertDescription>
{t(
"prize.totalNot100Hint",
"The drawable prizes currently total {{total}}%. Adjust each prize's win probability so they sum to exactly 100%.",
{ total: weightToPercent(totalWeight) }
)}
</AlertDescription>
</Alert>
)}
{!hasFallback && (
<Alert>
<AlertTriangle className="h-4 w-4" />
@@ -185,9 +240,20 @@ export default function PrizeGrid({ activity }: PrizeGridProps) {
<Badge variant="secondary">
{prizeTypeLabel(prize.type, t)}
</Badge>
{(() => {
const summary = prizeConfigSummary(prize, t);
return summary ? (
<span className="line-clamp-1 font-medium text-primary text-xs">
{summary}
</span>
) : null;
})()}
<span className="text-muted-foreground text-xs">
{t("prize.weightShort", "Weight")}: {prize.weight} ·{" "}
{t("prize.stockShort", "Stock")}:{" "}
{t("prize.weightShort", "Prob")}:{" "}
{prize.is_fallback
? "—"
: `${weightToPercent(prize.weight)}%`}{" "}
· {t("prize.stockShort", "Stock")}:{" "}
{prize.total_stock === null ? "∞" : prize.total_stock}
</span>
<div className="flex flex-wrap justify-center gap-1">
+4 -4
View File
@@ -93,8 +93,8 @@ function toFormValues(rule?: API.PromoRule): RuleFormValues {
window_hours: rule?.params?.window_hours,
priority: rule?.priority ?? 0,
enabled: rule?.enabled ?? false,
start_time: rule?.start_time ? rule.start_time * 1000 : undefined,
end_time: rule?.end_time ? rule.end_time * 1000 : undefined,
start_time: rule?.start_time,
end_time: rule?.end_time,
};
}
@@ -112,8 +112,8 @@ function toRequest(values: RuleFormValues): API.CreatePromoRuleRequest {
params,
priority: values.priority,
enabled: values.enabled,
start_time: values.start_time ? Math.floor(values.start_time / 1000) : undefined,
end_time: values.end_time ? Math.floor(values.end_time / 1000) : undefined,
start_time: values.start_time || undefined,
end_time: values.end_time || undefined,
};
}
+23 -60
View File
@@ -66,6 +66,7 @@ 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 { UserIdentifier } from "./user-identifier";
import { UserInviteStatsSheet } from "./user-invite-stats-sheet";
@@ -335,31 +336,23 @@ export default function User() {
id: "referer_id",
accessorKey: "referer_id",
header: t("referer", "Referer"),
cell: ({ row }) => (
<RefererProfileTrigger
onUpdated={() => ref.current?.refresh()}
userId={row.original.referer_id}
/>
),
cell: ({ row }) => <UserDetail id={row.original.referer_id} />,
},
{
id: "member_status",
accessorKey: "member_status",
id: "last_login_time",
accessorKey: "last_login_time",
header: t("userStatus", "用户状态"),
cell: ({ row }) => {
// member_status 由后端基于当前有效订阅计算:有有效订阅时为套餐名,否则为空
const memberStatus = (
const lastLoginTime = (
row.original as API.User & {
member_status?: string;
last_login_time?: number;
}
).member_status;
const hasActiveSubscription = Boolean(memberStatus);
const dotClassName = hasActiveSubscription
? "bg-green-500"
: "bg-gray-400";
const tooltipLabel = hasActiveSubscription
? memberStatus
: t("unsubscribed", "No active subscription");
).last_login_time;
const isOnline = Boolean(lastLoginTime);
const dotClassName = isOnline ? "bg-green-500" : "bg-gray-400";
const statusLabel = isOnline
? t("active", "Active")
: t("inactive", "Inactive");
return (
<TooltipProvider>
@@ -370,10 +363,18 @@ export default function User() {
aria-hidden="true"
className={`h-2.5 w-2.5 rounded-full ${dotClassName}`}
/>
<span className="sr-only">{tooltipLabel}</span>
<span className="sr-only">
{isOnline
? `${statusLabel}: ${formatDate(lastLoginTime)}`
: statusLabel}
</span>
</div>
</TooltipTrigger>
<TooltipContent>{tooltipLabel}</TooltipContent>
<TooltipContent>
{isOnline
? formatDate(lastLoginTime)
: t("neverLoggedIn", "Never logged in")}
</TooltipContent>
</Tooltip>
</TooltipProvider>
);
@@ -438,11 +439,9 @@ export default function User() {
function ProfileSheet({
userId,
onUpdated,
trigger,
}: {
userId: number;
onUpdated?: () => void;
trigger?: React.ReactNode;
}) {
const { t } = useTranslation("user");
const [open, setOpen] = useState(false);
@@ -463,7 +462,7 @@ function ProfileSheet({
return (
<Sheet onOpenChange={setOpen} open={open}>
<SheetTrigger asChild>
{trigger || <Button variant="default">{t("edit", "Edit")}</Button>}
<Button variant="default">{t("edit", "Edit")}</Button>
</SheetTrigger>
<SheetContent
className="w-[700px] max-w-full md:max-w-screen-lg"
@@ -527,42 +526,6 @@ function SubscriptionSheet({ userId }: { userId: number }) {
);
}
function RefererProfileTrigger({
userId,
onUpdated,
}: {
userId: number;
onUpdated?: () => void;
}) {
const { t } = useTranslation("user");
const { data: user } = useQuery({
enabled: userId > 0,
queryKey: ["refererUserDetail", userId],
queryFn: async () => {
const { data } = await getUserDetail({ id: userId });
return data.data as API.User;
},
});
if (!userId) return "--";
return (
<ProfileSheet
onUpdated={onUpdated}
trigger={
<Button className="h-auto p-0 font-normal" variant="link">
{user ? (
<UserIdentifier className="flex items-center" user={user} />
) : (
t("loading", "Loading...")
)}
</Button>
}
userId={userId}
/>
);
}
function InviteStatsMenuItem({ userId }: { userId: number }) {
const { t } = useTranslation("user");
const [open, setOpen] = useState(false);
@@ -54,10 +54,6 @@ function toUserSubscribePayload(values: SubscriptionFormValues) {
};
}
function resolvePlanSpeed(row: API.UserSubscribe) {
return row.plan_speed_limit ?? row.subscribe?.speed_limit ?? 0;
}
export default function UserSubscription({ userId }: { userId: number }) {
const { t } = useTranslation("user");
const [loading, setLoading] = useState(false);
@@ -316,22 +312,18 @@ export default function UserSubscription({ userId }: { userId: number }) {
{
accessorKey: "speed_limit",
header: t("speedLimit", "Speed Limit"),
meta: {
className: "min-w-[220px] whitespace-normal",
},
cell: ({ row }) => {
const userSpeed = row.original.speed_limit ?? 0;
const effectiveSpeed = row.original.effective_speed ?? 0;
const planSpeed = resolvePlanSpeed(row.original);
const planSpeed = row.original.subscribe?.speed_limit ?? 0;
const speed = effectiveSpeed || userSpeed || planSpeed;
const source = row.original.is_throttled
? t("effectiveSpeed")
: userSpeed > 0
? t("userOverride")
: t("subscriptionDefault");
const source =
userSpeed > 0
? t("userOverride", "User Override")
: t("subscriptionDefault", "Subscription Default");
return (
<div className="flex min-w-[200px] flex-col gap-1 whitespace-normal">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<Display type="trafficSpeed" value={speed} />
{row.original.is_throttled && (
@@ -340,18 +332,9 @@ export default function UserSubscription({ userId }: { userId: number }) {
</Badge>
)}
</div>
<div className="grid grid-cols-[auto_1fr] gap-x-2 gap-y-0.5 text-muted-foreground text-xs leading-5">
<span>{t("current")}</span>
<span>{source}</span>
<span>{t("userOverride")}</span>
<span>
<Display type="trafficSpeed" value={userSpeed} />
</span>
<span>{t("subscriptionDefault")}</span>
<span>
<Display type="trafficSpeed" value={planSpeed} />
</span>
</div>
<span className="text-muted-foreground text-xs">
{source}
</span>
</div>
);
},
@@ -87,12 +87,11 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
if (detail.status !== 1) return null;
const baseSpeed =
detail.plan_speed_limit ?? detail.subscribe?.speed_limit ?? 0;
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.user_traffic_limit || detail.traffic_limit || [];
const rules = detail.traffic_limit || [];
const hasLimitConfig =
baseSpeed > 0 || userSpeed > 0 || effectiveSpeed > 0 || rules.length > 0;
@@ -121,13 +120,13 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
<div className="flex flex-wrap items-center gap-2 font-medium">
{isThrottled ? (
<>
<span>{t("throttled")}</span>
<span>{t("throttled", "Speed Throttled")}</span>
<Badge className="text-xs" variant="destructive">
{effectiveSpeed} Mbps
</Badge>
{baseSpeed > 0 && (
<span className="text-muted-foreground text-xs line-through">
{t("subscriptionDefault")}:{" "}
{t("subscriptionDefault", "Subscription Default")}:{" "}
{baseSpeed} Mbps
</span>
)}
@@ -138,22 +137,24 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
{t("speedLimit", "Speed Limit")}
</span>
<Badge className="text-xs" variant="secondary">
{effectiveSpeed > 0 ? `${effectiveSpeed} Mbps` : t("unlimited")}
{effectiveSpeed > 0
? `${effectiveSpeed} Mbps`
: t("unlimited", "Unlimited")}
</Badge>
</>
)}
</div>
<div className="grid gap-2 sm:grid-cols-3">
<SpeedMetric
label={t("subscriptionDefault")}
label={t("subscriptionDefault", "Subscription Default")}
value={baseSpeed}
/>
<SpeedMetric
label={t("userOverride")}
label={t("userOverride", "User Override")}
value={userSpeed}
/>
<SpeedMetric
label={t("effectiveSpeed")}
label={t("effectiveSpeed", "Effective Speed")}
value={effectiveSpeed}
/>
</div>
@@ -171,7 +172,7 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
{rules.length > 0 && (
<div className="space-y-2">
<p className="font-medium text-foreground text-xs">
{t("trafficLimitRules")}
{t("trafficLimitRules", "Traffic Limit Rules")}
</p>
<div className="grid gap-2">
{rules.map((rule, index) => (
@@ -186,8 +187,8 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
value: rule.stat_value,
type:
rule.stat_type === "hour"
? t("hour")
: t("day"),
? t("hour", "Hour")
: t("day", "Day"),
speed: rule.speed_limit,
})}
</div>
@@ -207,7 +208,7 @@ function SpeedMetric({ label, value }: { label: string; value: number }) {
<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")}
{value > 0 ? `${value} Mbps` : t("unlimited", "Unlimited")}
</div>
</div>
);
@@ -1,11 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { Button } from "@workspace/ui/components/button";
import {
Card,
CardContent,
CardHeader,
CardTitle,
} from "@workspace/ui/components/card";
import {
Form,
FormControl,
@@ -26,11 +20,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 { cn } from "@workspace/ui/lib/utils";
import { unitConversion } from "@workspace/ui/utils/unit-conversions";
import { CircleMinusIcon, CirclePlusIcon } from "lucide-react";
import { type KeyboardEvent, type ReactNode, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
@@ -47,12 +40,6 @@ interface Props {
type SubscriptionTrafficLimitRule = API.UserSubscribeTrafficLimitRule;
function getUserTrafficLimitRules(
data?: Pick<API.UserSubscribe, "traffic_limit" | "user_traffic_limit">
) {
return data?.user_traffic_limit || data?.traffic_limit || [];
}
const defaultLimitRule: SubscriptionTrafficLimitRule = {
stat_type: "day",
stat_value: 1,
@@ -94,199 +81,6 @@ const normalizeLimitRule = (
speed_limit: Math.max(0, Number(item.speed_limit) || 0),
});
function TrafficLimitRuleEditor({
value,
onChange,
}: {
value: SubscriptionTrafficLimitRule[];
onChange: (value: SubscriptionTrafficLimitRule[]) => void;
}) {
const { t } = useTranslation("user");
const rules = value.length > 0 ? value : [defaultLimitRule];
const updateRule = (
index: number,
patch: Partial<SubscriptionTrafficLimitRule>
) => {
const next = rules.map((rule, i) =>
i === index ? normalizeLimitRule({ ...rule, ...patch }) : rule
);
onChange(next);
};
const addRule = () => {
onChange([...rules, defaultLimitRule]);
};
const removeRule = (index: number) => {
const next = rules.filter((_, i) => i !== index);
onChange(next.length > 0 ? next : []);
};
return (
<div className="space-y-3">
{rules.map((rule, index) => (
<Card className="gap-0 rounded-lg py-0 shadow-none" key={index}>
<CardHeader className="border-b px-4 py-3">
<div className="flex items-center justify-between gap-3">
<CardTitle className="text-sm">
{t("trafficLimitRule")} {index + 1}
</CardTitle>
<div className="flex items-center gap-1">
{rules.length > 1 && (
<Button
className="h-8 w-8 p-0 text-destructive"
onClick={() => removeRule(index)}
size="icon"
type="button"
variant="ghost"
>
<CircleMinusIcon className="h-4 w-4" />
</Button>
)}
{index === rules.length - 1 && (
<Button
className="h-8 w-8 p-0 text-primary"
onClick={addRule}
size="icon"
type="button"
variant="ghost"
>
<CirclePlusIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</CardHeader>
<CardContent className="px-4 py-4">
<div className="grid gap-3 sm:grid-cols-2">
<div className="space-y-2">
<FormLabel className="text-xs">
{t("statType")}
</FormLabel>
<Combobox<string, false>
onChange={(nextValue) => {
updateRule(index, {
stat_type: nextValue || "day",
});
}}
options={[
{
label: t("statTypeHour"),
value: "hour",
},
{
label: t("statTypeDay"),
value: "day",
},
]}
placeholder={t("statType")}
value={rule.stat_type}
/>
</div>
<div className="space-y-2">
<FormLabel className="text-xs">
{t("statValue")}
</FormLabel>
<EnhancedInput
min={1}
onKeyDown={(e: KeyboardEvent<HTMLInputElement>) => {
if (e.key === "." || e.key === ",") {
e.preventDefault();
}
}}
onValueChange={(nextValue) => {
updateRule(index, {
stat_value: Math.max(
1,
Math.floor(Number(nextValue) || 1)
),
});
}}
placeholder={t("statValue")}
type="number"
value={rule.stat_value}
/>
</div>
<div className="space-y-2">
<FormLabel className="text-xs">
{t("trafficUsage")}
</FormLabel>
<EnhancedInput
min={0}
onKeyDown={(e: KeyboardEvent<HTMLInputElement>) => {
if (e.key === "." || e.key === ",") {
e.preventDefault();
}
}}
onValueChange={(nextValue) => {
updateRule(index, {
traffic_usage: Math.max(
0,
Math.floor(Number(nextValue) || 0)
),
});
}}
placeholder={t("trafficUsage")}
suffix="GB"
type="number"
value={rule.traffic_usage}
/>
</div>
<div className="space-y-2">
<FormLabel className="text-xs">
{t("speedLimitMbps")}
</FormLabel>
<EnhancedInput
min={0}
onKeyDown={(e: KeyboardEvent<HTMLInputElement>) => {
if (e.key === "." || e.key === ",") {
e.preventDefault();
}
}}
onValueChange={(nextValue) => {
updateRule(index, {
speed_limit: Math.max(
0,
Math.floor(Number(nextValue) || 0)
),
});
}}
placeholder={t("speedLimitMbps")}
suffix="Mbps"
type="number"
value={rule.speed_limit}
/>
</div>
</div>
<div
className={cn(
"mt-3 rounded-md bg-muted/40 px-3 py-2 text-muted-foreground text-xs"
)}
>
{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")
: t("day"),
speed: rule.speed_limit,
})}
</div>
</CardContent>
</Card>
))}
</div>
);
}
export function SubscriptionForm({
trigger,
title,
@@ -304,7 +98,7 @@ export function SubscriptionForm({
traffic: initialData?.traffic || 0,
speed_limit: initialData?.speed_limit || 0,
device_limit: initialData?.device_limit || 0,
traffic_limit: getUserTrafficLimitRules(initialData),
traffic_limit: initialData?.traffic_limit || [],
upload: initialData?.upload || 0,
download: initialData?.download || 0,
expired_at: initialData?.expire_time || 0,
@@ -517,11 +311,98 @@ export function SubscriptionForm({
{t("trafficLimitRules", "Traffic Limit Rules")}
</FormLabel>
<FormControl>
<TrafficLimitRuleEditor
<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 || []}
value={
field.value && field.value.length > 0
? field.value
: [defaultLimitRule]
}
/>
</FormControl>
<FormDescription>
+2 -2
View File
@@ -44,7 +44,7 @@ const WITHDRAWAL_METHOD_MAP: Record<number, string> = {
0: "其他",
1: "支付宝",
2: "微信",
3: "USDT(TRC20)",
3: "银行卡",
};
const rejectSchema = z.object({
@@ -143,7 +143,7 @@ export default function WithdrawalPage() {
const methodOptions = [
{ value: "1", label: "支付宝" },
{ value: "2", label: "微信" },
{ value: "3", label: "USDT(TRC20)" },
{ value: "3", label: "银行卡" },
{ value: "0", label: "其他" },
];
+19 -23
View File
@@ -63,7 +63,7 @@ import { useGlobalStore } from "@/stores/global";
const WITHDRAWAL_METHODS = [
{ value: 1, label: "支付宝" },
{ value: 2, label: "微信" },
{ value: 3, label: "USDT(TRC20)" },
{ value: 3, label: "银行卡" },
{ value: 0, label: "其他" },
] as const;
@@ -111,21 +111,13 @@ function QrCodeView({ url }: { url: string }) {
<img
alt="收款码"
className="h-16 w-16 cursor-zoom-in object-cover"
height={64}
src={url}
width={64}
/>
</button>
{zoomOpen && (
<Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
<DialogContent className="max-w-sm">
<img
alt="收款码"
className="w-full"
height={320}
src={url}
width={320}
/>
<img alt="收款码" className="w-full" src={url} />
</DialogContent>
</Dialog>
)}
@@ -161,16 +153,18 @@ const withdrawalFormSchema = z
if (!data.account) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "USDT(TRC20) 地址为必填",
message: "银行卡收款账号为必填",
path: ["account"],
});
}
} else if (data.method === 0) {
if (!data.account && !data.content) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "收款账号和备注至少填一项",
path: ["account"],
});
}
} else if (data.method === 0 && !(data.account || data.content)) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "收款账号和备注至少填一项",
path: ["account"],
});
}
});
@@ -427,7 +421,9 @@ export default function Affiliate() {
<FormItem>
<FormLabel>
<span className="ml-1 text-destructive">*</span>
<span className="ml-1 text-destructive">
*
</span>
</FormLabel>
{watchedQrCodeUrl ? (
<div className="relative inline-block">
@@ -450,9 +446,7 @@ export default function Affiliate() {
returnType="file"
>
<div className="flex h-24 w-24 flex-col items-center justify-center rounded border-2 border-dashed text-muted-foreground text-xs">
{qrUploading
? "上传中..."
: "点击上传\n收款码"}
{qrUploading ? "上传中..." : "点击上传\n收款码"}
</div>
</UploadImage>
)}
@@ -480,7 +474,7 @@ export default function Affiliate() {
<Input
placeholder={
watchedMethod === 3
? "请输入 USDT(TRC20) 收款地址"
? "请输入银行卡号或账户信息"
: "请输入收款账号(与备注至少填一项)"
}
{...field}
@@ -525,7 +519,9 @@ export default function Affiliate() {
</Button>
<Button
disabled={
submitting || qrUploading || availableCommission <= 0
submitting ||
qrUploading ||
availableCommission <= 0
}
form="withdrawal-form"
type="submit"
@@ -313,8 +313,7 @@ export function ProTable<
<TableHead
className={cn(
"!z-auto",
getTableHeaderClass(header.column.id),
getColumnClassName(header)
getTableHeaderClass(header.column.id)
)}
key={header.id}
>
@@ -363,10 +362,7 @@ export function ProTable<
.filter((cell) => cell.column.id !== "sortable")
.map((cell) => (
<TableCell
className={cn(
getTableCellClass(cell.column.id),
getColumnClassName(cell)
)}
className={getTableCellClass(cell.column.id)}
key={cell.id}
>
{flexRender(
@@ -385,10 +381,7 @@ export function ProTable<
>
{row.getVisibleCells().map((cell) => (
<TableCell
className={cn(
getTableCellClass(cell.column.id),
getColumnClassName(cell)
)}
className={getTableCellClass(cell.column.id)}
key={cell.id}
>
{flexRender(
@@ -483,17 +476,3 @@ function getTableCellClass(columnId: string) {
}
return "truncate";
}
function getColumnClassName(
columnLike: {
column: {
columnDef: {
meta?: {
className?: string;
};
};
};
}
) {
return columnLike.column.columnDef.meta?.className || "";
}
+130 -7
View File
@@ -202,14 +202,15 @@ export async function updateLotteryPrize(
body: API.UpdateLotteryPrizeRequest,
options?: { [key: string]: any }
) {
const { id, ...rest } = body;
return request<API.Response & { data?: API.LotteryPrize }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/prizes`,
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/prizes/${id}`,
{
method: "PUT",
headers: {
"Content-Type": "application/json",
},
data: body,
data: rest,
...(options || {}),
}
);
@@ -227,13 +228,9 @@ export async function deleteLotteryPrize(
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/prizes`,
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/prizes/${body.id}`,
{
method: "DELETE",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
@@ -285,3 +282,129 @@ export async function grantLotteryChances(
}
);
}
/**
* 领奖工单列表(Stage 2 人工奖)
* GET /v1/admin/lottery/claims
*/
export async function getLotteryClaimList(
params: API.GetLotteryClaimListParams,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: API.ListLotteryClaimsResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/claims`,
{
method: "GET",
params: { ...params },
...(options || {}),
}
);
}
/**
* 领奖工单统计(各类型 reviewing/paying + 逾期)
* GET /v1/admin/lottery/claims/summary
*/
export async function getLotteryClaimsSummary(options?: {
[key: string]: any;
}) {
return request<API.Response & { data?: API.LotteryClaimsSummary }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/claims/summary`,
{
method: "GET",
...(options || {}),
}
);
}
/**
* 审核通过领奖工单(reviewing → paying
* POST /v1/admin/lottery/claims/approve
*/
export async function approveLotteryClaim(
body: API.ApproveLotteryClaimRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/claims/approve`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
data: body,
...(options || {}),
}
);
}
/**
* 驳回领奖工单(reviewing/paying → rejectedreason 必填)
* POST /v1/admin/lottery/claims/reject
*/
export async function rejectLotteryClaim(
body: API.RejectLotteryClaimRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/claims/reject`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
data: body,
...(options || {}),
}
);
}
/**
* 标记已发放(paying → paid),填 tx_hash / delivery_ref
* POST /v1/admin/lottery/claims/mark-paid
*/
export async function markPaidLotteryClaim(
body: API.MarkPaidLotteryClaimRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/claims/mark-paid`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
data: body,
...(options || {}),
}
);
}
/**
* 抽奖记录(发放流水)
* GET /v1/admin/lottery/draws
*/
export async function getLotteryDrawList(
params: API.GetLotteryDrawListParams,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: API.ListLotteryDrawsResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/draws`,
{
method: "GET",
params: { ...params },
...(options || {}),
}
);
}
/**
* 删除抽奖活动(软删;运行中需先暂停)
* DELETE /v1/admin/lottery/activities/:id
*/
export async function deleteLotteryActivity(
body: { id: number },
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/lottery/activities/${body.id}`,
{
method: "DELETE",
...(options || {}),
}
);
}
+151 -24
View File
@@ -2598,9 +2598,6 @@ declare namespace API {
user_devices: UserDevice[];
remark: string;
rules: string[];
/** 当前有效订阅的套餐名(由后端计算),无有效订阅时为空 */
member_status?: string;
last_login_time?: number;
created_at: number;
updated_at: number;
deleted_at?: number;
@@ -2667,13 +2664,11 @@ declare namespace API {
download: number;
upload: number;
speed_limit?: number;
plan_speed_limit?: number;
device_limit?: number;
effective_speed?: number;
is_throttled?: boolean;
throttle_rule?: string;
traffic_limit?: UserSubscribeTrafficLimitRule[];
user_traffic_limit?: UserSubscribeTrafficLimitRule[];
token: string;
status: number;
short: string;
@@ -2704,10 +2699,8 @@ declare namespace API {
download: number;
upload: number;
speed_limit?: number;
plan_speed_limit?: number;
device_limit?: number;
traffic_limit?: UserSubscribeTrafficLimitRule[];
user_traffic_limit?: UserSubscribeTrafficLimitRule[];
token: string;
status: number;
effective_speed: number;
@@ -3302,25 +3295,25 @@ declare namespace API {
type AdminWithdrawalLog = WithdrawalLog;
type LotteryPrizeType =
| 'vpn_duration'
| 'commission'
| 'none'
| 'crypto'
| 'physical'
| 'manual_other'
| 'coupon'
| 'points';
| "vpn_duration"
| "commission"
| "none"
| "crypto"
| "physical"
| "manual_other"
| "coupon"
| "points";
type LotteryActivityStatus = 'draft' | 'running' | 'paused' | 'ended';
type LotteryActivityStatus = "draft" | "running" | "paused" | "ended";
type LotteryChanceSourceType =
| 'daily_signin'
| 'new_subscription'
| 'invite_success'
| 'manual_grant';
| "daily_signin"
| "new_subscription"
| "invite_success"
| "manual_grant";
type LotteryEligibilityNode = {
op?: 'AND' | 'OR';
op?: "AND" | "OR";
children?: LotteryEligibilityNode[];
type?: string;
params?: Record<string, any>;
@@ -3371,11 +3364,20 @@ declare namespace API {
unmet_action: string;
};
type UpdateLotteryActivityRequest = CreateLotteryActivityRequest & { id: number };
type UpdateLotteryActivityRequest = CreateLotteryActivityRequest & {
id: number;
};
type GetLotteryActivityListParams = { page: number; size: number; status?: string };
type GetLotteryActivityListParams = {
page: number;
size: number;
status?: string;
};
type GetLotteryActivityListResponse = { total: number; list: LotteryActivity[] };
type GetLotteryActivityListResponse = {
total: number;
list: LotteryActivity[];
};
type GetLotteryActivityDetailParams = { id: number };
@@ -3415,4 +3417,129 @@ declare namespace API {
amount: number;
source_ref: string;
};
// ---- Stage 2 领奖工单(人工奖)--------------------------------------------
type LotteryClaimStatus =
| "pending_claim"
| "reviewing"
| "paying"
| "paid"
| "rejected"
| "expired";
type GetLotteryClaimListParams = {
type?: LotteryPrizeType;
status?: LotteryClaimStatus;
activity_id?: number;
user_id?: number;
from?: number;
to?: number;
page: number;
size: number;
};
type AdminLotteryClaimUser = {
id: number;
email?: string;
};
type AdminLotteryClaimPrize = {
type: LotteryPrizeType;
name: string;
config: Record<string, any>;
};
type AdminLotteryClaim = {
id: number;
draw_id: number;
activity_id: number;
user: AdminLotteryClaimUser;
prize: AdminLotteryClaimPrize;
status: LotteryClaimStatus;
claim_data?: Record<string, any>;
submitted_at?: number;
expires_at: number;
reviewed_by?: number;
reviewed_at?: number;
reject_reason?: string;
tx_hash?: string;
delivery_ref?: string;
paid_at?: number;
created_at: number;
};
type ListLotteryClaimsResponse = {
total: number;
claims: AdminLotteryClaim[];
};
type LotteryClaimsStatusCount = {
reviewing: number;
paying: number;
};
type LotteryClaimsSummary = {
crypto: LotteryClaimsStatusCount;
physical: LotteryClaimsStatusCount;
manual_other: LotteryClaimsStatusCount;
overdue: number;
};
type ApproveLotteryClaimRequest = { id: number };
type RejectLotteryClaimRequest = { id: number; reason: string };
type MarkPaidLotteryClaimRequest = {
id: number;
tx_hash?: string;
delivery_ref?: string;
paid_at?: number;
};
// ---- Stage 3 抽奖记录(发放流水)-----------------------------------------
type GetLotteryDrawListParams = {
activity_id?: number;
user_id?: number;
prize_type?: LotteryPrizeType;
dispatch_state?: string;
win?: "1" | "0";
from?: number;
to?: number;
page: number;
size: number;
};
type AdminLotteryDrawUser = {
id: number;
email?: string;
};
type AdminLotteryDrawPrize = {
slot: number;
type: LotteryPrizeType;
name: string;
config: Record<string, any>;
};
type AdminLotteryDraw = {
draw_id: number;
activity_id: number;
user: AdminLotteryDrawUser;
is_win: boolean;
prize?: AdminLotteryDrawPrize;
dispatch_state: string;
dispatch_error?: string;
grant_amount?: number;
grant_message?: string;
drawn_at: number;
dispatched_at?: number;
created_at: number;
};
type ListLotteryDrawsResponse = {
total: number;
list: AdminLotteryDraw[];
};
}
+1
View File
@@ -1,3 +1,4 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";