Sfoglia il codice sorgente

Merge branch 'ui-refactor-phase-2' of guanli/ngfrontend into develop

bill001 2 settimane fa
parent
commit
201f6b3a7c

+ 14 - 4
src/ui-refactor/views/guest-shop/GuestOrderPage.vue

@@ -9,7 +9,7 @@ export default {
   name: 'GuestOrderPage',
   components: { UiSectionCard, GuestOrderDetails },
   data() {
-    return { detail: null, loading: false, failed: false, downloading: false, receiptError: '' }
+    return { detail: null, loading: false, failed: false, downloading: false, receiptError: '', pollTimer: null }
   },
   computed: {
     order() {
@@ -22,10 +22,13 @@ export default {
   },
   watch: { order: { immediate: true, handler: 'loadOrder' }},
   beforeDestroy() {
+    clearTimeout(this.pollTimer)
     this.requestVersion++
   },
   methods: {
     async loadOrder() {
+      clearTimeout(this.pollTimer)
+      this.pollTimer = null
       const version = (this.requestVersion = (this.requestVersion || 0) + 1)
       this.detail = null
       this.failed = false
@@ -36,16 +39,23 @@ export default {
       try {
         const { data } = await fetchGuestOrderDetail({ orderSn: this.order })
         if (version !== this.requestVersion) return
-        if (!data || !data.order || data.order.SN !== this.order) { throw new Error('Unexpected order reference') }
+        if (!data || !data.order || !data.order.SN) return
+        if (data.order.SN !== this.order) {
+          this.failed = true
+          return
+        }
         this.detail = {
           order: data.order,
           goods: Array.isArray(data.goods) ? data.goods : [],
           showBv: Boolean(usersInfo.accessToken())
         }
       } catch (error) {
-        if (version === this.requestVersion) this.failed = true
+        // 支付回调落库前也可能返回查询错误,保持等待并在下一轮重试。
       } finally {
-        if (version === this.requestVersion) this.loading = false
+        if (version === this.requestVersion) {
+          if (this.detail || this.failed) this.loading = false
+          else this.pollTimer = setTimeout(this.loadOrder, 2000)
+        }
       }
     },
     copyLink(event) {

+ 1 - 1
src/ui-refactor/views/guest-shop/README.md

@@ -33,7 +33,7 @@
 
 请求期间防止重复提交。关闭支付保留 SN,重开只恢复支付,不重复 POST,也不调用会员取消接口;未付单存在时锁定商品、地址和支付方式。异步响应和 SDK 回调受组件生命周期与本次支付序号约束。
 
-`/guest-order?order=<SN>` 在进入、刷新和订单参数变化时调用匿名详情接口,传 `orderSn`,响应为 `{ order, goods }`。订单号必须与请求一致;加载中清除旧明细,失败可重试,离开页面或更换订单后忽略旧响应。`GuestOrderPage` 管理请求、下载与复制,`GuestOrderDetails` 负责展示;卡片复用 `UiSectionCard`,图片、按钮和状态使用 Element UI。
+`/guest-order?order=<SN>` 在进入、刷新和订单参数变化时调用匿名详情接口,传 `orderSn`,响应为 `{ order, goods }`。订单号必须与请求一致;加载中清除旧明细。支付回调可能晚于页面跳转,暂无订单或查询暂时报错时持续显示加载,每次请求结束后间隔 2 秒重查,取得当前订单后停止;请求不重叠,也不添加自动超时上限。切换或清空订单号、离开页面时清理轮询,旧响应不得重启查询。接口返回其他订单号时仍立即报错并允许手动重试,不展示其他订单。`GuestOrderPage` 管理请求、下载与复制,`GuestOrderDetails` 负责展示;卡片复用 `UiSectionCard`,图片、按钮和状态使用 Element UI。
 
 详情以 `order.CURRENCY / PAY_AMOUNT / ORDER_AMOUNT / PAY_FREIGHT / FREIGHT / STATUS / CREATED_AT / PAY_TYPE / CONSIGNEE / MOBILE / FULL_ADDRESS / COUNTRY` 展示,配送地址直接使用 `FULL_ADDRESS`,不把 `PROVINCE` 地区 ID 当名称。`goods` 沿用会员订单商品的 `GOODS_TITLE / SKU_CODE / COVER / REAL_PRICE / BUY_NUMS / TAX_RATE`。商品为空显示暂无明细;缺失金额和地址显示 `—`,不会补成零。税额按原含税算法展示,不再次加到接口金额;总额直接取 `PAY_AMOUNT`,缺失时取 `ORDER_AMOUNT`,两者均为已含税金额。支付状态只取详情接口,数字状态不推断为 Paid,前端支付回调和 URL 参数均不能改变状态。
 

+ 104 - 8
tests/unit/ui-refactor/guestShopOrder.spec.js

@@ -65,7 +65,9 @@ function mount(order = 'SAMPLE-ORDER') {
   return vm
 }
 beforeEach(() => {
+  jest.useFakeTimers()
   jest.clearAllMocks()
+  fetchGuestOrderDetail.mockReset()
   errors.length = 0
   usersInfo.accessToken.mockReturnValue('')
   process.env.VUE_APP_BASE_DO_API = 'https://api.example.test'
@@ -81,6 +83,8 @@ afterEach(() => {
     vm.$el.remove()
   })
   jest.restoreAllMocks()
+  jest.clearAllTimers()
+  jest.useRealTimers()
   expect(errors).toEqual([])
 })
 it('requests the anonymous detail by the URL reference and renders server data without adding tax', async() => {
@@ -137,7 +141,7 @@ it('clears old details while querying another order and ignores the older respon
   expect(vm.$el.textContent).toContain('New recipient')
   expect(vm.$el.textContent).not.toContain('Sample recipient')
 })
-it('ignores a response after the page is destroyed', async() => {
+it.each([['valid', response()], ['empty', { data: null }]])('ignores a late %s response after the page is destroyed', async(type, result) => {
   let finish
   fetchGuestOrderDetail.mockImplementationOnce(
     () =>
@@ -147,21 +151,113 @@ it('ignores a response after the page is destroyed', async() => {
   )
   const vm = mount()
   vm.$destroy()
-  finish(response())
+  finish(result)
+  await settle()
+  jest.advanceTimersByTime(10000)
   await settle()
   expect(vm.detail).toBeNull()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(1)
 })
-it('shows an error with retry and recovers from a failed query', async() => {
+it('keeps loading and retries automatically after a failed lookup', async() => {
   fetchGuestOrderDetail.mockRejectedValueOnce(new Error('not found'))
   const vm = mount()
   await settle()
-  expect(vm.$el.textContent).toContain('Unable to load this order')
-  const retry = [...vm.$el.querySelectorAll('button')].find(button =>
-    button.textContent.includes('Retry')
-  )
-  retry.click()
+  expect(vm.loading).toBe(true)
+  expect(vm.failed).toBe(false)
+  expect(vm.$el.textContent).not.toContain('Unable to load this order')
+  jest.advanceTimersByTime(2000)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(2)
+  expect(vm.$el.textContent).toContain('Sample product')
+  expect(vm.loading).toBe(false)
+})
+it.each([null, {}, { order: null }, { order: {}}])('polls an order that is not available yet (%j) and stops when it arrives', async data => {
+  fetchGuestOrderDetail.mockResolvedValueOnce({ data }).mockResolvedValueOnce({ data: { order: null }})
+  const vm = mount()
+  await settle()
+  expect(vm.detail).toBeNull()
+  expect(vm.loading).toBe(true)
+  expect(vm.failed).toBe(false)
+  jest.advanceTimersByTime(1999)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(1)
+  jest.advanceTimersByTime(1)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(2)
+  expect(vm.loading).toBe(true)
+  expect(vm.$el.textContent).not.toContain('Unable to load this order')
+  jest.advanceTimersByTime(2000)
   await settle()
+  expect(fetchGuestOrderDetail.mock.calls).toEqual(Array(3).fill([{ orderSn: 'SAMPLE-ORDER' }]))
+  expect(vm.detail.order.SN).toBe('SAMPLE-ORDER')
+  expect(vm.loading).toBe(false)
   expect(vm.$el.textContent).toContain('Sample product')
+  jest.advanceTimersByTime(10000)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(3)
+})
+it('waits for an in-flight lookup to finish before scheduling the next poll', async() => {
+  let finish
+  fetchGuestOrderDetail.mockImplementationOnce(() => new Promise(resolve => { finish = resolve }))
+  const vm = mount()
+  await settle()
+  jest.advanceTimersByTime(10000)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(1)
+  finish({ data: null })
+  await settle()
+  jest.advanceTimersByTime(2000)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(2)
+  expect(vm.detail.order.SN).toBe('SAMPLE-ORDER')
+})
+it('cancels the old polling timer when switching order references', async() => {
+  fetchGuestOrderDetail.mockResolvedValueOnce({ data: null })
+  const vm = mount()
+  await settle()
+  fetchGuestOrderDetail.mockResolvedValue(response({ ...sample, SN: 'SECOND-ORDER' }))
+  vm.$route.query = { order: 'SECOND-ORDER' }
+  await settle()
+  jest.advanceTimersByTime(10000)
+  await settle()
+  expect(fetchGuestOrderDetail.mock.calls).toEqual([[{ orderSn: 'SAMPLE-ORDER' }], [{ orderSn: 'SECOND-ORDER' }]])
+  expect(vm.detail.order.SN).toBe('SECOND-ORDER')
+})
+it('stops polling when the order reference is removed', async() => {
+  fetchGuestOrderDetail.mockResolvedValueOnce({ data: null })
+  const vm = mount()
+  await settle()
+  vm.$route.query = {}
+  await settle()
+  jest.advanceTimersByTime(10000)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(1)
+  expect(vm.detail).toBeNull()
+  expect(vm.loading).toBe(false)
+})
+it('stops a scheduled poll when the page is destroyed', async() => {
+  fetchGuestOrderDetail.mockResolvedValueOnce({ data: null })
+  const vm = mount()
+  await settle()
+  vm.$destroy()
+  jest.advanceTimersByTime(10000)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(1)
+})
+it('does not schedule a poll from a late empty response after switching orders', async() => {
+  let finish
+  fetchGuestOrderDetail.mockImplementationOnce(() => new Promise(resolve => { finish = resolve }))
+  const vm = mount()
+  await settle()
+  fetchGuestOrderDetail.mockResolvedValue(response({ ...sample, SN: 'SECOND-ORDER' }))
+  vm.$route.query = { order: 'SECOND-ORDER' }
+  await settle()
+  finish({ data: null })
+  await settle()
+  jest.advanceTimersByTime(10000)
+  await settle()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledTimes(2)
+  expect(vm.detail.order.SN).toBe('SECOND-ORDER')
 })
 it('rejects an unexpected order returned for this reference', async() => {
   fetchGuestOrderDetail.mockResolvedValue(response({ ...sample, SN: 'ANOTHER-ORDER' }))