修复(半自动履约): 虎牙UID改为必填不校验

This commit is contained in:
yml
2026-11-20 17:08:07 +08:00
parent f4806fb758
commit 132a281a3e
9 changed files with 103 additions and 73 deletions
@@ -49,12 +49,13 @@ describe('区服解析', () => {
describe('虎牙角色比对', () => {
it('角色名和区服一致即可确认,客户角色 UID 不与账号 UID 或加密 token 比对', () => {
const result = compareBindingRole(task('落地盒子怪cc', '4212063544', '安卓Q区'), {
const result = compareBindingRole(task('落地盒子怪cc', 'uid-not-number', '安卓Q区'), {
bindGameRole: '落地盒子怪cc',
bindGameRoleToken: HUYA_ROLE_TOKEN,
bindGameChannel: '安卓(android) · QQ',
})
assert.equal(result.verdict, 'match')
assert.equal(result.customerRoleId, 'uid-not-number')
assert.equal(result.boundRoleIdKind, 'huya_role_token')
assert.equal(result.verificationBasis, 'role_name_zone')
})
@@ -143,24 +144,43 @@ describe('虎牙角色比对', () => {
})
describe('客户角色资料校验', () => {
it('角色名和区服齐全时,游戏角色 UID 可以留空', () => {
it('游戏角色 UID 必填但不校验格式', () => {
assert.throws(
() =>
normalizeCustomerProfile({
roleName: '落地盒子怪cc',
roleId: ' ',
serverZone: '安卓Q区',
}),
/请完整填写区服、游戏角色 UID 和角色名/,
)
const profile = normalizeCustomerProfile({
roleName: '落地盒子怪cc',
roleId: '',
roleId: 'uid-not-number',
serverZone: '安卓Q区',
})
assert.deepEqual(profile, {
roleName: '落地盒子怪cc',
roleId: '',
roleId: 'uid-not-number',
serverZone: '安卓Q区',
})
assert.equal(
hasCustomerProfile({
customer_game_id: 'uid-not-number',
customer_game_role: '落地盒子怪cc',
customer_server_zone: '安卓Q区',
}),
true,
)
assert.equal(
hasCustomerProfile({
customer_game_id: '',
customer_game_role: '落地盒子怪cc',
customer_server_zone: '安卓Q区',
}),
false,
)
})
it('清理空白并保留纯数字游戏角色 UID', () => {
@@ -176,13 +196,6 @@ describe('客户角色资料校验', () => {
})
})
it('游戏角色 UID 非数字时拒绝保存', () => {
assert.throws(
() => normalizeCustomerProfile({ roleName: '落地盒子怪cc', roleId: 'abc123' }),
/只能是数字/,
)
})
it('缺区服时拒绝保存', () => {
assert.throws(
() => normalizeCustomerProfile({ roleName: '落地盒子怪cc', roleId: '4212063544' }),
@@ -193,7 +206,7 @@ describe('客户角色资料校验', () => {
it('角色名称为空时拒绝保存', () => {
assert.throws(
() => normalizeCustomerProfile({ roleName: ' ', roleId: '', serverZone: '安卓Q区' }),
/请完整填写区服和角色名/,
/请完整填写区服、游戏角色 UID 和角色名/,
)
})
})
@@ -111,20 +111,14 @@ export function normalizeCustomerProfile(input: CustomerProfileInput = {}) {
const serverZone = String(input.serverZone ?? '')
.trim()
.slice(0, 100)
if (roleId && !/^\d+$/.test(roleId)) {
throw createHttpError('游戏角色 UID 只能是数字', {
statusCode: 400,
errorCode: 'semi_auto_profile_role_id_invalid',
})
}
if (!CUSTOMER_SERVER_ZONES.has(serverZone)) {
throw createHttpError('区服只能选择 苹果Q区 / 苹果V区 / 安卓Q区 / 安卓V区', {
statusCode: 400,
errorCode: 'semi_auto_profile_server_zone_invalid',
})
}
if (!roleName || !serverZone) {
throw createHttpError('请完整填写区服和角色名', {
if (!roleName || !roleId || !serverZone) {
throw createHttpError('请完整填写区服、游戏角色 UID 和角色名', {
statusCode: 400,
errorCode: 'semi_auto_profile_required',
})
@@ -134,7 +128,8 @@ export function normalizeCustomerProfile(input: CustomerProfileInput = {}) {
/**
* 半自动订单没有 work_orders,客户资料在授权页 /c/<订单号>(虎牙)或 /d/<订单号>(微博)收集。
* 虎牙先保存目标角色名和区服,再登录账号;游戏角色 UID 可选留档,不参与绑定核验。
* 虎牙先保存目标角色名、区服和 UID,再登录账号;UID 只做资料收集,不校验格式,
* 也不参与绑定核验。
*/
export async function savePublicTaskProfile(
orderNoInput: unknown,
@@ -257,10 +257,12 @@ export function normalizeOrderNo(value: unknown): string {
/** 客户资料以 TASK_SELECT 合并后的字段为准:优先任务表,回退工单资料。 */
export function hasCustomerProfile(
task: Pick<TaskRow, 'customer_game_role' | 'customer_server_zone'>,
task: Pick<TaskRow, 'customer_game_id' | 'customer_game_role' | 'customer_server_zone'>,
): boolean {
return Boolean(
String(task.customer_game_role || '').trim() && String(task.customer_server_zone || '').trim(),
String(task.customer_game_id || '').trim() &&
String(task.customer_game_role || '').trim() &&
String(task.customer_server_zone || '').trim(),
)
}
@@ -431,7 +433,12 @@ export function displayStatus(task: TaskRow, decision = resolveTaskHuyaBindingDe
return status('processing', '处理中', 'operator', '客服继续履约')
}
if (bindingPolicy.requiresCustomerProfile && !hasCustomerProfile(task)) {
return status('waiting_profile', '待客户填写资料', 'customer', '客户填写区服和角色名')
return status(
'waiting_profile',
'待客户填写资料',
'customer',
'客户填写区服、游戏角色 UID 和角色名',
)
}
if (task.login_status === 'authenticated') {
if (task.platform === 'huya' && decision) {
@@ -747,7 +754,7 @@ export function assertHuyaTask(task: TaskRow) {
/**
* 半自动订单没有工单时,客户资料在登录后由 /c/<订单号> 收集;
* 任务表为空但工单素材已有资料时,TASK_SELECT 会合并回退字段。
* 进入绑定/确认/换绑前必须已有角色名和区服;游戏角色 UID 可选。
* 进入绑定/确认/换绑前必须已有角色名、区服和 UID;UID 不参与绑定核验。
*/
export function assertCustomerProfileReady(task: TaskRow) {
if (!getAccountBindingPolicy(task.platform).requiresCustomerProfile) return
@@ -1394,11 +1394,20 @@ test(
orderId = result.orderId
configId = result.configId
await expectErrorCode(
() =>
savePublicTaskProfile(orderNo, result.taskId, {
roleName: 'Mock虎牙角色',
serverZone: '安卓V区',
}),
'semi_auto_profile_required',
)
const saved = await savePublicTaskProfile(orderNo, result.taskId, {
roleName: 'Mock虎牙角色',
roleId: 'UID-not-number',
serverZone: '安卓V区',
})
assert.equal(saved.task.customerGameRoleId, '')
assert.equal(saved.task.customerGameRoleId, 'UID-not-number')
assert.equal(saved.task.loginStatus, 'waiting_login')
assert.equal(saved.task.displayStatus.label, '等待客户授权')
@@ -1427,7 +1436,7 @@ test(
assert.equal(tasks[0]?.executionStatus, 'waiting_customer')
assert.equal(tasks[0]?.displayStatus.label, '等待客户绑定角色')
assert.equal(tasks[0]?.customerGameRoleName, 'Mock虎牙角色')
assert.equal(tasks[0]?.customerGameRoleId, '')
assert.equal(tasks[0]?.customerGameRoleId, 'UID-not-number')
assert.equal(tasks[0]?.credentialSource, 'sms')
assert.ok(tasks[0]?.huyaUid)
assert.equal(tasks[0]?.platformNickname, 'Mock虎牙用户')