Commit f7e9453b by Liu

fix:提问接口字段

parent 4a148bc8
...@@ -409,7 +409,7 @@ export const TacticsChat: React.FC = () => { ...@@ -409,7 +409,7 @@ export const TacticsChat: React.FC = () => {
// 优先使用 userMeta,如果存在 userMeta 且需要包含,则传入 userMeta 的字段 // 优先使用 userMeta,如果存在 userMeta 且需要包含,则传入 userMeta 的字段
// 注意:这里显式剔除 userMeta 自带的 numberType 和 place,避免覆盖映射后的 numberType,并按需去掉 place // 注意:这里显式剔除 userMeta 自带的 numberType 和 place,避免覆盖映射后的 numberType,并按需去掉 place
if (userMeta && shouldIncludeUserMeta) { if (userMeta && shouldIncludeUserMeta) {
const { numberType: _rawNumberType, place: _omitPlace, ...safeUserMeta } = userMeta const { place: _omitPlace, ...safeUserMeta } = userMeta
Object.assign(requestBody, safeUserMeta) Object.assign(requestBody, safeUserMeta)
} }
// 如果没有 userMeta 或不需要包含 userMeta,则使用 tacticsMeta // 如果没有 userMeta 或不需要包含 userMeta,则使用 tacticsMeta
...@@ -420,6 +420,10 @@ export const TacticsChat: React.FC = () => { ...@@ -420,6 +420,10 @@ export const TacticsChat: React.FC = () => {
if (userMeta?.place === 'user') { if (userMeta?.place === 'user') {
requestBody.busiType ??= '02' requestBody.busiType ??= '02'
requestBody.busiId ??= userMeta.userId requestBody.busiId ??= userMeta.userId
// 当缓存内存在 place=user 时,始终使用缓存中的 numberType 作为接口参数
if (userMeta.numberType) {
requestBody.numberType = userMeta.numberType
}
} }
else if (tacticsMeta) { else if (tacticsMeta) {
requestBody.busiType ??= '02' requestBody.busiType ??= '02'
...@@ -580,18 +584,18 @@ export const TacticsChat: React.FC = () => { ...@@ -580,18 +584,18 @@ export const TacticsChat: React.FC = () => {
const hasUserMeta = !!userMeta const hasUserMeta = !!userMeta
if (hasUserMeta) { if (hasUserMeta) {
const mappedNumberType = getNumberTypeWithUserMeta('A02', true) const mappedNumberType = getNumberTypeWithUserMeta('A02', true)
await handleSubmitQuestion(undefined, undefined, undefined, { await handleSubmitQuestion('策略分析', undefined, undefined, {
busiType: '02', busiType: '02',
numberType: mappedNumberType, recordType: mappedNumberType,
includeQuestion: false, includeQuestion: false,
includeTacticsMeta: false, includeTacticsMeta: false,
includeUserMeta: true, includeUserMeta: true,
}) })
} }
else { else {
await handleSubmitQuestion(undefined, undefined, undefined, { await handleSubmitQuestion('策略分析', undefined, undefined, {
busiType: '02', busiType: '02',
recordType: 'A02', recordType: 'A01',
includeQuestion: false, includeQuestion: false,
includeTacticsMeta: true, includeTacticsMeta: true,
}) })
...@@ -660,7 +664,7 @@ export const TacticsChat: React.FC = () => { ...@@ -660,7 +664,7 @@ export const TacticsChat: React.FC = () => {
undefined, undefined,
{ {
busiType: '02', busiType: '02',
numberType: mappedNumberType, recordType: mappedNumberType,
includeQuestion: false, includeQuestion: false,
includeTacticsMeta: false, includeTacticsMeta: false,
includeUserMeta: true, includeUserMeta: true,
...@@ -674,7 +678,7 @@ export const TacticsChat: React.FC = () => { ...@@ -674,7 +678,7 @@ export const TacticsChat: React.FC = () => {
undefined, undefined,
{ {
busiType: '02', busiType: '02',
recordType: 'A02', recordType: 'A01',
includeQuestion: false, includeQuestion: false,
includeTacticsMeta: true, includeTacticsMeta: true,
}, },
...@@ -727,7 +731,7 @@ export const TacticsChat: React.FC = () => { ...@@ -727,7 +731,7 @@ export const TacticsChat: React.FC = () => {
includeQuestion: true, includeQuestion: true,
includeTacticsMeta: false, includeTacticsMeta: false,
includeUserMeta: true, includeUserMeta: true,
numberType: mappedNumberType, recordType: mappedNumberType,
}, },
) )
} }
...@@ -879,14 +883,14 @@ export const TacticsChat: React.FC = () => { ...@@ -879,14 +883,14 @@ export const TacticsChat: React.FC = () => {
// - 有 userMeta:按 userMeta.numberType 映射 numberType(A04/A06/A08/A10),不传 recordType,仅传 userMeta // - 有 userMeta:按 userMeta.numberType 映射 numberType(A04/A06/A08/A10),不传 recordType,仅传 userMeta
const hasUserMeta = !!userMeta const hasUserMeta = !!userMeta
if (hasUserMeta) { if (hasUserMeta) {
const mappedNumberType = getNumberTypeWithUserMeta('A01', false) const mappedNumberType = getNumberTypeWithUserMeta('A02', false)
return handleSubmitQuestion( return handleSubmitQuestion(
question, question,
undefined, undefined,
undefined, undefined,
{ {
busiType: '02', busiType: '02',
numberType: mappedNumberType, recordType: mappedNumberType,
includeQuestion: true, includeQuestion: true,
includeTacticsMeta: false, includeTacticsMeta: false,
includeUserMeta: true, includeUserMeta: true,
...@@ -899,7 +903,7 @@ export const TacticsChat: React.FC = () => { ...@@ -899,7 +903,7 @@ export const TacticsChat: React.FC = () => {
undefined, undefined,
{ {
busiType: '02', busiType: '02',
recordType: 'A01', recordType: 'A02',
includeQuestion: true, includeQuestion: true,
includeTacticsMeta: false, includeTacticsMeta: false,
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment