新增商品类目(限量返场/精英专享)支持与版本号 0.2.1
10.15 抓包确认:积分中心商城 PlayMallUI.queryAllocation 的商品与 webActUI.getActPrizeList(sid=2277) pid 完全一致,属于同一批商品,因此列表无需接商城链路;真号实测 sid=2277 返回 30 项(限量返场 99 共 12 项 + 精英专享 101 共 18 项),sid=2203 已返回空。\n\n- huya:解析商品 tag23/25/26/27/28(发布时间、上架/下架时间、每日时段),新增 PrizeInfo.CategoryIDs/InCategory/StartsAt/NotYetOnSale 与响应级 CategoryStats/CategorySummary/FilterByCategory,列表日志带类目统计\n- sniper:Config.Category 限定自动选品范围,未命中提示带类目\n- CLI:新增 -category / -category-only\n- GUI:Config.Category、ListPrizes 回传类目字典与统计;界面商品列表按类目分页签、每行标注类目、未上架显示上架时间与倒计时,所选类目随配置提交给监控\n- 测试:新增 internal/huya/category_test.go 与 sniper 类目用例;README/WSS_NOTES 补记结论
This commit is contained in:
+197
-39
@@ -90,6 +90,8 @@ type UiConfig = {
|
||||
sid: number
|
||||
pid: number
|
||||
name: string
|
||||
// category 是类目筛选(类目 id 字符串,空串=全部),只影响监控时的自动选品范围。
|
||||
category: string
|
||||
targetText: string
|
||||
maxPrice: number
|
||||
minLeft: number
|
||||
@@ -165,10 +167,33 @@ type PrizeInfo = {
|
||||
percent?: string
|
||||
is_show_num?: number
|
||||
img?: string
|
||||
// tags 是类目 id(逗号分隔):99=限量返场、101=精英专享(以服务端下发的类目字典为准)。
|
||||
tags?: string
|
||||
publish_time?: number
|
||||
start_time?: number
|
||||
end_time?: number
|
||||
daily_start?: string
|
||||
daily_end?: string
|
||||
}
|
||||
|
||||
type PrizeTag = {
|
||||
id: number
|
||||
name: string
|
||||
weight?: number
|
||||
}
|
||||
|
||||
type CategoryStat = {
|
||||
id: number
|
||||
name: string
|
||||
count?: number
|
||||
left?: number
|
||||
total?: number
|
||||
}
|
||||
|
||||
type PrizeCache = {
|
||||
prizes: PrizeInfo[]
|
||||
categories?: PrizeTag[]
|
||||
categoryStats?: CategoryStat[]
|
||||
updatedAt: number
|
||||
sid?: number
|
||||
}
|
||||
@@ -294,6 +319,49 @@ function priceOf(row?: PrizeInfo): number {
|
||||
return row.new_score || row.score || 0
|
||||
}
|
||||
|
||||
// categoryIDsOf 解析奖品 tag14 里的类目 id(服务端可能下发多个,逗号分隔)。
|
||||
function categoryIDsOf(row?: PrizeInfo): number[] {
|
||||
return String(row?.tags || '')
|
||||
.split(',')
|
||||
.map((item) => Number(item.trim()))
|
||||
.filter((id) => Number.isFinite(id) && id > 0)
|
||||
}
|
||||
|
||||
// categoryNamesOf 把类目 id 翻译成类目名;字典里没有时用「类目<id>」兜底。
|
||||
function categoryNamesOf(row: PrizeInfo | undefined, categories: PrizeTag[]): string[] {
|
||||
return categoryIDsOf(row).map((id) => categories.find((tag) => Number(tag.id) === id)?.name || `类目${id}`)
|
||||
}
|
||||
|
||||
function formatDateTime(seconds?: number): string {
|
||||
if (!seconds || seconds <= 0) return ''
|
||||
const date = new Date(seconds * 1000)
|
||||
const pad = (value: number) => String(value).padStart(2, '0')
|
||||
return `${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
|
||||
}
|
||||
|
||||
function formatCountdown(ms: number): string {
|
||||
if (ms <= 0) return ''
|
||||
const total = Math.floor(ms / 1000)
|
||||
const hours = Math.floor(total / 3600)
|
||||
const minutes = Math.floor((total % 3600) / 60)
|
||||
const seconds = total % 60
|
||||
const pad = (value: number) => String(value).padStart(2, '0')
|
||||
return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`
|
||||
}
|
||||
|
||||
// saleStateOf 描述商品的上下架状态:限量返场是「预告上架」,页面的倒计时来自 start_time。
|
||||
function saleStateOf(row: PrizeInfo | undefined, now: Date): { onSale: boolean; label: string; countdown: string } {
|
||||
const start = Number(row?.start_time || 0)
|
||||
if (!start || start <= 0) {
|
||||
return { onSale: true, label: '', countdown: '' }
|
||||
}
|
||||
const remains = start * 1000 - now.getTime()
|
||||
if (remains > 0) {
|
||||
return { onSale: false, label: `${formatDateTime(start)} 上架`, countdown: formatCountdown(remains) }
|
||||
}
|
||||
return { onSale: true, label: '', countdown: '' }
|
||||
}
|
||||
|
||||
type InventoryInfo = {
|
||||
left?: number
|
||||
total?: number
|
||||
@@ -444,19 +512,28 @@ function readSavedPrizeCache(): PrizeCache {
|
||||
: []
|
||||
return {
|
||||
prizes: prizes as PrizeInfo[],
|
||||
categories: Array.isArray(cache.categories) ? (cache.categories as PrizeTag[]) : [],
|
||||
categoryStats: Array.isArray(cache.categoryStats) ? (cache.categoryStats as CategoryStat[]) : [],
|
||||
updatedAt: Number(cache.updatedAt || 0),
|
||||
sid: Number(cache.sid || 0) || undefined,
|
||||
}
|
||||
} catch {
|
||||
return { prizes: [], updatedAt: 0 }
|
||||
return { prizes: [], categories: [], categoryStats: [], updatedAt: 0 }
|
||||
}
|
||||
}
|
||||
|
||||
function writeSavedPrizeCache(prizes: PrizeInfo[], sid: number) {
|
||||
function writeSavedPrizeCache(
|
||||
prizes: PrizeInfo[],
|
||||
sid: number,
|
||||
categories: PrizeTag[] = [],
|
||||
categoryStats: CategoryStat[] = [],
|
||||
) {
|
||||
localStorage.setItem(
|
||||
scopedKey(prizeCacheStorageBase),
|
||||
JSON.stringify({
|
||||
prizes,
|
||||
categories,
|
||||
categoryStats,
|
||||
sid,
|
||||
updatedAt: Date.now(),
|
||||
}),
|
||||
@@ -498,6 +575,7 @@ function pickConfig(values: Partial<UiConfig>): UiConfig {
|
||||
sid: Number(values.sid || 0),
|
||||
pid: Number(values.pid || 0),
|
||||
name: values.name || '',
|
||||
category: values.category || '',
|
||||
targetText: values.targetText || '',
|
||||
maxPrice: Number(values.maxPrice || 0),
|
||||
minLeft: Number(values.minLeft || 0),
|
||||
@@ -552,6 +630,10 @@ export default function Dashboard() {
|
||||
const [accounts, setAccounts] = useState<AccountPreview[]>([])
|
||||
const [selectedAccountLines, setSelectedAccountLines] = useState<Key[]>([])
|
||||
const [prizes, setPrizes] = useState<PrizeInfo[]>([])
|
||||
const [prizeCategories, setPrizeCategories] = useState<PrizeTag[]>([])
|
||||
const [categoryStats, setCategoryStats] = useState<CategoryStat[]>([])
|
||||
// activeCategory 是当前选中的类目(空串=全部);监控时的自动选品也按它过滤。
|
||||
const [activeCategory, setActiveCategory] = useState('')
|
||||
const [selectedPrizeKeys, setSelectedPrizeKeys] = useState<Key[]>([])
|
||||
const [productSearch, setProductSearch] = useState('')
|
||||
const [scores, setScores] = useState<ScoreResult[]>([])
|
||||
@@ -639,13 +721,17 @@ export default function Dashboard() {
|
||||
|
||||
const savedCookies = readSavedCookies()
|
||||
const savedPrizeCache = readSavedPrizeCache()
|
||||
const savedConfig = readSavedConfig()
|
||||
form.setFieldsValue({
|
||||
...(defaults as UiConfig),
|
||||
...readSavedConfig(),
|
||||
...savedConfig,
|
||||
cookieText: cookieTextFromEntries(savedCookies),
|
||||
})
|
||||
setCookieEntries(savedCookies)
|
||||
setActiveCategory(String(savedConfig.category || ''))
|
||||
setPrizes(savedPrizeCache.prizes)
|
||||
setPrizeCategories(savedPrizeCache.categories || [])
|
||||
setCategoryStats(savedPrizeCache.categoryStats || [])
|
||||
setPrizeCacheUpdatedAt(savedPrizeCache.updatedAt)
|
||||
setLogs((prev) => mergeLogs(prev, (logItems || []) as LogEntry[]))
|
||||
setLogPath(String(savedLogPath || instance?.logFile || ''))
|
||||
@@ -785,16 +871,30 @@ export default function Dashboard() {
|
||||
|
||||
const filteredPrizes = useMemo(() => {
|
||||
const keyword = productSearch.trim().toLowerCase()
|
||||
if (!keyword) return prizes
|
||||
return prizes.filter(
|
||||
(item) =>
|
||||
item.name.toLowerCase().includes(keyword) ||
|
||||
String(item.id).includes(keyword) ||
|
||||
String(priceOf(item)).includes(keyword),
|
||||
)
|
||||
}, [prizes, productSearch])
|
||||
const categoryID = Number(activeCategory || 0)
|
||||
return prizes.filter((item) => {
|
||||
if (categoryID > 0 && !categoryIDsOf(item).includes(categoryID)) return false
|
||||
if (!keyword) return true
|
||||
const text = [item.name, String(item.id), String(priceOf(item)), ...categoryNamesOf(item, prizeCategories)]
|
||||
.join(' ')
|
||||
.toLowerCase()
|
||||
return text.includes(keyword)
|
||||
})
|
||||
}, [prizes, productSearch, activeCategory, prizeCategories])
|
||||
const inventorySummary = useMemo(() => summarizeInventory(filteredPrizes), [filteredPrizes])
|
||||
|
||||
// 类目页签与服务端下发的类目字典同序(限量返场/精英专享),数量优先用服务端统计。
|
||||
const categoryItems = useMemo(() => {
|
||||
const items = [{ key: '', label: `全部 ${prizes.length}` }]
|
||||
prizeCategories.forEach((tag) => {
|
||||
const id = Number(tag.id)
|
||||
const stat = categoryStats.find((item) => Number(item.id) === id)
|
||||
const count = stat?.count ?? prizes.filter((item) => categoryIDsOf(item).includes(id)).length
|
||||
items.push({ key: String(id), label: `${tag.name} ${count}` })
|
||||
})
|
||||
return items
|
||||
}, [prizeCategories, categoryStats, prizes])
|
||||
|
||||
// 日志筛选只在界面上生效;后端的 debug 开关由「调试日志」按钮控制。
|
||||
const visibleLogs = useMemo(
|
||||
() => (logFilter === 'all' ? logs : logs.filter((item) => item.level === logFilter)),
|
||||
@@ -803,6 +903,7 @@ export default function Dashboard() {
|
||||
|
||||
const config = () => ({
|
||||
...pickConfig(form.getFieldsValue(true)),
|
||||
category: activeCategory,
|
||||
selectedAccountLines: selectedAccountLines.map(Number).filter((line) => line > 0),
|
||||
})
|
||||
|
||||
@@ -954,20 +1055,34 @@ export default function Dashboard() {
|
||||
setLoading('list')
|
||||
ListPrizes(config())
|
||||
.then((data) => {
|
||||
const result = data as { prizes?: PrizeInfo[] }
|
||||
const result = data as {
|
||||
prizes?: PrizeInfo[]
|
||||
categories?: PrizeTag[]
|
||||
categoryStats?: CategoryStat[]
|
||||
}
|
||||
const nextPrizes = result?.prizes || []
|
||||
if (nextPrizes.length === 0) {
|
||||
if (!quiet) message.warning('当前 CK 未返回可选商品')
|
||||
return
|
||||
}
|
||||
const nextCategories = result?.categories || []
|
||||
const nextStats = result?.categoryStats || []
|
||||
const updatedAt = Date.now()
|
||||
setPrizes(nextPrizes)
|
||||
setPrizeCategories(nextCategories)
|
||||
setCategoryStats(nextStats)
|
||||
setActiveCategory((prev) =>
|
||||
prev && nextCategories.some((tag) => String(tag.id) === prev) ? prev : '',
|
||||
)
|
||||
setPrizeCacheUpdatedAt(updatedAt)
|
||||
writeSavedPrizeCache(nextPrizes, Number(form.getFieldValue('sid') || 0))
|
||||
writeSavedPrizeCache(nextPrizes, Number(form.getFieldValue('sid') || 0), nextCategories, nextStats)
|
||||
setSelectedPrizeKeys((prev) =>
|
||||
prev.filter((key) => nextPrizes.some((item) => item.id === Number(key))),
|
||||
)
|
||||
if (!quiet) message.success('商品已刷新')
|
||||
if (!quiet) {
|
||||
const summary = nextStats.map((item) => `${item.name} ${item.count ?? 0}`).join(' / ')
|
||||
message.success(summary ? `商品已刷新:${summary}` : '商品已刷新')
|
||||
}
|
||||
})
|
||||
.catch((err: unknown) => {
|
||||
if (!quiet) message.error(String(err))
|
||||
@@ -991,6 +1106,9 @@ export default function Dashboard() {
|
||||
onOk: () => {
|
||||
localStorage.removeItem(scopedKey(prizeCacheStorageBase))
|
||||
setPrizes([])
|
||||
setPrizeCategories([])
|
||||
setCategoryStats([])
|
||||
setActiveCategory('')
|
||||
setSelectedPrizeKeys([])
|
||||
setPrizeCacheUpdatedAt(0)
|
||||
message.success('商品缓存已清空')
|
||||
@@ -1006,6 +1124,7 @@ export default function Dashboard() {
|
||||
sid: values.sid,
|
||||
pid: values.pid,
|
||||
name: values.name,
|
||||
category: values.category,
|
||||
targetText: values.targetText,
|
||||
maxPrice: values.maxPrice,
|
||||
minLeft: values.minLeft,
|
||||
@@ -1470,7 +1589,17 @@ export default function Dashboard() {
|
||||
onSearch={setProductSearch}
|
||||
/>
|
||||
|
||||
<CurrentProduct prize={currentPrize} />
|
||||
{categoryItems.length > 1 ? (
|
||||
<Tabs
|
||||
className="category-tabs"
|
||||
size="small"
|
||||
activeKey={activeCategory}
|
||||
onChange={(key) => setActiveCategory(String(key))}
|
||||
items={categoryItems}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
<CurrentProduct prize={currentPrize} now={now} categories={prizeCategories} />
|
||||
|
||||
<div className="inventory-line">
|
||||
<span>商品缓存 {filteredPrizes.length} 个</span>
|
||||
@@ -1485,29 +1614,44 @@ export default function Dashboard() {
|
||||
<span>导入有效 CK 后刷新最新商品</span>
|
||||
</div>
|
||||
) : (
|
||||
filteredPrizes.map((item) => (
|
||||
<button
|
||||
type="button"
|
||||
className={`product-row ${selectedPrizeKeys.includes(item.id) ? 'selected' : ''}`}
|
||||
key={item.id}
|
||||
onClick={() => applyPrizeSelection([item.id])}
|
||||
>
|
||||
<div className="product-thumb">
|
||||
{item.img ? (
|
||||
<img src={item.img} alt="" />
|
||||
) : (
|
||||
<span>{String(item.id).slice(-2)}</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="product-meta">
|
||||
<strong>{item.name}</strong>
|
||||
<div className="product-tags">
|
||||
<Tag color="gold">{priceOf(item)} 积分</Tag>
|
||||
<InventoryTags prize={item} compact />
|
||||
filteredPrizes.map((item) => {
|
||||
const sale = saleStateOf(item, now)
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
className={`product-row ${selectedPrizeKeys.includes(item.id) ? 'selected' : ''}`}
|
||||
key={item.id}
|
||||
onClick={() => applyPrizeSelection([item.id])}
|
||||
>
|
||||
<div className="product-thumb">
|
||||
{item.img ? (
|
||||
<img src={item.img} alt="" />
|
||||
) : (
|
||||
<span>{String(item.id).slice(-2)}</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
))
|
||||
<div className="product-meta">
|
||||
<strong>{item.name}</strong>
|
||||
<div className="product-tags">
|
||||
<Tag color="gold">{priceOf(item)} 积分</Tag>
|
||||
{categoryNamesOf(item, prizeCategories).map((name) => (
|
||||
<Tag key={name} color="purple">
|
||||
{name}
|
||||
</Tag>
|
||||
))}
|
||||
{sale.onSale ? (
|
||||
<InventoryTags prize={item} compact />
|
||||
) : (
|
||||
<Tag color="orange">{sale.label}</Tag>
|
||||
)}
|
||||
</div>
|
||||
{sale.onSale ? null : (
|
||||
<span className="product-hint">{sale.countdown} 后上架</span>
|
||||
)}
|
||||
</div>
|
||||
</button>
|
||||
)
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
</aside>
|
||||
@@ -1870,8 +2014,17 @@ function InventoryTags({ prize, compact = false }: { prize?: PrizeInfo; compact?
|
||||
)
|
||||
}
|
||||
|
||||
function CurrentProduct({ prize }: { prize?: PrizeInfo }) {
|
||||
function CurrentProduct({
|
||||
prize,
|
||||
now,
|
||||
categories,
|
||||
}: {
|
||||
prize?: PrizeInfo
|
||||
now: Date
|
||||
categories: PrizeTag[]
|
||||
}) {
|
||||
const name = prize?.name || '未从 CK 列表选择'
|
||||
const sale = saleStateOf(prize, now)
|
||||
return (
|
||||
<div className="current-product">
|
||||
<span>当前商品</span>
|
||||
@@ -1881,7 +2034,12 @@ function CurrentProduct({ prize }: { prize?: PrizeInfo }) {
|
||||
<>
|
||||
<Tag color="gold">{priceOf(prize)} 积分</Tag>
|
||||
<Tag>PID {prize.id}</Tag>
|
||||
<InventoryTags prize={prize} />
|
||||
{categoryNamesOf(prize, categories).map((item) => (
|
||||
<Tag key={item} color="purple">
|
||||
{item}
|
||||
</Tag>
|
||||
))}
|
||||
{sale.onSale ? <InventoryTags prize={prize} /> : <Tag color="orange">{sale.label}</Tag>}
|
||||
</>
|
||||
) : (
|
||||
<Tag>CK 商品源</Tag>
|
||||
|
||||
@@ -185,6 +185,26 @@ body {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.category-tabs {
|
||||
margin: -4px 0 0;
|
||||
}
|
||||
|
||||
.category-tabs .ant-tabs-nav {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.category-tabs .ant-tabs-tab {
|
||||
padding: 6px 0;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.product-hint {
|
||||
display: block;
|
||||
margin-top: 4px;
|
||||
color: #d46b08;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.desk {
|
||||
display: grid;
|
||||
min-width: 0;
|
||||
|
||||
Reference in New Issue
Block a user