Procházet zdrojové kódy

fix: [AE-会员端] 修改bug

bill před 3 týdny
rodič
revize
d54632412f

+ 4 - 2
src/ui-refactor/views/purchase/CheckoutFields.vue

@@ -20,15 +20,16 @@
         <span class="ng-purchase-help">【{{ memberName }}】</span>
       </el-form-item>
       <el-form-item
+        v-if="!upgrade"
         label="Reporting Center ID"
         :prop="self ? 'recUserName' : 'decUserName'"
-        required
+        :required="!stockist"
         for="ng-purchase-stockist"
       >
         <el-input
           id="ng-purchase-stockist"
           :value="self ? model.recUserName : model.decUserName"
-          :disabled="disabled"
+          :disabled="disabled || stockist"
           @input="change(self ? 'recUserName' : 'decUserName', $event)"
         />
       </el-form-item>
@@ -173,6 +174,7 @@ export default {
     model: { type: Object, required: true },
     self: Boolean,
     upgrade: Boolean,
+    stockist: Boolean,
     guest: Boolean,
     country: { type: Object, default: () => ({}) },
     disabled: Boolean,

+ 4 - 5
src/ui-refactor/views/purchase/PurchaseFlow.vue

@@ -183,7 +183,7 @@
             <el-form
               ref="payForm"
               :model="checkoutModel"
-              :rules="isSelf ? rules : {}"
+              :rules="isSelf && Number(isDec) !== 1 ? rules : {}"
               label-position="top"
               @submit.native.prevent="submitOrder"
             >
@@ -191,6 +191,7 @@
                 :model="checkoutModel"
                 :self="isSelf"
                 :upgrade="isUpgrade"
+                :stockist="!isUpgrade && Number(isDec) === 1"
                 :member-name="memberName || ''"
                 :regions="regionData || []"
                 :addresses="shippingAddressList"
@@ -413,11 +414,10 @@ export default {
       }))
     },
     checkoutModel() {
-      // 升级的报单中心由旧页顶层字段提交,表单显示沿用同一来源。
       return this.isSelf
         ? this.payForm
         : this.isUpgrade
-          ? { ...this.form, decUserName: this.decUserName }
+          ? this.form
           : this.newOrder
     },
     selectedPaymentName() {
@@ -447,8 +447,7 @@ export default {
   methods: {
     ...behavior.methods,
     updateCheckout(patch) {
-      if (this.isUpgrade && 'decUserName' in patch) this.decUserName = patch.decUserName
-      else Object.assign(this.isUpgrade ? this.form : this.checkoutModel, patch)
+      Object.assign(this.checkoutModel, patch)
     }
   }
 }

+ 7 - 0
src/ui-refactor/views/purchase/README.md

@@ -24,6 +24,7 @@
 - 复消三类保留原 `SELL_PRICE × 数量 × DISCOUNT / 100`、BV 折扣、税额展示、自提及免运费逻辑;升级仍按原价格/BV计算。税额不再次加到总额。
 - 自动续期门槛来自 `ampDivideLine`,未取得有效门槛或不足时禁止结算和提交,支付方式继续排除 `prp`。
 - 升级保留会员查询、目标等级选择、商品选择的原顺序;保留满级/报单中心限制、等级及差额字段、原提交校验。未增加差额 BV 拦截。
+- Reporting Center ID 沿用旧 `isDec` 规则:普通会员可编辑且必填;报单中心(`Number(isDec) === 1`)默认填当前报单中心账号并禁用编辑。默认账号继续由旧 watcher 与会员切换逻辑填入。会员升级不展示该字段,也不增加人工填写校验,提交仍保留原接口返回的 `decUserName`。
 - 支付方式、支付密码提示、API、金额来源、Paystack channels、取消中间订单及成功后的订单分类沿用对应旧页。新页面将旧订单地址转为首页 Orders 对应分类;旧页面、旧路由及提交方法保留。新层锁定提交上下文,阻止重复提交、支付中切换和上一交易的迟到回调;取消失败保留支付窗口和商品,便于重试。
 
 ## 验证证据
@@ -80,3 +81,9 @@ node src/ui-refactor/views/purchase/__tests__/verifyBrowser.cjs "$env:TEMP/ng-pu
 - 单元测试和浏览器样例均改用不含 `number` 的接口结构。购买相关 49 项通过;会员端全套 162 项通过、同样 7 项既有失败,没有新增失败。
 - 8/8 故障注入被捕获,包含误要求返回编号、丢失订单会员编号、遗漏会员身份校验;原文件已恢复。定向 lint、临时生产构建及 90 组浏览器布局/流程检查通过。
 - 未使用真实账号查询、下单或支付;覆盖率与工具限制仍见上一节。沿用上方复现命令。
+
+### 2026-10-23 Reporting Center ID 规则修正
+
+按用户提供的旧 `isDec` 规则,三类复消与 Member Welcome Pack 的普通会员可填写必填报单中心;报单中心账号自动填入当前会员编号并禁用编辑。会员升级隐藏该项,不再增加人工填写校验,仍按原提交契约使用接口返回的 `decUserName`。升级页的 `isDec` 是原资格限制标志,不当作复消的 stockist 展示状态。
+
+购买、Welcome Pack 与游客相关回归为 265 项通过、与本轮基线同名的 4 项既有 Tax 展示失败;定向 lint、生产构建通过。隔离浏览器覆盖普通会员/报单中心下三种购买来源、Welcome Pack 和升级共 9 种状态,六种视口共 54 项布局与字段检查通过,没有页面错误或未配置请求。仅使用样例登录状态和 API 响应,未执行真实订单或扣款。日志与截图在本机临时目录 `ng-reporting-center-*`。

+ 50 - 15
src/ui-refactor/views/purchase/__tests__/PurchaseFlow.spec.js

@@ -57,9 +57,13 @@ async function withProducts(source = names[0]) {
   vm.changeQuantity({ row: product, value: 2 })
   vm.stage = 'checkout'
   await settle()
-  if (vm.isSelf) vm.payForm.recUserName = 'RC1'
-  else if (!vm.isUpgrade) Object.assign(vm.newOrder, { decUserName: 'RC1', consignee: 'Recipient', mobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street' })
-  else Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street', remark: 'Note' })
+  if (vm.isSelf) {
+    if (Number(vm.isDec) !== 1) vm.payForm.recUserName = 'RC1'
+  } else if (!vm.isUpgrade) {
+    Object.assign(vm.newOrder, { ...(Number(vm.isDec) === 1 ? {} : { decUserName: 'RC1' }), consignee: 'Recipient', mobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street' })
+  } else {
+    Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street', remark: 'Note' })
+  }
   await settle()
   return vm
 }
@@ -221,7 +225,7 @@ it.each(names.filter(source => source !== 'repeat-purchase'))('separates %s ship
   const shippingCard = vm.$el.querySelector('.ng-purchase-shipping-address')
   expect(memberCard.nextElementSibling).toBe(shippingCard)
   expect(memberCard.querySelector('#ng-purchase-member-readonly')).not.toBeNull()
-  expect(memberCard.querySelector('#ng-purchase-stockist')).not.toBeNull()
+  expect(Boolean(memberCard.querySelector('#ng-purchase-stockist'))).toBe(!vm.isUpgrade)
   expect(memberCard.querySelector('#ng-purchase-consignee')).toBeNull()
   expect(shippingCard.querySelector('h2').textContent).toBe('Shipping address')
   expect(shippingCard.querySelector('#ng-purchase-consignee')).not.toBeNull()
@@ -478,37 +482,33 @@ const submissions = [
   ['member-auto-maintenance', shop.createAutoMaintenanceOrder, shop.createApproachAutoMaintenanceOrder, '/shop/own-order'],
   ['member-upgrade', user.fetchSendUpgrade, user.fetchSendUpgrade, '/shop/member-order']
 ]
-it.each(names)('%s keeps Reporting Center ID required and editable for every stockist status', async source => {
+it.each(names.filter(source => source !== 'member-upgrade'))('%s locks the default Reporting Center ID only for stockist accounts', async source => {
   const vm = await withProducts(source)
   for (const status of [0, '0', 1, '1', false, true]) {
     vm.isDec = status
     await settle()
     const input = vm.$el.querySelector('#ng-purchase-stockist')
-    expect(input.disabled).toBe(false)
-    expect(input.closest('.el-form-item').classList.contains('is-required')).toBe(true)
+    const stockist = Number(status) === 1
+    expect(input.disabled).toBe(stockist)
+    expect(input.closest('.el-form-item').classList.contains('is-required')).toBe(!stockist)
+    if (stockist) expect(input.value).toBe('OP1')
   }
 })
 
-it.each(submissions)('%s submits the Reporting Center ID entered in the form', async(source, api) => {
+it.each(submissions.filter(([source]) => source !== 'member-upgrade'))('%s submits the Reporting Center ID entered by a regular member', async(source, api) => {
   const vm = await withProducts(source)
   vm.activePayType = 'cash'
   const input = vm.$el.querySelector('#ng-purchase-stockist')
   input.value = 'RC-EDITED'
   input.dispatchEvent(new Event('input', { bubbles: true }))
-  if (vm.isUpgrade) {
-    const recipient = vm.$el.querySelector('#ng-purchase-consignee')
-    recipient.value = 'Edited recipient'
-    recipient.dispatchEvent(new Event('input', { bubbles: true }))
-  }
   await settle()
   expect(vm.$el.querySelector('#ng-purchase-stockist').value).toBe('RC-EDITED')
   vm.submitOrder()
   await settle()
   expect(api).toHaveBeenCalledWith(expect.objectContaining({ [vm.isSelf ? 'userName' : 'decUserName']: 'RC-EDITED' }))
-  if (vm.isUpgrade) expect(api).toHaveBeenCalledWith(expect.objectContaining({ consignee: 'Edited recipient' }))
 })
 
-it.each(submissions)('%s blocks submission when the entered Reporting Center ID is empty', async(source, api) => {
+it.each(submissions.filter(([source]) => source !== 'member-upgrade'))('%s blocks submission when the regular member Reporting Center ID is empty', async(source, api) => {
   const vm = await withProducts(source)
   const input = vm.$el.querySelector('#ng-purchase-stockist')
   input.value = ''
@@ -521,6 +521,41 @@ it.each(submissions)('%s blocks submission when the entered Reporting Center ID
   expect(vm.busy).toBe(false)
 })
 
+it.each(submissions.filter(([source]) => source !== 'member-upgrade'))('%s submits the default stockist account without requiring an edit', async(source, api) => {
+  shop.fetchShoppingCart.mockImplementation(async() => { const value = settings(); value.data.isDec = '1'; return value })
+  const vm = await withProducts(source)
+  vm.activePayType = 'cash'
+  const input = vm.$el.querySelector('#ng-purchase-stockist')
+  expect(input.disabled).toBe(true)
+  expect(input.value).toBe('OP1')
+  vm.submitOrder()
+  await settle()
+  expect(api).toHaveBeenCalledWith(expect.objectContaining({ [vm.isSelf ? 'userName' : 'decUserName']: 'OP1' }))
+})
+
+it.each(['cash', 'pay_stack'])('hides Reporting Center ID for upgrade and preserves backend values with %s', async payType => {
+  const vm = await withProducts('member-upgrade')
+  expect(vm.$el.querySelector('#ng-purchase-stockist')).toBeNull()
+  expect(vm.$el.textContent).not.toContain('Reporting Center ID')
+  expect(vm.$el.querySelector('#ng-purchase-member-readonly')).not.toBeNull()
+  const recipient = vm.$el.querySelector('#ng-purchase-consignee')
+  recipient.value = 'Edited recipient'
+  recipient.dispatchEvent(new Event('input', { bubbles: true }))
+  vm.activePayType = payType
+  vm.submitOrder()
+  await settle()
+  expect(user.fetchSendUpgrade).toHaveBeenCalledWith(expect.objectContaining({ decUserName: 'RC1', consignee: 'Edited recipient' }))
+})
+
+it('does not add a Reporting Center ID requirement to the upgrade request', async() => {
+  const vm = await withProducts('member-upgrade')
+  vm.decUserName = ''
+  vm.activePayType = 'cash'
+  vm.submitOrder()
+  await settle()
+  expect(user.fetchSendUpgrade).toHaveBeenCalledWith(expect.objectContaining({ decUserName: '' }))
+})
+
 it.each(submissions)('%s submits once, preserving the original member and delivery fields', async(source, api, unused, destination) => {
   const vm = await withProducts(source)
   vm.activePayType = 'cash'

+ 1 - 1
src/ui-refactor/views/purchase/submitPurchase.js

@@ -5,7 +5,7 @@ import { fetchSendUpgrade } from '@/api/user'
 export default async function submitPurchase() {
   const type = this.activePayType
   if (this.isSelf && !(await new Promise(resolve => this.$refs.payForm.validate(resolve)))) return
-  if (!this.isSelf && !(this.isUpgrade ? this.decUserName : this.newOrder.decUserName)) {
+  if (!this.isSelf && !this.isUpgrade && !this.newOrder.decUserName) {
     this.$message.error(this.$t('shop.declarationCenterNumberTips'))
     return
   }

+ 0 - 1
src/ui-refactor/views/welcome-pack/MemberWelcomePack.vue

@@ -232,7 +232,6 @@ export default {
         this.$message.error('Your account has changed. Please reload this page.')
         return
       }
-      this.form.recUserName = this.form.conUserName = this.operatorId
       Legacy.methods.onSubmit.call(this)
     },
     async handleClose() {

+ 2 - 2
src/ui-refactor/views/welcome-pack/README.md

@@ -4,9 +4,9 @@
 
 - 新页面沿用 SignupPage 的分组表单、SignupProducts 和现有公开布局;旧 Welcome Pack、游客注册和认证逻辑保留。
 - 首页 Member Welcome Pack 进入 `/dashboard/member-welcome-pack`,受现有登录守卫保护。
-- Network Information 两个 ID 固定为 `usersInfo.userName()`(会员编号,不是内部 userId),不读取邀请 query。
+- Network Information 的 Referrer ID、Actual Referrer ID 初始值为 `usersInfo.userName()`(会员编号,不是内部 userId),两项均可编辑,提交使用用户当前填写值;不读取邀请 query。当前登录操作者与会话校验仍独立保留。
 - Country 使用登录缓存 `baseData.COUNTRY_ID`,只读;新会员编号继续取会员 `GET /v1/user/dec` 的 `userName`。
-- Reporting Center ID 可编辑;stockist 初始化时仍默认当前会员编号,保存提交用户修改后的值。加载或提交期间沿用外层表单的禁用状态,原必填校验保留。
+- Reporting Center ID 按旧 `isDec` 规则处理:普通会员可编辑且必填;stockist 默认填当前报单中心账号并禁用编辑。加载或提交期间沿用外层表单的禁用状态,原提交字段保留。
 - 国家/语言列表使用现有接口;产品、等级、地区、银行、余额及支付方式取登录后的 Welcome Pack 接口。
 - 提交保持旧 `POST /v1/user/dec` 字段、MARKET_PRICE 计价、BV/含税算法与自动安置;成功后跳转首页 Orders 下的 Member orders(`/dashboard/index?tab=orders&orderCategory=member`)。保留银行信息,配送方式不额外加入旧请求体。
 - 支付展示按截图区分 Paystack 和 Account Balance,金额及余额来自实际状态,不移植演示数值或游客 accessCode 协议。

+ 11 - 2
src/ui-refactor/views/welcome-pack/WelcomePackFields.vue

@@ -3,10 +3,18 @@
     <ui-section-card title="Network Information">
       <div class="ng-welcome-grid">
         <el-form-item label="Referrer ID" for="ng-welcome-referrer">
-          <el-input id="ng-welcome-referrer" :value="form.recUserName" readonly />
+          <el-input
+            id="ng-welcome-referrer"
+            :value="form.recUserName"
+            @input="change('recUserName', $event)"
+          />
         </el-form-item>
         <el-form-item label="Actual Referrer ID" for="ng-welcome-actual-referrer">
-          <el-input id="ng-welcome-actual-referrer" :value="form.conUserName" readonly />
+          <el-input
+            id="ng-welcome-actual-referrer"
+            :value="form.conUserName"
+            @input="change('conUserName', $event)"
+          />
         </el-form-item>
       </div>
     </ui-section-card>
@@ -59,6 +67,7 @@
           <el-input
             id="ng-welcome-center"
             :value="form.decUserName"
+            :disabled="stockist"
             @input="change('decUserName', $event)"
           />
         </el-form-item>

+ 35 - 7
src/ui-refactor/views/welcome-pack/__tests__/MemberWelcomePack.spec.js

@@ -76,7 +76,7 @@ afterEach(async() => {
   jest.useRealTimers()
 })
 
-it('initializes the logged-in APIs, fixed operator IDs and account country while keeping the new member ID', async() => {
+it('initializes the logged-in APIs, default referrer IDs and fixed account country while keeping the new member ID', async() => {
   const vm = await ready()
   expect(user.fetchWelcomePack).toHaveBeenCalledWith({ countryId: 'C1' })
   expect(vm.form.recUserName).toBe('NG-OPERATOR')
@@ -84,13 +84,32 @@ it('initializes the logged-in APIs, fixed operator IDs and account country while
   expect(vm.form.insertUserName).toBe('NG-NEW')
   expect(vm.form.languageId).toBe('EN')
   expect(vm.$el.querySelector('#ng-welcome-country').readOnly).toBe(true)
-  expect(vm.$el.querySelector('#ng-welcome-referrer').readOnly).toBe(true)
+  expect(vm.$el.querySelector('#ng-welcome-referrer').readOnly).toBe(false)
+  expect(vm.$el.querySelector('#ng-welcome-actual-referrer').readOnly).toBe(false)
   expect(vm.$el.querySelector('#ng-welcome-actual-referrer').value).toBe('NG-OPERATOR')
   expect(vm.$el.textContent).toContain('Bank Information')
   expect(user.fetchGuestDec).not.toHaveBeenCalled()
   expect(user.createGuestDec).not.toHaveBeenCalled()
 })
 
+it.each(['cash', 'pay_stack'])('submits edited referrer IDs for %s without resetting them to the operator', async payType => {
+  const vm = await order()
+  for (const [id, value] of [['ng-welcome-referrer', 'NG-REFERRER'], ['ng-welcome-actual-referrer', 'NG-ACTUAL']]) {
+    const input = vm.$el.querySelector('#' + id)
+    expect(input.readOnly).toBe(false)
+    input.value = value
+    input.dispatchEvent(new Event('input', { bubbles: true }))
+    await settle()
+  }
+  expect(vm.form.recUserName).toBe('NG-REFERRER')
+  expect(vm.form.conUserName).toBe('NG-ACTUAL')
+  expect(vm.$el.querySelector('#ng-welcome-country').readOnly).toBe(true)
+  expect(vm.$el.querySelector('#ng-welcome-member').readOnly).toBe(true)
+  vm.form.payType = payType
+  vm.onSubmit()
+  expect(user.createWelcomePack).toHaveBeenCalledWith(expect.objectContaining({ recUserName: 'NG-REFERRER', conUserName: 'NG-ACTUAL' }))
+})
+
 it.each(['cash', 'pay_stack'])('keeps the exact legacy %s request and payment response mapping', async payType => {
   const vm = await order()
   vm.form.payType = payType
@@ -287,20 +306,29 @@ it('does not request an order setup if account country or member ID is missing',
   expect(vm.$el.textContent).toContain('country')
 })
 
-it('defaults the stockist reporting center to the operator and submits the edited ID', async() => {
+it('defaults and locks the stockist reporting center to the operator account', async() => {
   user.fetchWelcomePack.mockImplementation(async() => { const response = settings(); response.data.isDec = '1'; return response })
   const vm = await ready()
   expect(vm.form.decUserName).toBe('NG-OPERATOR')
   const input = vm.$el.querySelector('#ng-welcome-center')
+  expect(input.disabled).toBe(true)
+  expect(input.value).toBe('NG-OPERATOR')
+  expect(input.closest('.el-form-item').classList.contains('is-required')).toBe(false)
+  Object.assign(vm.form, { decLv: 'L1', payType: 'cash' })
+  vm.toggleProduct(vm.tableData[0])
+  vm.onSubmit()
+  expect(user.createWelcomePack).toHaveBeenCalledWith(expect.objectContaining({ decUserName: 'NG-OPERATOR' }))
+})
+
+it('keeps Reporting Center ID editable and required for regular members', async() => {
+  const vm = await ready()
+  const input = vm.$el.querySelector('#ng-welcome-center')
   expect(input.disabled).toBe(false)
+  expect(input.closest('.el-form-item').classList.contains('is-required')).toBe(true)
   input.value = 'OTHER-CENTER'
   input.dispatchEvent(new Event('input', { bubbles: true }))
   await settle()
   expect(vm.form.decUserName).toBe('OTHER-CENTER')
-  Object.assign(vm.form, { decLv: 'L1', payType: 'cash' })
-  vm.toggleProduct(vm.tableData[0])
-  vm.onSubmit()
-  expect(user.createWelcomePack).toHaveBeenCalledWith(expect.objectContaining({ decUserName: 'OTHER-CENTER' }))
 })
 
 it.each(['userBalance', 'sellType'])('rejects setup with missing %s instead of allowing an order', async field => {