Compare commits

..

5 Commits

Author SHA1 Message Date
shanshanzhong147 a6246c2453 修复(#14): 过滤提现查询非法用户ID 2026-06-09 07:19:00 -07:00
shanshanzhong147 09c5216f60 修复(#14): 调整 USDT 提现方式枚举口径
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
2026-06-09 06:37:15 -07:00
shanshanzhong147 4d84095af2 修复(#14): 支持 USDT 提现方式展示 2026-06-09 06:37:14 -07:00
shanshanzhong147 d66b664198 修复(#122): 补齐促销价档位提交
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
2026-05-29 02:36:30 -07:00
shanshanzhong147 a7d89acc7f 新功能(#113): 发布促销管理后台页面到main
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
2026-05-29 00:40:33 -07:00
12 changed files with 122 additions and 400 deletions
+11 -5
View File
@@ -44,7 +44,7 @@ const WITHDRAWAL_METHOD_MAP: Record<number, string> = {
0: "其他",
1: "支付宝",
2: "微信",
3: "银行卡",
3: "USDT(TRC20)",
};
const rejectSchema = z.object({
@@ -55,6 +55,12 @@ const rejectSchema = z.object({
.max(500, "拒绝原因不能超过 500 个字符"),
});
function toOptionalNumber(value?: string) {
if (!value) return;
const parsed = Number(value);
return Number.isFinite(parsed) ? parsed : undefined;
}
function QrCodeCell({ url }: { url?: string }) {
const [zoomOpen, setZoomOpen] = useState(false);
if (!url) return <span>--</span>;
@@ -143,7 +149,7 @@ export default function WithdrawalPage() {
const methodOptions = [
{ value: "1", label: "支付宝" },
{ value: "2", label: "微信" },
{ value: "3", label: "银行卡" },
{ value: "3", label: "USDT(TRC20)" },
{ value: "0", label: "其他" },
];
@@ -309,9 +315,9 @@ export default function WithdrawalPage() {
const { data } = await getWithdrawalList({
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,
status: toOptionalNumber(filter.status),
method: toOptionalNumber(filter.method),
user_id: toOptionalNumber(filter.user_id),
});
return {
@@ -16,10 +16,6 @@
"inviteCode": "Invite Code",
"inviteRecords": "Invite Records",
"noReason": "None",
"recordsTabs": {
"withdrawal": "Withdrawal Records",
"refund": "Refund Records"
},
"rejectReason": "Reject Reason",
"registrationTime": "Registration Time",
"submitWithdraw": "Submit Request",
@@ -32,27 +28,10 @@
"withdrawDescription": "Submit the withdrawal amount and payout details, then wait for review.",
"withdrawError": "Failed to submit withdrawal request",
"withdrawRecords": "Withdrawal Records",
"withdrawalRecordsDescription": "Review your withdrawal requests, statuses, and payout details.",
"withdrawalEmpty": "No withdrawal records yet",
"withdrawStatus": {
"approved": "Approved",
"pending": "Pending Review",
"rejected": "Rejected"
},
"withdrawSuccess": "Withdrawal request submitted",
"commissionReturn": {
"description": "Review order refunds and returned withdrawal commissions.",
"empty": "No refund records yet",
"eventType": {
"orderRefund": "Order Refund",
"withdrawRejectReturn": "Withdrawal Rejected Return",
"withdrawCancelReturn": "Withdrawal Cancel Return",
"unknown": "Commission Return"
},
"fields": {
"eventType": "Type",
"orderNo": "Order No.",
"createdAt": "Created At"
}
}
"withdrawSuccess": "Withdrawal request submitted"
}
@@ -9,7 +9,6 @@
"originalPrice": "Original Price (Monthly)",
"price": "Price",
"productDiscount": "Product Discount",
"promoDiscount": "Promo Discount",
"total": "Total"
},
"buy": "Buy",
@@ -16,10 +16,6 @@
"inviteCode": "邀请码",
"inviteRecords": "邀请记录",
"noReason": "无",
"recordsTabs": {
"withdrawal": "提现记录",
"refund": "退款记录"
},
"rejectReason": "拒绝原因",
"registrationTime": "注册时间",
"submitWithdraw": "提交申请",
@@ -32,27 +28,10 @@
"withdrawDescription": "填写提现金额和收款信息后提交申请,等待后台审核。",
"withdrawError": "提现申请提交失败",
"withdrawRecords": "提现记录",
"withdrawalRecordsDescription": "查看你的提现申请、审核状态和收款信息。",
"withdrawalEmpty": "暂无提现记录",
"withdrawStatus": {
"approved": "已通过",
"pending": "审核中",
"rejected": "已拒绝"
},
"withdrawSuccess": "提现申请已提交",
"commissionReturn": {
"description": "查看订单退款和提现退回记录。",
"empty": "暂无退款记录",
"eventType": {
"orderRefund": "订单退款",
"withdrawRejectReturn": "提现拒绝退回",
"withdrawCancelReturn": "用户取消提现退回",
"unknown": "佣金返回"
},
"fields": {
"eventType": "类型",
"orderNo": "订单号",
"createdAt": "创建时间"
}
}
"withdrawSuccess": "提现申请已提交"
}
@@ -9,7 +9,6 @@
"originalPrice": "原价(按月)",
"price": "价格",
"productDiscount": "商品折扣",
"promoDiscount": "促销优惠",
"total": "总价"
},
"buy": "购买",
@@ -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")}
@@ -18,10 +18,10 @@ export function PromoInfo({ discount }: Readonly<PromoInfoProps>) {
<span className="font-medium">
{promo.rule_name || t("promo.available", "Promo Available")}
</span>
{promo.expires_at && (
{promo.end_time && (
<span className="text-muted-foreground text-xs">
{t("promo.validUntil", "Valid until")}:{" "}
{new Date(promo.expires_at * 1000).toLocaleString()}
{new Date(promo.end_time * 1000).toLocaleString()}
</span>
)}
</div>
@@ -1,37 +0,0 @@
import { describe, expect, it, vi } from "vitest";
import { getCommissionReturnEventLabel } from "./commission-return";
const translations = {
"commissionReturn.eventType.orderRefund": "订单退款",
"commissionReturn.eventType.withdrawRejectReturn": "提现拒绝退回",
"commissionReturn.eventType.withdrawCancelReturn": "用户取消提现退回",
"commissionReturn.eventType.unknown": "佣金返回",
} as const;
describe("getCommissionReturnEventLabel", () => {
const t = (key: string, defaultValue: string) =>
translations[key as keyof typeof translations] ?? defaultValue ?? key;
it("maps 333 to order refund", () => {
expect(getCommissionReturnEventLabel(333, t)).toBe("订单退款");
});
it("maps 337 to withdraw reject return", () => {
expect(getCommissionReturnEventLabel(337, t)).toBe("提现拒绝退回");
});
it("maps 338 to withdraw cancel return", () => {
expect(getCommissionReturnEventLabel(338, t)).toBe("用户取消提现退回");
});
it("falls back for unknown event types and warns", () => {
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {
/* intentional noop */
});
expect(getCommissionReturnEventLabel(999, t)).toBe("佣金返回");
expect(warnSpy).toHaveBeenCalledWith(999);
warnSpy.mockRestore();
});
});
@@ -1,27 +0,0 @@
export type AffiliateTranslation = (
key: string,
defaultValue: string
) => string;
export function getCommissionReturnEventLabel(
eventType: number,
t: AffiliateTranslation
) {
switch (eventType) {
case 333:
return t("commissionReturn.eventType.orderRefund", "Order Refund");
case 337:
return t(
"commissionReturn.eventType.withdrawRejectReturn",
"Withdrawal Rejected Return"
);
case 338:
return t(
"commissionReturn.eventType.withdrawCancelReturn",
"Withdrawal Cancel Return"
);
default:
console.warn(eventType);
return t("commissionReturn.eventType.unknown", "Commission Return");
}
}
+105 -226
View File
@@ -35,21 +35,13 @@ import {
SelectTrigger,
SelectValue,
} from "@workspace/ui/components/select";
import {
Tabs,
TabsContent,
TabsList,
TabsTrigger,
} from "@workspace/ui/components/tabs";
import { Textarea } from "@workspace/ui/components/textarea";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import Empty from "@workspace/ui/composed/empty";
import type { ProListActions } from "@workspace/ui/composed/pro-list/pro-list";
import { ProList } from "@workspace/ui/composed/pro-list/pro-list";
import { UploadImage } from "@workspace/ui/composed/upload-image";
import {
commissionWithdraw,
queryCommissionReturnLog,
queryUserAffiliate,
queryUserAffiliateList,
queryWithdrawalLog,
@@ -67,12 +59,11 @@ import { toast } from "sonner";
import { z } from "zod";
import { Display } from "@/components/display";
import { useGlobalStore } from "@/stores/global";
import { getCommissionReturnEventLabel } from "./commission-return";
const WITHDRAWAL_METHODS = [
{ value: 1, label: "支付宝" },
{ value: 2, label: "微信" },
{ value: 3, label: "银行卡" },
{ value: 3, label: "USDT(TRC20)" },
{ value: 0, label: "其他" },
] as const;
@@ -131,9 +122,9 @@ function QrCodeView({ url }: { url: string }) {
<img
alt="收款码"
className="w-full"
height={512}
height={320}
src={url}
width={512}
width={320}
/>
</DialogContent>
</Dialog>
@@ -170,7 +161,7 @@ const withdrawalFormSchema = z
if (!data.account) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "银行卡收款账号为必填",
message: "USDT(TRC20) 地址为必填",
path: ["account"],
});
}
@@ -188,7 +179,6 @@ type WithdrawalFormValues = z.infer<typeof withdrawalFormSchema>;
export default function Affiliate() {
const { t } = useTranslation("affiliate");
const { user, common, getUserInfo } = useGlobalStore();
const [activeRecordTab, setActiveRecordTab] = useState("withdrawal");
const [withdrawalOpen, setWithdrawalOpen] = useState(false);
const [submitting, startTransition] = useTransition();
const [qrUploading, setQrUploading] = useState(false);
@@ -490,7 +480,7 @@ export default function Affiliate() {
<Input
placeholder={
watchedMethod === 3
? "请输入银行卡号或账户信息"
? "请输入 USDT(TRC20) 收款地址"
: "请输入收款账号(与备注至少填一项)"
}
{...field}
@@ -578,218 +568,107 @@ export default function Affiliate() {
</div>
</CardContent>
</Card>
<Card>
<CardHeader className="gap-3">
<CardTitle>{t("withdrawRecords", "Withdrawal Records")}</CardTitle>
<CardDescription>
{activeRecordTab === "withdrawal"
? t(
"withdrawalRecordsDescription",
"Review your withdrawal requests, statuses, and payout details."
)
: t(
"commissionReturn.description",
"Review order refunds and returned withdrawal commissions."
)}
</CardDescription>
<Tabs
defaultValue="withdrawal"
onValueChange={setActiveRecordTab}
value={activeRecordTab}
>
<TabsList className="grid w-full grid-cols-2 md:w-fit">
<TabsTrigger value="withdrawal">
{t("recordsTabs.withdrawal", "Withdrawal Records")}
</TabsTrigger>
<TabsTrigger value="refund">
{t("recordsTabs.refund", "Refund Records")}
</TabsTrigger>
</TabsList>
<TabsContent className="mt-4" value="withdrawal">
<ProList<API.WithdrawalLog, Record<string, unknown>>
action={withdrawalListActionRef}
empty={
<Empty
description={t(
"withdrawalEmpty",
"No withdrawal records yet"
<ProList<API.WithdrawalLog, Record<string, unknown>>
action={withdrawalListActionRef}
header={{
title: t("withdrawal.records", "Withdrawal Records"),
}}
renderItem={(item) => {
const statusMeta = getWithdrawalStatusMeta(item.status, t);
return (
<Card className="overflow-hidden">
<CardContent className="space-y-3 p-4 text-sm">
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="font-semibold text-lg">
<Display type="currency" value={item.amount} />
</div>
<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>
}
/>
)}
/>
}
renderItem={(item) => {
const statusMeta = getWithdrawalStatusMeta(item.status, t);
return (
<Card className="overflow-hidden">
<CardContent className="space-y-3 p-4 text-sm">
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="font-semibold text-lg">
<Display type="currency" value={item.amount} />
</div>
<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>
</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>
</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 && (
<li className="flex flex-col gap-1 md:col-span-2">
<span className="text-muted-foreground">
{t("withdrawal.record.reason", "Reject Reason")}
</span>
<span className="whitespace-pre-wrap break-words text-destructive">
{item.reason}
</span>
</li>
)}
</ul>
</CardContent>
</Card>
);
}}
request={async (pagination) => {
const response = await queryWithdrawalLog({
page: pagination.page,
size: pagination.size,
});
return {
list: response.data.data?.list || [],
total: response.data.data?.total || 0,
};
}}
/>
</TabsContent>
<TabsContent className="mt-4" value="refund">
<ProList<API.CommissionReturnLog, Record<string, unknown>>
empty={
<Empty
description={t(
"commissionReturn.empty",
"No refund records yet"
)}
/>
}
renderItem={(item) => (
<Card className="overflow-hidden">
<CardContent className="space-y-3 p-4 text-sm">
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="font-semibold text-lg">
<Display type="currency" value={item.amount} />
</div>
<span className="inline-flex rounded-full bg-primary/10 px-3 py-1 font-medium text-primary text-xs">
{getCommissionReturnEventLabel(item.event_type, t)}
</span>
</div>
<ul className="grid gap-3 md:grid-cols-2">
<li className="flex flex-col gap-1">
<span className="text-muted-foreground">
{t("commissionReturn.fields.eventType", "Type")}
</span>
<span>
{getCommissionReturnEventLabel(item.event_type, t)}
</span>
</li>
<li className="flex flex-col gap-1">
<span className="text-muted-foreground">
{t("commissionReturn.fields.orderNo", "Order No.")}
</span>
<span className="break-all">
{item.order_no || "-"}
</span>
</li>
<li className="flex flex-col gap-1">
<span className="text-muted-foreground">
{t(
"commissionReturn.fields.createdAt",
"Created At"
)}
</span>
<time>{formatDate(item.created_at)}</time>
</li>
</ul>
</CardContent>
</Card>
)}
request={async (pagination) => {
const response = await queryCommissionReturnLog({
page: pagination.page,
size: pagination.size,
});
return {
list: response.data.data?.list || [],
total: response.data.data?.total || 0,
};
}}
/>
</TabsContent>
</Tabs>
</CardHeader>
</Card>
</div>
</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>
</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 && (
<li className="flex flex-col gap-1 md:col-span-2">
<span className="text-muted-foreground">
{t("withdrawal.record.reason", "Reject Reason")}
</span>
<span className="whitespace-pre-wrap break-words text-destructive">
{item.reason}
</span>
</li>
)}
</ul>
</CardContent>
</Card>
);
}}
request={async (pagination) => {
const response = await queryWithdrawalLog({
page: pagination.page,
size: pagination.size,
});
return {
list: response.data.data?.list || [],
total: response.data.data?.total || 0,
};
}}
/>
<ProList<API.UserAffiliate, Record<string, unknown>>
header={{
title: t("inviteRecords", "Invite Records"),
+1 -29
View File
@@ -170,17 +170,6 @@ declare namespace API {
timestamp: number;
};
type CommissionReturnLog = {
id: number;
user_id: number;
amount: number;
event_type: number;
order_no?: string;
content?: string;
created_at: number;
updated_at: number;
};
type CommissionWithdrawRequest = {
amount: number;
method: number;
@@ -559,7 +548,6 @@ declare namespace API {
price: number;
amount: number;
discount: number;
promo_discount: number;
gift_amount: number;
coupon: string;
coupon_discount: number;
@@ -832,21 +820,6 @@ declare namespace API {
size: number;
};
type QueryCommissionReturnLogListRequest = {
page: number;
size: number;
};
type QueryCommissionReturnLogListResponse = {
list: CommissionReturnLog[];
total: number;
};
type QueryCommissionReturnLogParams = {
page: number;
size: number;
};
type QueryUserSubscribeListResponse = {
list: UserSubscribe[];
total: number;
@@ -1051,9 +1024,8 @@ declare namespace API {
type SubscribeDiscountPromo = {
rule_name?: string;
rule_type?: string;
promo_price: number;
expires_at?: number;
end_time?: number;
};
type SubscribeGroup = {
+1 -19
View File
@@ -1,3 +1,4 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
@@ -470,25 +471,6 @@ export async function queryWithdrawalLog(
);
}
/** Query Commission Return Log GET /v1/public/user/commission_return_log */
export async function queryCommissionReturnLog(
params: API.QueryCommissionReturnLogParams,
options?: { [key: string]: any }
) {
return request<
API.Response & { data?: API.QueryCommissionReturnLogListResponse }
>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/public/user/commission_return_log`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
/** Cancel Withdrawal POST /v1/public/user/withdrawal_cancel */
export async function withdrawalCancel(
body: API.WithdrawalCancelRequest,