fix(semi-auto): 换绑未生效原因与 7 天冷却提示

This commit is contained in:
2026-11-16 13:30:26 +08:00
parent 19367bdfdf
commit 5aa627a0ca
10 changed files with 781 additions and 93 deletions
@@ -727,6 +727,24 @@ export default function AdminSemiAutoTasksPage() {
{formatAdminDateTime(event.createdAt)} · {event.actorType}
{event.actorId ? ` ${event.actorId}` : ''}
</Text>
{event.eventType === 'binding_status_changed' && event.detail?.message ? (
<Text
type={
event.detail.rebindUnchanged === true ||
Number(event.detail.rebindCooldownDays || 0) > 0
? 'warning'
: 'secondary'
}
>
{String(event.detail.message)}
{Number(event.detail.rebindCooldownDays || 0) > 0 &&
event.detail.nextRebindAt
? ` · 下次可换绑 ${formatAdminDateTime(
String(event.detail.nextRebindAt),
)}`
: ''}
</Text>
) : null}
</Space>
),
}))}
@@ -1,5 +1,6 @@
import {
CheckCircleFilled,
ExclamationCircleOutlined,
LoadingOutlined,
QrcodeOutlined,
ReloadOutlined,
@@ -303,6 +304,8 @@ export default function CustomerFulfillmentPage() {
useEffect(() => {
if (!selectedTask || selectedTask.bindingStatus !== 'role_ready') return
if (!bindingInfo?.comparison) return
// 换绑后仍是原角色时只展示失败原因,不能自动弹出确认框。
if (bindingInfo.rebindUnchanged) return
const key = `${selectedTask.id}:${bindingInfo.bindGameRoleId || ''}`
if (autoOpenedRoleRef.current === key) return
autoOpenedRoleRef.current = key
@@ -494,13 +497,44 @@ export default function CustomerFulfillmentPage() {
setBindingLoading(true)
try {
const response = await pollCustomerBinding(orderNo, selectedTask.id)
setTasks((current) =>
current.map((task) => (task.id === response.data.task.id ? response.data.task : task)),
)
if (response.data.binding) setBindingInfo(response.data.binding)
if (openConfirm || response.data.task.bindingStatus === 'role_ready') {
const nextTask = response.data.task
const nextBinding = response.data.binding
setTasks((current) => current.map((task) => (task.id === nextTask.id ? nextTask : task)))
if (nextBinding) setBindingInfo(nextBinding)
if (nextTask.bindingStatus === 'role_ready') {
if (nextBinding?.rebindUnchanged) {
setBindingConfirmOpen(false)
message.warning(nextBinding.message || '换绑未生效,请查看下方原因')
return
}
setBindingConfirmOpen(true)
return
}
if (nextTask.bindingStatus === 'confirmed') {
setBindingConfirmOpen(false)
message.success('绑定已确认,等待客服处理')
return
}
// 弹窗内点「刷新」:角色不再是待确认状态时收起弹窗,避免展示过期比对。
if (openConfirm) setBindingConfirmOpen(false)
const detail = nextBinding?.message || ''
if (nextTask.bindingStatus === 'scanned') {
message.info(detail || '已扫码,正在等待虎牙平台换绑生效,请稍后再点击刷新')
return
}
if (nextTask.bindingStatus === 'qr_pending') {
message.warning('还没有检测到扫码记录,请使用微信扫码完成绑定后再点击')
return
}
if (nextTask.bindingStatus === 'expired') {
message.warning('绑定二维码已过期,请点击「刷新二维码」重新获取')
return
}
if (nextTask.bindingStatus === 'failed') {
message.error(detail || '识别绑定角色失败,请点击「刷新二维码」重试')
return
}
message.info(detail || '绑定状态还没有更新,请稍后再试')
} catch (error) {
if (isHuyaSessionExpired(error)) {
setBindingSessionExpired(true)
@@ -595,7 +629,8 @@ export default function CustomerFulfillmentPage() {
selectedTask &&
selectedTask.platform === 'huya' &&
selectedTask.loginStatus === 'authenticated' &&
selectedTask.bindingStatus !== 'confirmed',
selectedTask.executionStatus !== 'completed' &&
selectedTask.executionStatus !== 'cancelled',
)
const bindingQrVisible = ['not_started', 'qr_pending', 'scanned'].includes(
selectedTask?.bindingStatus || '',
@@ -610,6 +645,11 @@ export default function CustomerFulfillmentPage() {
return /^\d+$/.test(huyaUid) ? huyaUid : comparisonId
})()
const bindingRoleName = bindingInfo?.bindGameRole || selectedTask?.bindGameRole || ''
const rebindUnchanged = bindingInfo?.rebindUnchanged === true
const rebindCooldownDays = Number(bindingInfo?.rebindCooldownDays || 0)
const nextRebindText = bindingInfo?.nextRebindAt
? formatAdminDateTime(bindingInfo.nextRebindAt)
: ''
const showProfileForm = showBindingStage && profileEditing
const bindingCustomerReady = Boolean(
bindingComparison?.customerRoleId || bindingComparison?.customerRoleName,
@@ -949,59 +989,76 @@ export default function CustomerFulfillmentPage() {
) : null}
{!bindingSessionExpired ? (
!bindingRoleId ? (
<div className="customer-binding-alert is-warning">
未获取到已绑定的角色ID,请重新扫码绑定
</div>
) : (
rebindUnchanged ? (
<div className="customer-binding-alert is-warning">换绑未生效,请查看下方原因</div>
) : selectedTask?.bindingStatus === 'role_ready' ? (
<div className="customer-binding-alert is-info">已识别绑定角色,请核对后确认</div>
) : selectedTask?.bindingStatus === 'confirmed' || bindingRoleId ? (
<div className="customer-binding-alert is-info">
登录成功,请继续扫码绑定游戏角色
</div>
) : (
<div className="customer-binding-alert is-warning">
未获取到已绑定的角色ID,请重新扫码绑定
</div>
)
) : null}
{showProfileForm && !bindingSessionExpired ? (
<div className="customer-auth-profile" id="customer-profile-form">
<p>修改资料后会重新核对平台识别角色。</p>
<Space direction="vertical" size={10} style={{ width: '100%' }}>
<div className="customer-profile-form">
<label className="customer-collect-label">
区服 <span>*</span>
</label>
<Select
className="customer-collect-select"
classNames={SERVER_ZONE_SELECT_CLASS_NAMES}
value={profileServerZone || undefined}
onChange={(value) => setProfileServerZone(String(value))}
placeholder="区服(必填)"
placeholder="请选择区服"
options={SERVER_ZONE_OPTIONS.map((value) => ({ value, label: value }))}
/>
<label className="customer-collect-label">
游戏编号 <span>*</span>
</label>
<Input
className="customer-collect-input"
value={profileRoleId}
onChange={(event) => setProfileRoleId(event.target.value)}
placeholder="游戏编号 / 角色 ID(必填,纯数字)"
placeholder="请输入游戏编号"
maxLength={64}
inputMode="numeric"
/>
<label className="customer-collect-label">
角色名 <span>*</span>
</label>
<Input
className="customer-collect-input"
value={profileRoleName}
onChange={(event) => setProfileRoleName(event.target.value)}
placeholder="角色名(必填)"
placeholder="请输入角色名"
maxLength={100}
/>
<Button
type="primary"
block
size="large"
className="customer-collect-submit"
loading={profileSaving}
onClick={() => void handleSaveProfile()}
>
保存角色资料
提交资料
</Button>
</Space>
</div>
</div>
) : null}
{bindingQrVisible && !bindingSessionExpired ? (
<div className="customer-binding-qr-card">
<h3>游戏角色绑定二维码</h3>
{bindingQrImage || bindingInfo?.qrImage ? (
{bindingInfo?.qrImage || bindingQrImage ? (
<Image
src={bindingQrImage || bindingInfo?.qrImage || ''}
src={bindingInfo?.qrImage || bindingQrImage || ''}
alt="游戏角色绑定二维码"
width={260}
preview={false}
@@ -1013,10 +1070,20 @@ export default function CustomerFulfillmentPage() {
</div>
)}
<p className="customer-binding-qr-hint">请使用微信APP扫码进行游戏角色绑定</p>
<p className="customer-binding-qr-tip">手机端可长按二维码或截图保存图片再识别</p>
<p className="customer-binding-qr-tip">
{selectedTask?.bindingStatus === 'scanned'
? '请在微信中完成角色绑定确认,再点击下方按钮进入下一步'
: '扫码后请在微信确认框中核对目标角色;本活动 7 天内只能换绑 1 次'}
</p>
{rebindCooldownDays > 0 ? (
<p className="customer-binding-qr-tip">
平台提示:预计下次可换绑
{nextRebindText ? ` ${nextRebindText}` : '需等待 7 天'};本次扫码可能不会生效。
</p>
) : null}
<p className="customer-binding-qr-countdown">
{selectedTask?.bindingStatus === 'scanned'
? '已扫码,等待角色生效'
? bindingInfo?.message || '已扫码,等待角色生效'
: `建议 ${formatCountdown(bindingSecondsLeft)} 内完成扫码`}
</p>
<div className="customer-binding-qr-actions">
@@ -1031,6 +1098,7 @@ export default function CustomerFulfillmentPage() {
block
size="large"
className="customer-binding-next"
loading={bindingLoading}
onClick={() => void handlePollBindingNow()}
>
已扫码绑定,点击进入下一步
@@ -1070,15 +1138,41 @@ export default function CustomerFulfillmentPage() {
{selectedTask?.bindingStatus === 'role_ready' && !bindingSessionExpired ? (
<Space direction="vertical" size={12} style={{ width: '100%' }}>
<Alert
type="success"
showIcon
message={bindingRoleName ? `已识别角色:${bindingRoleName}` : '已识别绑定角色'}
description={[bindingInfo?.bindGameAccount, bindingInfo?.bindGameChannel]
.filter(Boolean)
.join(' · ')}
/>
{!bindingRoleId ? (
{rebindUnchanged ? (
<Alert
type="warning"
showIcon
message="换绑未生效"
description={
<Space direction="vertical" size={2}>
<span>
扫码已完成,但平台仍返回原绑定角色:
{bindingRoleName || '未识别到角色'}
</span>
{rebindCooldownDays > 0 ? (
<span>
原因:本活动 7 天内只能换绑 1 次
{nextRebindText ? `,预计下次可换绑:${nextRebindText}` : ''}。
</span>
) : (
<span>
请在微信确认框中核对目标角色后重新换绑;如持续失败请联系客服。
</span>
)}
</Space>
}
/>
) : (
<Alert
type="success"
showIcon
message={bindingRoleName ? `已识别角色:${bindingRoleName}` : '已识别绑定角色'}
description={[bindingInfo?.bindGameAccount, bindingInfo?.bindGameChannel]
.filter(Boolean)
.join(' · ')}
/>
)}
{!bindingPendingUid && !rebindUnchanged ? (
<Alert
type="warning"
showIcon
@@ -1086,29 +1180,76 @@ export default function CustomerFulfillmentPage() {
description="没有角色 ID 时无法自动核对,请联系客服人工核实后再确认。"
/>
) : null}
<Space wrap>
<Button
type="primary"
loading={bindingLoading}
onClick={() => setBindingConfirmOpen(true)}
>
确认绑定角色
</Button>
<Button
danger
loading={bindingLoading}
onClick={() => void handleRefreshBinding(true)}
>
角色不对,重新扫码换绑
</Button>
</Space>
{rebindUnchanged ? (
<div className="customer-binding-role-actions">
<Button
block
size="large"
className="customer-binding-confirm"
loading={bindingLoading}
onClick={() => void handleRefreshBinding(true)}
>
重新扫码换绑
</Button>
<Button
block
size="large"
className="customer-binding-rebind"
icon={<ReloadOutlined />}
loading={bindingLoading}
onClick={() => void handlePollBindingNow()}
>
刷新绑定状态
</Button>
</div>
) : (
<div className="customer-binding-role-actions">
<Button
block
size="large"
className="customer-binding-confirm"
loading={bindingLoading}
onClick={() => setBindingConfirmOpen(true)}
>
确认绑定角色
</Button>
<Button
block
size="large"
className="customer-binding-rebind"
icon={<ExclamationCircleOutlined />}
loading={bindingLoading}
onClick={() => void handleRefreshBinding(true)}
>
角色不对,重新扫码换绑
</Button>
</div>
)}
</Space>
) : null}
{selectedTask?.bindingStatus === 'confirmed' ? (
<div className="customer-binding-verify">
<p>绑定状态需要平台人工核实,请联系客服处理</p>
<Button
block
size="large"
className="customer-login-alt"
loading={bindingLoading}
onClick={() => {
setBindingLoading(true)
void load(true).finally(() => setBindingLoading(false))
}}
>
刷新绑定状态
</Button>
</div>
) : null}
</section>
) : null}
{selectedTask?.loginStatus === 'authenticated' &&
(isWeibo || selectedTask.bindingStatus === 'confirmed') &&
{isWeibo &&
selectedTask?.loginStatus === 'authenticated' &&
selectedTask.executionStatus !== 'completed' ? (
<div className="customer-auth-state is-waiting">
<div className="customer-auth-state-icon">
@@ -1127,7 +1268,9 @@ export default function CustomerFulfillmentPage() {
) : null}
<Modal
open={bindingConfirmOpen && selectedTask?.bindingStatus === 'role_ready'}
open={
bindingConfirmOpen && selectedTask?.bindingStatus === 'role_ready' && !rebindUnchanged
}
title="确认绑定角色"
onCancel={() => {
if (!bindingLoading) setBindingConfirmOpen(false)
@@ -1152,7 +1295,9 @@ export default function CustomerFulfillmentPage() {
</Button>
</div>
{bindingComparison?.verdict === 'mismatch' ? (
<p className="customer-binding-modal-error">两侧角色ID不一致,无法确认绑定</p>
<p className="customer-binding-modal-error">
{bindingComparison?.message || '两侧角色信息不一致,无法确认绑定'}
</p>
) : bindingComparison?.verdict === 'unknown' ? (
<p className="customer-binding-modal-warning">两侧角色信息不完整,请联系客服核实</p>
) : null}
+152 -7
View File
@@ -1855,7 +1855,7 @@
}
.customer-auth-page .ant-btn-primary {
color: #111827;
color: #fff;
border-color: var(--auth-accent);
background: var(--auth-accent);
font-weight: 700;
@@ -1863,7 +1863,7 @@
}
.customer-auth-page .ant-btn-primary:hover {
color: #111827 !important;
color: #fff !important;
border-color: var(--auth-accent-hover) !important;
background: var(--auth-accent-hover) !important;
}
@@ -2087,7 +2087,13 @@
font-size: 13px;
}
.customer-auth-profile,
.customer-auth-profile {
padding: 16px;
border: 1px solid #3a4150;
border-radius: 12px;
background: #212733;
}
.customer-auth-profile-summary {
padding: 14px;
border: 1px solid rgba(255, 255, 255, 0.14);
@@ -2096,12 +2102,22 @@
}
.customer-auth-profile > p {
margin: 0 0 10px;
color: var(--auth-muted);
margin: 0 0 12px;
color: #9aa3b2;
font-size: 13px;
line-height: 1.6;
}
.customer-profile-form {
display: flex;
flex-direction: column;
gap: 12px;
}
.customer-profile-form .customer-collect-label {
margin-top: 2px;
}
.customer-auth-profile-summary {
display: flex;
flex-wrap: wrap;
@@ -2322,7 +2338,8 @@
font-weight: 600;
}
.customer-collect-page .customer-collect-submit.ant-btn {
.customer-collect-page .customer-collect-submit.ant-btn,
.customer-auth-profile .customer-collect-submit.ant-btn {
height: 56px;
margin-top: 14px;
border-radius: 14px;
@@ -2343,7 +2360,9 @@
}
.customer-collect-page .customer-collect-submit.ant-btn:hover,
.customer-collect-page .customer-collect-submit.ant-btn:focus-visible {
.customer-collect-page .customer-collect-submit.ant-btn:focus-visible,
.customer-auth-profile .customer-collect-submit.ant-btn:hover,
.customer-auth-profile .customer-collect-submit.ant-btn:focus-visible {
background: #1d4ed8 !important;
border-color: #1d4ed8 !important;
color: #fff !important;
@@ -2479,6 +2498,114 @@
padding: 16px;
}
/* antd Alert 在绑定阶段统一走深色卡片,避免浅色块破坏整体深色风格 */
.customer-binding-stage .ant-alert {
align-items: flex-start;
padding: 12px 14px;
border: 1px solid #3a4150;
border-radius: 12px;
background: #212733;
}
.customer-binding-stage .ant-alert .ant-alert-message {
color: #e2e8f0;
font-size: 14px;
font-weight: 600;
}
.customer-binding-stage .ant-alert .ant-alert-description {
color: #cbd5e1;
font-size: 13px;
line-height: 1.6;
}
.customer-binding-stage .ant-alert-warning {
border-color: #78350f;
background: rgba(120, 53, 15, 0.22);
}
.customer-binding-stage .ant-alert-warning .ant-alert-icon,
.customer-binding-stage .ant-alert-warning .ant-alert-message {
color: #fbbf24;
}
.customer-binding-stage .ant-alert-warning .ant-alert-description {
color: #fcd34d;
}
.customer-binding-stage .ant-alert-error {
border-color: #7f1d1d;
background: rgba(127, 29, 29, 0.24);
}
.customer-binding-stage .ant-alert-error .ant-alert-icon,
.customer-binding-stage .ant-alert-error .ant-alert-message {
color: #fca5a5;
}
.customer-binding-stage .ant-alert-error .ant-alert-description {
color: #fecaca;
}
.customer-binding-stage .ant-alert-success {
border-color: #065f46;
background: rgba(6, 78, 59, 0.28);
}
.customer-binding-stage .ant-alert-success .ant-alert-icon,
.customer-binding-stage .ant-alert-success .ant-alert-message {
color: #6ee7b7;
}
.customer-binding-stage .ant-alert-success .ant-alert-description {
color: #a7f3d0;
}
.customer-binding-role-actions {
display: flex;
flex-direction: column;
gap: 12px;
width: 100%;
}
.customer-binding-role-actions .customer-binding-confirm.ant-btn {
height: 56px;
border-radius: 14px;
background: #2563eb !important;
border-color: #2563eb !important;
color: #fff !important;
font-size: 17px;
font-weight: 600;
}
.customer-binding-role-actions .customer-binding-confirm.ant-btn:hover,
.customer-binding-role-actions .customer-binding-confirm.ant-btn:focus-visible {
background: #1d4ed8 !important;
border-color: #1d4ed8 !important;
color: #fff !important;
}
.customer-binding-role-actions .customer-binding-rebind.ant-btn {
height: 56px;
border-radius: 14px;
background: transparent !important;
border-color: #3a4150 !important;
color: #cbd5e1 !important;
font-size: 16px;
font-weight: 500;
}
.customer-binding-role-actions .customer-binding-rebind.ant-btn .anticon {
color: #f59e0b;
}
.customer-binding-role-actions .customer-binding-rebind.ant-btn:hover,
.customer-binding-role-actions .customer-binding-rebind.ant-btn:focus-visible {
background: rgba(245, 158, 11, 0.08) !important;
border-color: #b45309 !important;
color: #fbbf24 !important;
}
.customer-binding-info {
padding: 16px;
border: 1px solid #3a4150;
@@ -2543,6 +2670,24 @@
background: rgba(30, 58, 138, 0.3);
}
.customer-binding-verify {
padding: 18px;
border: 1px solid #3a4150;
border-radius: 12px;
background: transparent;
display: flex;
flex-direction: column;
gap: 16px;
text-align: center;
}
.customer-binding-verify p {
margin: 0;
color: #e5e7eb;
font-size: 16px;
line-height: 1.6;
}
.customer-binding-qr-card {
padding: 18px;
border-radius: 12px;
@@ -57,6 +57,11 @@ export type CustomerBindingInfo = {
bindGameChannel: string
hasExistingBinding: boolean
rebindRequested: boolean
rebindUnchanged: boolean
rebindCooldownDays: number
nextRebindAt: string
platformChangeBindDay?: number
platformChangeBindTime?: number
message: string
comparison: CustomerBindingComparison
}