fix(douyu): 按到期时间修正精英宝典状态

This commit is contained in:
yml
2026-11-19 18:01:41 +08:00
parent ea79339c30
commit 66a310ec98
13 changed files with 283 additions and 36 deletions
+20 -5
View File
@@ -9,6 +9,7 @@ import {
} from '@ant-design/icons';
import { accountApi, douyuApi, userApi, type AccountCommodityState, type AccountEventItem, type AccountOverview, type HighValueAssetState, type HighValueStatus, type UserInfo } from '../api/modules';
import AccountOverviewPanel from './douyu-tasks/AccountOverviewPanel';
import { eliteIsExpired } from '../utils/douyuElite';
import { getErrorMessage } from '../utils/error';
import { message } from '../utils/antdMessage';
import { formatTime, formatUnixSeconds } from '../utils/time';
@@ -734,18 +735,32 @@ export default function AccountDetailPage() {
<Col span={4}>
<Statistic
title="精英宝典"
value={overview?.elite_opened ? '已开通' : '未开通'}
value={
eliteIsExpired(overview ?? {})
? '已过期'
: overview?.elite_opened
? '已开通'
: '未开通'
}
valueStyle={{
fontSize: 18,
color: overview?.elite_opened ? '#3f8600' : undefined,
color: eliteIsExpired(overview ?? {})
? '#cf1322'
: overview?.elite_opened
? '#3f8600'
: undefined,
}}
/>
{/* 已开通才显示时间。开通时间来自事件(**上线后才有**);
更早的历史查不到 —— 官方兑换记录里只有商品兑换,没有开通记录。 */}
{overview?.elite_opened && (
{(overview?.elite_opened || eliteIsExpired(overview ?? {})) && (
<Text type="secondary" style={{ fontSize: 12 }}>
开通 {formatTime(overview?.opened_at?.elite)}
<br />
{overview?.elite_opened && (
<>
开通 {formatTime(overview?.opened_at?.elite)}
<br />
</>
)}
到期 {formatUnixSeconds(overview?.elite_expire_time)}
</Text>
)}
@@ -46,6 +46,7 @@ import {
resultFlag,
taskQrUrl,
eliteStatusText,
eliteIsExpired,
bindReadyForConfirm,
hasBindQrcode,
hasPaymentQrcode,
@@ -1361,6 +1362,7 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
render: (_: unknown, record: DouyuTaskAccountItem) => {
const text = eliteStatusText(record);
if (!text) return <Text type="secondary">未查</Text>;
if (eliteIsExpired(record)) return <Tag color="error">{text}</Tag>;
if (record.elite_opened) return <Tag color="green">{text}</Tag>;
return <Tag color="default">未开通</Tag>;
},
+1 -15
View File
@@ -4,6 +4,7 @@ import {
QrcodeOutlined, ReloadOutlined, SearchOutlined, ShoppingOutlined,
} from '@ant-design/icons';
import type { DouyuGoodsItem, DouyuTaskItem } from '../../api/modules';
export { eliteIsExpired, eliteStatusText } from '../../utils/douyuElite';
export type HandbookKind = 'elite' | 'esports' | 'peace';
@@ -159,21 +160,6 @@ export function taskQrUrl(task: DouyuTaskItem | null | undefined): string {
return '';
}
// 精英宝典开通状态展示:积分区分不了"开通后积分花完"和"从未开通",
// 以后端落库的 manualType(elite_opened)为准。
export function eliteStatusText(
account: { elite_opened?: boolean | null; elite_expire_time?: number | null },
): string {
if (account.elite_opened == null) return '';
if (!account.elite_opened) return '未开通';
const expire = account.elite_expire_time;
if (!expire || expire <= 0) return '已开通';
const at = new Date(expire * 1000);
if (Number.isNaN(at.getTime())) return '已开通';
const pad = (n: number) => String(n).padStart(2, '0');
return `已开通 ${at.getFullYear()}-${pad(at.getMonth() + 1)}-${pad(at.getDate())} 到期`;
}
export function bindReadyForConfirm(task: DouyuTaskItem | null | undefined): boolean {
if (!task) return false;
if (task.task_type === 'get_xpd_bind_qr') {
+34
View File
@@ -0,0 +1,34 @@
export interface DouyuEliteState {
elite_opened?: boolean | null;
elite_expire_time?: number | null;
}
export function eliteExpireDate(
account: DouyuEliteState,
): Date | null {
const expire = Number(account.elite_expire_time || 0);
if (!Number.isFinite(expire) || expire <= 0) return null;
const at = new Date(expire * 1000);
return Number.isNaN(at.getTime()) ? null : at;
}
export function eliteIsExpired(
account: DouyuEliteState,
now = Date.now(),
): boolean {
const at = eliteExpireDate(account);
return at !== null && at.getTime() <= now;
}
export function eliteStatusText(account: DouyuEliteState): string {
if (account.elite_opened == null) return '';
const expireAt = eliteExpireDate(account);
const dateText = expireAt
? `${expireAt.getFullYear()}-${String(expireAt.getMonth() + 1).padStart(2, '0')}-${String(expireAt.getDate()).padStart(2, '0')}`
: '';
if (eliteIsExpired(account)) {
return dateText ? `已于 ${dateText} 到期` : '已过期';
}
if (!account.elite_opened) return '未开通';
return dateText ? `已开通 ${dateText} 到期` : '已开通';
}