diff --git a/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx b/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx index f459a765..969b1c1e 100644 --- a/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx +++ b/apps/frontend/src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx @@ -340,8 +340,7 @@ export default function CustomerFulfillmentPage() { if (!bindingInfo?.comparison) return // 换绑后仍是原角色时只展示失败原因,不能自动弹出确认框。 if (bindingInfo.rebindUnchanged) return - // 平台角色与已填资料不一致时先引导同步资料,不能直接弹确认框。 - if (bindingInfo.comparison.verdict === 'mismatch') return + // 识别到角色(含与资料不一致)都要弹出对比框,由客户选择修改资料或同步平台角色。 const key = `${selectedTask.id}:${bindingInfo.bindGameRoleId || ''}` if (autoOpenedRoleRef.current === key) return autoOpenedRoleRef.current = key @@ -536,6 +535,14 @@ export default function CustomerFulfillmentPage() { } } + /** + * 二维码区的刷新/重新获取:换绑流程必须 forceRebind。 + * 否则后端发现账号已有绑定角色会直接返回已有角色(role_ready),页面看起来像「返回上一步」。 + */ + function handleRefreshBindingQr() { + void handleRefreshBinding(bindingInfo?.rebindRequested === true) + } + async function handlePollBindingNow(openConfirm = false) { if (!selectedTask) return setBindingLoading(true) @@ -556,13 +563,7 @@ export default function CustomerFulfillmentPage() { } return } - if (nextBinding?.comparison?.verdict === 'mismatch') { - setBindingConfirmOpen(false) - message.warning( - nextBinding.comparison.message || '平台角色与已填资料不一致,请先同步资料', - ) - return - } + // 资料不一致同样打开对比框,客户可在弹窗内修改资料或同步平台角色。 setBindingConfirmOpen(true) return } @@ -668,6 +669,7 @@ export default function CustomerFulfillmentPage() { ) const bindingResponse = await pollCustomerBinding(orderNo, selectedTask.id) if (bindingResponse.data.binding) setBindingInfo(bindingResponse.data.binding) + reopenBindingConfirm(bindingResponse.data.task, bindingResponse.data.binding) message.success('资料已按平台角色同步,请核对后确认绑定') } catch (error) { message.error(error instanceof Error ? error.message : '同步角色资料失败') @@ -721,6 +723,29 @@ export default function CustomerFulfillmentPage() { }) } + /** 资料变更后重新打开对比弹窗,让客户基于最新两侧信息再次核对。 */ + function reopenBindingConfirm( + nextTask: CustomerSemiAutoTask, + nextBinding: CustomerBindingInfo | null | undefined, + ) { + if (nextTask.bindingStatus !== 'role_ready') return false + if (!nextBinding?.comparison || nextBinding.rebindUnchanged) return false + autoOpenedRoleRef.current = `${nextTask.id}:${nextBinding.bindGameRoleId || ''}` + setBindingConfirmOpen(true) + return true + } + + /** 从对比弹窗回到资料表单,保存成功后会自动重新打开对比。 */ + function openProfileEditor() { + setBindingConfirmOpen(false) + setProfileEditing(true) + window.setTimeout(() => { + document + .getElementById('customer-profile-form') + ?.scrollIntoView({ behavior: 'smooth', block: 'center' }) + }, 0) + } + async function handleSaveProfile() { if (!selectedTask) return if (!profileServerZone.trim() || !profileRoleId.trim() || !profileRoleName.trim()) { @@ -742,13 +767,15 @@ export default function CustomerFulfillmentPage() { current.map((task) => (task.id === response.data.task.id ? response.data.task : task)), ) setProfileEditing(false) + let reopened = false try { const bindingResponse = await pollCustomerBinding(orderNo, selectedTask.id) if (bindingResponse.data.binding) setBindingInfo(bindingResponse.data.binding) + reopened = reopenBindingConfirm(bindingResponse.data.task, bindingResponse.data.binding) } catch { // 绑定尚未开始时没有 binding,可忽略。 } - message.success('角色资料已保存') + message.success(reopened ? '角色资料已保存,请重新核对绑定角色' : '角色资料已保存') } catch (error) { message.error(error instanceof Error ? error.message : '保存角色资料失败') } finally { @@ -866,6 +893,12 @@ export default function CustomerFulfillmentPage() { const bindingCustomerReady = Boolean( bindingComparison?.customerRoleId || bindingComparison?.customerRoleName, ) + // 平台角色名、数字角色 ID、区服齐全时,才支持一键同步为平台角色。 + const canSyncBindingProfile = Boolean( + bindingComparison?.boundRoleName && + /^\d+$/.test(String(bindingComparison?.boundRoleId || '').trim()) && + bindingComparison?.boundZone, + ) const needsProfileCollection = Boolean( selectedTask && selectedTask.platform === 'huya' && @@ -1233,6 +1266,9 @@ export default function CustomerFulfillmentPage() { ? '该虎牙账号还没有绑定游戏角色,请用微信扫码完成绑定' : '请使用微信APP扫码进行游戏角色绑定'}

+

+ 扫码后系统会核对平台角色与已填资料;不一致时可修改资料或同步平台角色。 +

{selectedTask?.bindingStatus === 'scanned' ? rebindAccepted @@ -1258,7 +1294,7 @@ export default function CustomerFulfillmentPage() { - @@ -1297,7 +1333,7 @@ export default function CustomerFulfillmentPage() { message="绑定二维码已过期" description="请重新获取绑定二维码后再扫码,已填写的订单资料不会丢失。" action={ - } @@ -1313,7 +1349,7 @@ export default function CustomerFulfillmentPage() { bindingInfo?.message || '请刷新二维码后重新扫码,如持续失败请联系客服。' } action={ - } @@ -1592,6 +1628,16 @@ export default function CustomerFulfillmentPage() { 确认绑定 + {bindingComparison?.verdict === 'mismatch' ? ( +

+ + {canSyncBindingProfile ? ( + + ) : null} +
+ ) : null} {bindingComparison?.verdict === 'mismatch' ? (

{bindingComparison?.message || '两侧角色信息不一致,无法确认绑定'} @@ -1609,19 +1655,7 @@ export default function CustomerFulfillmentPage() {

您填写的角色 -
diff --git a/apps/frontend/src/styles/client.css b/apps/frontend/src/styles/client.css index 369281e0..1b341f6d 100644 --- a/apps/frontend/src/styles/client.css +++ b/apps/frontend/src/styles/client.css @@ -2901,6 +2901,10 @@ border-radius: 8px; } +.customer-binding-modal-actions.is-mismatch { + grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); +} + .customer-binding-modal-error { margin: 0; color: #dc2626; diff --git a/apps/frontend/tests/customer-fulfillment-binding-compare.test.ts b/apps/frontend/tests/customer-fulfillment-binding-compare.test.ts new file mode 100644 index 00000000..a26107fb --- /dev/null +++ b/apps/frontend/tests/customer-fulfillment-binding-compare.test.ts @@ -0,0 +1,64 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { dirname, join } from 'node:path' +import { fileURLToPath } from 'node:url' +import test from 'node:test' + +const root = dirname(fileURLToPath(import.meta.url)) +const source = readFileSync( + join(root, '../src/pages/customer-fulfillment/CustomerFulfillmentPage.tsx'), + 'utf8', +) +const styles = readFileSync(join(root, '../src/styles/client.css'), 'utf8') + +test('扫码识别角色后,资料不一致也打开对比弹窗', () => { + // 自动弹窗 effect 不再因 mismatch 提前 return。 + assert.ok(source.includes('识别到角色(含与资料不一致)都要弹出对比框')) + assert.ok(!source.includes("if (bindingInfo.comparison.verdict === 'mismatch') return")) + // 手动刷新时 mismatch 同样打开弹窗,不再关闭并只弹提示。 + assert.ok(source.includes('资料不一致同样打开对比框')) + assert.ok(!source.includes('平台角色与已填资料不一致,请先同步资料')) +}) + +test('对比弹窗在资料不一致时提供修改资料与同步平台角色入口', () => { + assert.ok(source.includes('修改资料')) + assert.ok(source.includes('同步平台角色')) + assert.ok(source.includes('canSyncBindingProfile')) + assert.ok(source.includes('onClick={openProfileEditor}')) + assert.ok( + source.includes( + "disabled={!bindingCustomerReady || bindingComparison?.verdict === 'mismatch'}", + ), + ) + assert.ok(styles.includes('.customer-binding-modal-actions.is-mismatch')) + assert.ok(styles.includes('repeat(auto-fit, minmax(140px, 1fr))')) +}) + +test('保存资料或同步平台角色后会重新打开对比弹窗', () => { + assert.ok(source.includes('function reopenBindingConfirm(')) + assert.ok(source.includes("if (nextTask.bindingStatus !== 'role_ready') return false")) + assert.ok(source.includes('reopened = reopenBindingConfirm(')) + assert.ok( + source.includes( + 'reopenBindingConfirm(bindingResponse.data.task, bindingResponse.data.binding)', + ), + ) + assert.ok(source.includes('角色资料已保存,请重新核对绑定角色')) +}) + +test('资料不一致时仍保持后端严格比对:确认按钮禁用并显示原因', () => { + assert.ok(source.includes('两侧角色信息不一致,无法确认绑定')) + assert.ok(source.includes('customer-binding-modal-error')) +}) + +test('二维码区提示扫码后会核对平台角色与已填资料', () => { + assert.ok(source.includes('扫码后系统会核对平台角色与已填资料')) +}) + +test('换绑流程刷新二维码必须带 forceRebind,避免直接返回已有角色', () => { + assert.ok(source.includes('function handleRefreshBindingQr()')) + assert.ok(source.includes('handleRefreshBinding(bindingInfo?.rebindRequested === true)')) + // 三处刷新/重新获取入口都不能再固定传 false。 + assert.ok(!source.includes('handleRefreshBinding(false)')) + assert.ok(source.includes('onClick={handleRefreshBindingQr}')) +})