fix(first-leg): freeze versioned submission commands across retries

2026-10-02 23:08:58 +08:00
parent 187deb5047
commit e564353a80
6 changed files with 251 additions and 30 deletions
@@ -23,7 +23,9 @@ function harness(t) {
      if (behavior.failRead) throw new Error('读取失败')
      return { order: { id: 'one', orderNo: 'FL-ONE', version: behavior.version, status: behavior.status, receivingWarehouseId: 'warehouse', destinationCountryCode: 'US' }, cargoes: [] }
    }
-    if (behavior.failWrite) throw new Error('响应丢失')
+    if (behavior.failWrite || (behavior.failSubmit && config.url.endsWith('/submit'))) throw new Error('响应丢失')
+    if (config.url.endsWith('/submit') && behavior.failSubmitRead) behavior.failRead = true
+    if (config.method === 'POST' && config.url === '/merchant/v1/orders/first-leg') return 'one'
  } } })
  const module = compile('./firstLegOrders.ts', {
    vue, pinia,
@@ -53,6 +55,23 @@ test('raw and unified cancelled detail remain CANCELLED even when unified mainSt
  assert.notEqual(unknown.status, 'CANCELLED', 'unknown summary must not be reclassified as cancellation')
 })

+test('fresh direct draft detail preserves raw DRAFT with null unified summary and opens an edit session', async t => {
+  const h = harness(t)
+  assert.equal(h.store.orders.length, 0)
+  const direct = await h.store.loadDetail('one')
+  assert.equal(direct.status, 'DRAFT')
+  assert.equal(h.store.beginDraftEdit(direct).expectedVersion, 9)
+  h.store.orders = []
+  const refreshed = await h.store.loadDetail('one')
+  assert.equal(refreshed.status, 'DRAFT')
+  h.store.orders = []
+  h.behavior.status = 'APPROVED'
+  const unknown = await h.store.loadDetail('one')
+  assert.notEqual(unknown.status, 'DRAFT')
+  assert.notEqual(unknown.status, 'CANCELLED')
+  assert.throws(() => h.store.beginDraftEdit(unknown), /重新打开/)
+})
+
 test('cancelled detail summary has no pending overseas synchronization entries', () => {
  const source = readFileSync(new URL('../views/FirstLegOrdersView.vue', import.meta.url), 'utf8')
  const script = source.match(/<script setup lang="ts">([\s\S]*?)<\/script>/)[1]
@@ -217,5 +236,150 @@ test('cancel UI blocks unavailable permission and irreversible visible stages be
 test('both editor entry points capture detail sessions and both save paths pass them', () => {
  const view = readFileSync(new URL('../views/FirstLegOrdersView.vue', import.meta.url), 'utf8')
  assert.equal((view.match(/editingSession\.value = store\.beginDraftEdit\(detailedOrder\)/g) ?? []).length, 2)
-  assert.equal((view.match(/store\.saveDraft\(cloneDraft\(form\), tenantStore\.company\.companyName, editingId\.value, editingSession\.value\)/g) ?? []).length, 2)
+  assert.equal((view.match(/store\.saveDraft(?:ForSubmission)?\(cloneDraft\(form\), tenantStore\.company\.companyName, editingId\.value, editingSession\.value\)/g) ?? []).length, 2)
+})
+
+test('submit reads raw detail version rather than list zero and replays original key and version after timeout', async t => {
+  const h = harness(t)
+  h.store.orders = [{ id: 'one', status: 'DRAFT', version: 0 }]
+  h.behavior.failSubmit = true
+  await assert.rejects(h.store.submitSaved('one', 'ACTIVE'), /响应丢失/)
+  const first = h.calls[1]
+  assert.equal(first.url, '/merchant/v1/orders/first-leg/one/submit')
+  assert.deepEqual(first.data, { expectedVersion: 9 })
+  assert.ok(first.headers['Idempotency-Key'])
+  h.behavior.version = 10; h.behavior.status = 'SUBMITTED'; h.behavior.failSubmit = false
+  await h.store.submitSaved('one', 'ACTIVE')
+  assert.deepEqual(h.calls[3], first)
+  assert.deepEqual(h.calls.map(call => call.method), ['GET', 'POST', 'GET', 'POST', 'GET'])
+  assert.equal(h.store.hasPendingSubmission('one'), false)
+})
+
+test('submit refuses missing version or non-draft first decision and preserves command after failed readback', async t => {
+  const h = harness(t)
+  for (const version of [undefined, -1, 1.5]) {
+    h.behavior.version = version
+    await assert.rejects(h.store.submitSaved('one'), /版本缺失/)
+  }
+  h.behavior.version = 0; h.behavior.status = 'SUBMITTED'
+  await assert.rejects(h.store.submitSaved('one'), /不是草稿/)
+  assert.ok(h.calls.every(call => call.method === 'GET'))
+  h.behavior.status = 'DRAFT'; h.behavior.failSubmitRead = true
+  await assert.rejects(h.store.submitSaved('one'), /读取失败/)
+  assert.equal(h.store.hasPendingSubmission('one'), true)
+  h.behavior.failRead = false; h.behavior.failSubmitRead = false
+  await h.store.submitSaved('one')
+  const posts = h.calls.filter(call => call.method === 'POST')
+  assert.deepEqual(posts[0], posts[1])
+  assert.deepEqual(posts[0].data, { expectedVersion: 0 }, 'raw detail zero is valid')
+})
+
+test('save then submit retries without another save and changed form requires an explicit new decision', async t => {
+  const h = harness(t)
+  const session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
+  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
+  h.behavior.failSubmit = true
+  await assert.rejects(h.store.submitSaved('one'))
+  const first = h.calls.find(call => call.url.endsWith('/submit'))
+  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
+  h.draft.customerRemark = '新决定'
+  await assert.rejects(h.store.saveDraftForSubmission(h.draft, '客户', 'one', session), /重新编辑/)
+  h.behavior.status = 'SUBMITTED'
+  await assert.rejects(h.store.beginNewSubmissionEdit('one'), /不能重新编辑/)
+  assert.equal(h.store.hasPendingSubmission('one'), true)
+  h.behavior.status = 'DRAFT'; h.behavior.version = 12
+  const newSession = await h.store.beginNewSubmissionEdit('one')
+  assert.equal(newSession.expectedVersion, 12)
+  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', newSession)
+  h.behavior.version = 13; h.behavior.failSubmit = false
+  await h.store.submitSaved('one')
+  const posts = h.calls.filter(call => call.url.endsWith('/submit'))
+  assert.notEqual(posts[1].headers['Idempotency-Key'], first.headers['Idempotency-Key'])
+  assert.deepEqual(posts[1].data, { expectedVersion: 13 })
+})
+
+test('failed initial submit read does not resave the prepared draft on retry', async t => {
+  const h = harness(t)
+  const session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
+  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
+  h.behavior.failRead = true
+  await assert.rejects(h.store.submitSaved('one'))
+  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
+})
+
+async function submissionViewHarness(t) {
+  const h = harness(t)
+  const source = readFileSync(new URL('../views/FirstLegOrdersView.vue', import.meta.url), 'utf8').match(/<script setup lang="ts">([\s\S]*?)<\/script>/)[1]
+  const ast = ts.createSourceFile('view.ts', source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS)
+  const functions = ast.statements.filter(node => ts.isFunctionDeclaration(node) && ['submitOrder', 'confirmSubmissionEdit', 'submitSelectedDraftOrders'].includes(node.name?.text)).map(node => node.getText(ast)).join('\n')
+  const code = ts.transpileModule(functions, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const messages = [], confirmations = []
+  const globals = {
+    store: h.store, saving: vue.ref(false), form: h.draft, cloneDraft: draft => structuredClone(draft),
+    editingId: vue.ref('one'), editingSession: vue.shallowRef(h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))),
+    companySubmissionBlocked: vue.ref(false), companyAuditLoaded: vue.ref(true), tenantStore: { company: { companyName: '客户', auditStatus: 'ACTIVE' } },
+    validateEditorForm: async () => true, markEditorClean: () => {}, editorOpen: vue.ref(true), isCreatePage: vue.ref(false), loadPageData: async () => {},
+    batchSubmitting: vue.ref(false), selectedDraftOrders: vue.ref([{ id: 'one', version: 0 }]), pendingBatchSubmissionIds: vue.ref([]),
+    searchOrders: async () => { globals.selectedDraftOrders.value = [] }, appliedFilters: vue.ref({}),
+    ElMessageBox: { confirm: async message => { confirmations.push(message); if (h.behavior.cancelConfirm) throw 'cancel' } },
+    ElMessage: { error: message => messages.push(message), warning: message => messages.push(message), success: message => messages.push(message) },
+  }
+  const handlers = new Function(...Object.keys(globals), code + '\nreturn {submitOrder, submitSelectedDraftOrders}')(...Object.values(globals))
+  return { ...h, ...handlers, globals, messages, confirmations }
+}
+
+test('real editor submit handler retries original submission without PUT and requires confirmation for changed form', async t => {
+  const h = await submissionViewHarness(t)
+  h.behavior.failSubmit = true
+  await h.submitOrder()
+  await h.submitOrder()
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
+  const posts = h.calls.filter(call => call.url.endsWith('/submit'))
+  assert.deepEqual(posts[0], posts[1])
+  h.draft.customerRemark = '修改后的决定'
+  h.behavior.cancelConfirm = true
+  await h.submitOrder()
+  assert.equal(h.confirmations.length, 1)
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
+  h.behavior.cancelConfirm = false; h.behavior.failSubmit = false; h.behavior.version = 12
+  await h.submitOrder()
+  assert.equal(h.confirmations.length, 2)
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 2)
+  const last = h.calls.filter(call => call.url.endsWith('/submit')).at(-1)
+  assert.deepEqual(last.data, { expectedVersion: 12 })
+  assert.notEqual(last.headers['Idempotency-Key'], posts[0].headers['Idempotency-Key'])
+  assert.equal(h.globals.saving.value, false)
+})
+
+test('real batch handler retains uncertain IDs across list refresh and retries original commands even if now submitted', async t => {
+  const h = await submissionViewHarness(t)
+  h.behavior.failSubmit = true
+  await h.submitSelectedDraftOrders()
+  assert.deepEqual(h.globals.pendingBatchSubmissionIds.value, ['one'])
+  assert.deepEqual(h.globals.selectedDraftOrders.value, [])
+  h.behavior.failSubmit = false; h.behavior.status = 'SUBMITTED'; h.behavior.version = 10
+  await h.submitSelectedDraftOrders()
+  const posts = h.calls.filter(call => call.url.endsWith('/submit'))
+  assert.equal(posts.length, 2)
+  assert.deepEqual(posts[1], posts[0])
+  assert.deepEqual(posts[0].data, { expectedVersion: 9 })
+  assert.deepEqual(h.globals.pendingBatchSubmissionIds.value, [])
+  assert.equal(h.globals.batchSubmitting.value, false)
+})
+
+test('real new-order handler creates once and retries the saved order submission with the original version', async t => {
+  const h = await submissionViewHarness(t)
+  h.globals.editingId.value = undefined; h.globals.editingSession.value = undefined
+  h.behavior.version = 0; h.behavior.failSubmit = true
+  await h.submitOrder()
+  assert.equal(h.globals.editingId.value, 'one')
+  h.behavior.version = 1; h.behavior.status = 'SUBMITTED'; h.behavior.failSubmit = false
+  await h.submitOrder()
+  assert.equal(h.calls.filter(call => call.method === 'POST' && call.url === '/merchant/v1/orders/first-leg').length, 1)
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 0)
+  const posts = h.calls.filter(call => call.url.endsWith('/submit'))
+  assert.deepEqual(posts[0], posts[1])
+  assert.deepEqual(posts[0].data, { expectedVersion: 0 })
 })