feat: 重构评估流程为内存状态管理并接入真实提交与报告接口
本次重构将评估草稿改为内存状态管理,移除本地存储草稿,新增评估流程内存状态模块;接入真实的账户资料获取、头像上传接口,新增账户缓存清理逻辑;重构评估提交逻辑,接入真实提交接口并返回评估ID;新增分析页和报告页的真实状态查询、报告获取功能;更新README文档,记录开发进度和接口状态。
This commit is contained in:
+29
-43
@@ -1,5 +1,7 @@
|
||||
import { getUserStorage, setUserStorage } from '@/services/storage.uts'
|
||||
import { wanAmountValid, yuanToWan, wanToYuan } from './money.uts'
|
||||
import { getSession } from './api.uts'
|
||||
import { readAssessmentFlow, writeAssessmentFlow, clearAssessmentFlow } from './assessment-flow.uts'
|
||||
export { clearAssessmentFlow } from './assessment-flow.uts'
|
||||
import { wanAmountValid, wanToYuan, wanToCents } from './money.uts'
|
||||
|
||||
export type AssessmentForm = {
|
||||
name: string, idCard: string, phone: string, city: string, maritalStatus: string,
|
||||
@@ -7,46 +9,30 @@ export type AssessmentForm = {
|
||||
housingFund: string, house: string, car: string, savings: string, creditCard: string,
|
||||
creditLoanCount: string, totalDebtBalance: string, monthlyLoanPayment: string,
|
||||
creditCardCount: string, creditCardTotalLimit: string, creditCardUsedLimit: string,
|
||||
otherAssets: string, enterpriseName: string, businessCode: string, annualRevenue: string, operatingYears: string
|
||||
otherAssets: string, enterpriseName: string, businessCode: string, annualRevenue: string, operatingYears: string, operatingMonths: string,
|
||||
requestedAmountWan: string, requestedTermMonths: string, purposeCode: string, purposeLabel: string, purposeDetail: string
|
||||
}
|
||||
export type SelectedDocument = { name: string, path: string }
|
||||
export type DataAuthorization = { key: string, name: string, selected: boolean }
|
||||
|
||||
export function emptyAssessmentForm(): AssessmentForm {
|
||||
return { name: '', idCard: '', phone: '', city: '', maritalStatus: '', occupation: '', company: '', monthlyIncome: '', socialSecurity: '', housingFund: '', house: '', car: '', savings: '', creditCard: '', otherAssets: '', creditLoanCount: '', totalDebtBalance: '', monthlyLoanPayment: '', creditCardCount: '', creditCardTotalLimit: '', creditCardUsedLimit: '', enterpriseName: '', businessCode: '', annualRevenue: '', operatingYears: '' }
|
||||
return { name: '', idCard: '', phone: '', city: '', maritalStatus: '', occupation: '', company: '', monthlyIncome: '', socialSecurity: '', housingFund: '', house: '', car: '', savings: '', creditCard: '', otherAssets: '', creditLoanCount: '', totalDebtBalance: '', monthlyLoanPayment: '', creditCardCount: '', creditCardTotalLimit: '', creditCardUsedLimit: '', enterpriseName: '', businessCode: '', annualRevenue: '', operatingYears: '', operatingMonths: '', requestedAmountWan: '', requestedTermMonths: '', purposeCode: '', purposeLabel: '', purposeDetail: '' }
|
||||
}
|
||||
export function draftText(saved: UTSJSONObject, key: string): string {
|
||||
const value = saved[key]
|
||||
return typeof value == 'string' ? value as string : ''
|
||||
}
|
||||
function flowToken(): string { const session = getSession(); return session == null ? '' : session['token'] as string }
|
||||
export function activeAssessmentType(): string {
|
||||
const type = getUserStorage('assessmentActiveType')
|
||||
if (type == 'enterprise' || type == 'personal') return type as string
|
||||
const legacy = getUserStorage('assessmentDraft')
|
||||
if (legacy != null && typeof legacy == 'object' && draftText(legacy as UTSJSONObject, 'type') == 'enterprise') return 'enterprise'
|
||||
return 'personal'
|
||||
const current = readAssessmentFlow(flowToken())
|
||||
return current == null ? 'personal' : draftText(current, 'type')
|
||||
}
|
||||
export function loadAssessmentDraft(type: string): UTSJSONObject | null {
|
||||
const scoped = getUserStorage('assessmentDraft:' + type)
|
||||
if (scoped != null && typeof scoped == 'object') return normalizeAssessmentDraft(scoped as UTSJSONObject)
|
||||
const legacy = getUserStorage('assessmentDraft')
|
||||
if (legacy != null && typeof legacy == 'object') {
|
||||
const saved = legacy as UTSJSONObject
|
||||
if (draftText(saved, 'type') == type) return normalizeAssessmentDraft(saved)
|
||||
}
|
||||
return null
|
||||
}
|
||||
export function normalizeAssessmentDraft(saved: UTSJSONObject): UTSJSONObject {
|
||||
if (saved['moneyUnit'] == 'wan') return saved
|
||||
const result: UTSJSONObject = { ...saved, moneyUnit: 'wan', draftVersion: 2 }
|
||||
// 老草稿只有年营收以万元保存,其余金额均为元;只转换一次。
|
||||
const keys = ['monthlyIncome', 'totalDebtBalance', 'monthlyLoanPayment', 'creditCardTotalLimit', 'creditCardUsedLimit']
|
||||
if (saved['moneyUnit'] == 'yuan') keys.push('annualRevenue')
|
||||
keys.forEach((key) => { result[key] = yuanToWan(draftText(saved, key)) })
|
||||
return result
|
||||
export function getAssessmentInput(type: string): UTSJSONObject | null {
|
||||
const current = readAssessmentFlow(flowToken())
|
||||
return current != null && current['type'] == type ? current : null
|
||||
}
|
||||
export function assessmentApiPayload(saved: UTSJSONObject): UTSJSONObject {
|
||||
const normalized = normalizeAssessmentDraft(saved)
|
||||
const normalized = saved
|
||||
const result: UTSJSONObject = { ...normalized, moneyUnit: 'yuan' }
|
||||
const keys = ['annualRevenue', 'monthlyIncome', 'totalDebtBalance', 'monthlyLoanPayment', 'creditCardTotalLimit', 'creditCardUsedLimit']
|
||||
keys.forEach((key) => {
|
||||
@@ -55,17 +41,18 @@ export function assessmentApiPayload(saved: UTSJSONObject): UTSJSONObject {
|
||||
})
|
||||
return result
|
||||
}
|
||||
export function formFromDraft(saved: UTSJSONObject): AssessmentForm {
|
||||
export function formFromInput(saved: UTSJSONObject): AssessmentForm {
|
||||
return {
|
||||
name: draftText(saved, 'name'), idCard: draftText(saved, 'idCard'), phone: draftText(saved, 'phone'), city: draftText(saved, 'city'), maritalStatus: draftText(saved, 'maritalStatus'),
|
||||
occupation: draftText(saved, 'occupation'), company: draftText(saved, 'company'), monthlyIncome: draftText(saved, 'monthlyIncome'), socialSecurity: draftText(saved, 'socialSecurity'), housingFund: draftText(saved, 'housingFund'),
|
||||
house: ownershipFromDraft(saved, 'house'), car: ownershipFromDraft(saved, 'car'), savings: draftText(saved, 'savings'), creditCard: draftText(saved, 'creditCard'), otherAssets: draftText(saved, 'otherAssets'),
|
||||
house: ownershipFromInput(saved, 'house'), car: ownershipFromInput(saved, 'car'), savings: draftText(saved, 'savings'), creditCard: draftText(saved, 'creditCard'), otherAssets: draftText(saved, 'otherAssets'),
|
||||
creditLoanCount: draftText(saved, 'creditLoanCount'), totalDebtBalance: draftText(saved, 'totalDebtBalance'), monthlyLoanPayment: draftText(saved, 'monthlyLoanPayment'),
|
||||
creditCardCount: draftText(saved, 'creditCardCount'), creditCardTotalLimit: draftText(saved, 'creditCardTotalLimit'), creditCardUsedLimit: draftText(saved, 'creditCardUsedLimit'),
|
||||
enterpriseName: draftText(saved, 'enterpriseName'), businessCode: draftText(saved, 'businessCode'), annualRevenue: draftText(saved, 'annualRevenue'), operatingYears: draftText(saved, 'operatingYears')
|
||||
enterpriseName: draftText(saved, 'enterpriseName'), businessCode: draftText(saved, 'businessCode'), annualRevenue: draftText(saved, 'annualRevenue'), operatingYears: draftText(saved, 'operatingYears'), operatingMonths: draftText(saved, 'operatingMonths'),
|
||||
requestedAmountWan: draftText(saved, 'requestedAmountWan'), requestedTermMonths: draftText(saved, 'requestedTermMonths'), purposeCode: draftText(saved, 'purposeCode'), purposeLabel: draftText(saved, 'purposeLabel'), purposeDetail: draftText(saved, 'purposeDetail')
|
||||
}
|
||||
}
|
||||
export function ownershipFromDraft(saved: UTSJSONObject, key: string): string {
|
||||
export function ownershipFromInput(saved: UTSJSONObject, key: string): string {
|
||||
const value = draftText(saved, key)
|
||||
if (value == '有' || value == '无') return value
|
||||
if (value == '无房产' || value == '无车辆') return '无'
|
||||
@@ -83,9 +70,10 @@ export function assetValidationMessage(form: AssessmentForm): string {
|
||||
for (let i = 0; i < amounts.length; i++) {
|
||||
if (amounts[i].length > 0 && !wanAmountValid(amounts[i])) return amountLabels[i] + '范围为 0–99999.999999 万元,最多六位小数'
|
||||
}
|
||||
if (form.creditCardTotalLimit.length > 0 && form.creditCardUsedLimit.length > 0 && wanToCents(form.creditCardUsedLimit) > wanToCents(form.creditCardTotalLimit)) return '信用卡已使用额度不能大于总额度'
|
||||
return ''
|
||||
}
|
||||
export function documentsFromDraft(saved: UTSJSONObject): SelectedDocument[] {
|
||||
export function documentsFromInput(saved: UTSJSONObject): SelectedDocument[] {
|
||||
const results: SelectedDocument[] = []
|
||||
const items = saved['documents'] as UTSJSONObject[] | null
|
||||
if (items == null) return results
|
||||
@@ -95,22 +83,20 @@ export function documentsFromDraft(saved: UTSJSONObject): SelectedDocument[] {
|
||||
})
|
||||
return results
|
||||
}
|
||||
export function saveAssessmentDraft(type: string, step: number, form: AssessmentForm, documents: SelectedDocument[], authorizations: DataAuthorization[], documentConsent: boolean, dataConsent: boolean): void {
|
||||
export function setAssessmentInput(type: string, step: number, form: AssessmentForm, documents: SelectedDocument[], authorizations: DataAuthorization[], documentConsent: boolean, dataConsent: boolean): void {
|
||||
const files: UTSJSONObject[] = documents.map((item): UTSJSONObject => ({ name: item.name, path: item.path }))
|
||||
const grants: string[] = authorizations.filter((item) => item.selected).map((item) => item.key)
|
||||
const payload: UTSJSONObject = {
|
||||
type, step, moneyUnit: 'wan', draftVersion: 2, name: form.name, idCard: form.idCard, phone: form.phone, city: form.city, maritalStatus: form.maritalStatus,
|
||||
type, step, moneyUnit: 'wan', name: form.name, idCard: form.idCard, phone: form.phone, city: form.city, maritalStatus: form.maritalStatus,
|
||||
occupation: form.occupation, company: form.company, monthlyIncome: form.monthlyIncome, socialSecurity: form.socialSecurity, housingFund: form.housingFund,
|
||||
house: form.house, car: form.car, savings: form.savings, creditCard: form.creditCard, otherAssets: form.otherAssets,
|
||||
creditLoanCount: form.creditLoanCount, totalDebtBalance: form.totalDebtBalance, monthlyLoanPayment: form.monthlyLoanPayment,
|
||||
creditCardCount: form.creditCardCount, creditCardTotalLimit: form.creditCardTotalLimit, creditCardUsedLimit: form.creditCardUsedLimit,
|
||||
enterpriseName: form.enterpriseName, businessCode: form.businessCode, annualRevenue: form.annualRevenue, operatingYears: form.operatingYears,
|
||||
enterpriseName: form.enterpriseName, businessCode: form.businessCode, annualRevenue: form.annualRevenue, operatingYears: form.operatingYears, operatingMonths: form.operatingMonths,
|
||||
requestedAmountWan: form.requestedAmountWan, requestedTermMonths: form.requestedTermMonths, purposeCode: form.purposeCode, purposeLabel: form.purposeLabel, purposeDetail: form.purposeDetail,
|
||||
documents: files, authorizations: grants, documentConsent, dataConsent
|
||||
}
|
||||
setUserStorage('assessmentActiveType', type)
|
||||
setUserStorage('assessmentDraft:' + type, payload)
|
||||
// 保留现有提交与档案入口读取的活动草稿。
|
||||
setUserStorage('assessmentDraft', payload)
|
||||
writeAssessmentFlow(flowToken(), payload)
|
||||
}
|
||||
export function showAgreementNotice(title: string): void {
|
||||
uni.showModal({ title, content: '完整协议将在相关服务开放时提供。当前勾选仅保存您的选择,不会发起实名认证、查询外部数据或上传资料。', showCancel: false, confirmText: '我知道了' })
|
||||
@@ -118,13 +104,13 @@ export function showAgreementNotice(title: string): void {
|
||||
|
||||
export type AssessmentProgress = { percent: number, basicDone: boolean, incomeDone: boolean, assetsDone: boolean, authorizationSelected: boolean }
|
||||
export function assessmentProgress(type: string): AssessmentProgress {
|
||||
const saved = loadAssessmentDraft(type)
|
||||
const saved = getAssessmentInput(type)
|
||||
if (saved == null) return { percent: 0, basicDone: false, incomeDone: false, assetsDone: false, authorizationSelected: false }
|
||||
const basic = type == 'enterprise' ? ['enterpriseName', 'businessCode', 'name', 'phone', 'city'] : ['name', 'idCard', 'phone', 'city', 'maritalStatus']
|
||||
const income = type == 'enterprise' ? ['occupation', 'operatingYears', 'annualRevenue'] : ['occupation', 'company', 'monthlyIncome', 'socialSecurity', 'housingFund']
|
||||
const income = type == 'enterprise' ? ['occupation', 'operatingMonths', 'annualRevenue'] : ['occupation', 'company', 'monthlyIncome', 'socialSecurity', 'housingFund']
|
||||
const assets = ['house', 'car', 'creditLoanCount', 'totalDebtBalance', 'monthlyLoanPayment', 'creditCardCount', 'creditCardTotalLimit', 'creditCardUsedLimit']
|
||||
const keys = basic.concat(income).concat(assets)
|
||||
const filled = keys.filter((key) => draftText(saved, key).trim().length > 0).length
|
||||
const grants = saved['authorizations'] as string[] | null
|
||||
return { percent: Math.round(filled / keys.length * 100), basicDone: basic.every((key) => draftText(saved, key).length > 0), incomeDone: income.every((key) => draftText(saved, key).length > 0), assetsDone: assets.every((key) => draftText(saved, key).trim().length > 0) && assetValidationMessage(formFromDraft(saved)).length == 0, authorizationSelected: documentsFromDraft(saved).length > 0 || (grants != null && grants.length > 0) }
|
||||
return { percent: Math.round(filled / keys.length * 100), basicDone: basic.every((key) => draftText(saved, key).length > 0), incomeDone: income.every((key) => draftText(saved, key).length > 0), assetsDone: assets.every((key) => draftText(saved, key).trim().length > 0) && assetValidationMessage(formFromInput(saved)).length == 0, authorizationSelected: documentsFromInput(saved).length > 0 || (grants != null && grants.length > 0) }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user