@pisell/pisellos 0.10.43 → 0.10.44

package/lib/solution/BaseSales/index.js

@@ -302,7 +302,57 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
   loadedValue.forEach(appendOrReplaceByUid);
   return result;
 }
+
+// checkout / realtime snapshots may reorder protocol arrays or append persistence fields.
+// Compare only the Sales Note protocol fields so a matching remote echo can acknowledge dirty state.
+function normalizeBaseSalesNotesForComparison(value, options) {
+  if (!Array.isArray(value)) return null;
+  const unresolvedOrderTargetUuid = String(options?.unresolvedOrderTargetUuid ?? '').trim();
+  return value.map(note => {
+    if (!note || typeof note !== 'object' || Array.isArray(note)) {
+      return (0, _lodashEs.cloneDeep)(note);
+    }
+    const noteRecord = note;
+    const relations = Array.isArray(noteRecord.note_relations) ? noteRecord.note_relations.map(relation => {
+      if (!relation || typeof relation !== 'object' || Array.isArray(relation)) {
+        return (0, _lodashEs.cloneDeep)(relation);
+      }
+      const shouldResolveOrderTarget = relation.is_primary === 0 && relation.relation_type === 'related_to' && relation.target_type === 'order' && String(relation.target_uuid ?? '').trim() === '' && unresolvedOrderTargetUuid.length > 0;
+      return {
+        uuid: relation.uuid,
+        relation_type: relation.relation_type,
+        target_type: relation.target_type,
+        target_uuid: shouldResolveOrderTarget ? unresolvedOrderTargetUuid : relation.target_uuid,
+        is_primary: relation.is_primary
+      };
+    }).sort((left, right) => String(left?.uuid ?? '').localeCompare(String(right?.uuid ?? ''))) : (0, _lodashEs.cloneDeep)(noteRecord.note_relations);
+    return {
+      uuid: noteRecord.uuid,
+      note_type: noteRecord.note_type,
+      content: {
+        text: (0, _lodashEs.cloneDeep)(noteRecord.content?.text)
+      },
+      importance: noteRecord.importance,
+      note_relations: relations
+    };
+  }).sort((left, right) => String(left?.uuid ?? '').localeCompare(String(right?.uuid ?? '')));
+}
+function areBaseSalesNotesEquivalent(currentValue, loadedValue, options) {
+  const currentNotes = normalizeBaseSalesNotesForComparison(currentValue, {
+    unresolvedOrderTargetUuid: options?.currentOrderTargetUuid
+  });
+  const loadedNotes = normalizeBaseSalesNotesForComparison(loadedValue);
+  return currentNotes !== null && loadedNotes !== null && (0, _lodashEs.isEqual)(currentNotes, loadedNotes);
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
+  const loadedHasOrderMetaList = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'order_meta_list');
+  const loadedHasSalesNotes = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'notes');
+  const hasDirtyLocalSalesNotes = currentTempOrder?._extend?.salesNotesState?.dirty === true;
+  const incomingSalesNotesMatchLocal = loadedHasSalesNotes && areBaseSalesNotesEquivalent(currentTempOrder?.notes, loadedRecord.notes, {
+    currentOrderTargetUuid: loadedRecord?.shop_order_number || currentTempOrder?.shop_order_number
+  });
+  const shouldAwaitAuthoritativeSalesNotes = strategy === 'authoritative-incoming' && hasDirtyLocalSalesNotes && (Number(loadedRecord?.need_sync) === 1 || !incomingSalesNotesMatchLocal);
+  const preserveDirtyLocalSalesNotes = hasDirtyLocalSalesNotes && (strategy === 'preserve-local' || shouldAwaitAuthoritativeSalesNotes);
   const normalizedLoadedRecord = normalizeBaseSalesRecordCollections(loadedRecord || {}, {
     ensureUid: false
   });
@@ -314,6 +364,18 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   });
   const uidRemaps = [];
   const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+    // order_meta_list 是服务端/本地订单携带的完整业务快照。若 incoming
+    // 明确提供它，必须整体替换；若省略，则保留当前值，避免 snapshot
+    // 数组递归拼接后出现同 ID 的旧数据。
+    if (key === 'order_meta_list') {
+      return (0, _lodashEs.cloneDeep)(loadedHasOrderMetaList ? loadedValue : currentValue);
+    }
+    if (key === 'notes') {
+      if (preserveDirtyLocalSalesNotes && Array.isArray(currentValue)) {
+        return (0, _lodashEs.cloneDeep)(currentValue);
+      }
+      if (Array.isArray(loadedValue)) return (0, _lodashEs.cloneDeep)(loadedValue);
+    }
     // small_ticket_data 是由 Server 一次性生成的完整展示快照，不能递归进入
     // locale 内部继续套用订单集合或普通数组的合并规则。
     if (key === 'small_ticket_data') {
@@ -342,7 +404,24 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
     return undefined;
   });
   delete mergedRecord.request_unique_idempotency_token;
-  return normalizeBaseSalesRecordCollections((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps));
+  const normalizedMergedRecord = normalizeBaseSalesRecordCollections((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps));
+  normalizedMergedRecord._extend = {
+    ...(normalizedMergedRecord._extend || {}),
+    salesNotesState: preserveDirtyLocalSalesNotes ? {
+      loaded: true,
+      dirty: true
+    } : loadedHasSalesNotes ? {
+      loaded: true,
+      dirty: normalizedLoadedRecord._extend?.salesNotesState?.dirty === true
+    } : {
+      loaded: false,
+      dirty: false
+    }
+  };
+  if (!loadedHasSalesNotes && !preserveDirtyLocalSalesNotes) {
+    delete normalizedMergedRecord.notes;
+  }
+  return normalizedMergedRecord;
 }
 function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
   if (!sourceRecord || typeof sourceRecord !== 'object') return sourceRecord;
@@ -1518,6 +1597,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) return '';
     return this.store.order.getTempOrderNote();
   }
+  getSalesNotes() {
+    if (!this.store.order) return [];
+    return this.store.order.getSalesNotes();
+  }
+  createSalesNotesMutationSnapshot() {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.createSalesNotesMutationSnapshot();
+  }
+  restoreSalesNotesMutationSnapshot(snapshot) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    this.store.order.restoreSalesNotesMutationSnapshot(snapshot);
+  }
+  async setSalesNote(input) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.setSalesNote(input);
+  }
+  async removeSalesNote(uuid) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.store.order.removeSalesNote(uuid);
+  }
+  async clearSalesNotes() {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.store.order.clearSalesNotes();
+  }
   updateTempOrderNote(note, sync = false) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
@@ -1545,6 +1648,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderDepositAmount(amount);
   }
+  setPickupReferenceMode(mode) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderPickupReferenceMode(mode);
+  }
+  setServiceType(serviceType) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderServiceType(serviceType);
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);
@@ -1778,44 +1889,84 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       return discount;
     });
   }
+  resolveDiscountConfigCustomerId(tempOrder) {
+    return Number(tempOrder?.customer_id || tempOrder?.customer?.id || tempOrder?._extend?.customerSnapshot?.id || tempOrder?._extend?.customerSnapshot?.customer_id || 0);
+  }
+
+  /**
+   * Stable across notifyTempOrderChanged's immutable object replacement, while
+   * still distinguishing two local orders for the same customer.
+   */
+  getDiscountConfigOrderIdentityKey(tempOrder) {
+    const identity = this.store.order?.getOrderIdentity?.();
+    return JSON.stringify([identity?.orderId ?? tempOrder?.order_id ?? '', tempOrder?.request_unique_idempotency_token ?? '', identity?.externalSaleNumber ?? tempOrder?.external_sale_number ?? '', identity?.localId ?? tempOrder?._extend?.localId ?? this.cacheId ?? '']);
+  }
   async loadDiscountConfig(params) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     const tempOrder = this.store.order.ensureTempOrder();
     const orderStore = this.store.order.store || {};
     const discountModule = orderStore.discount;
     const rulesModule = orderStore.rules;
-    const orderId = tempOrder.order_id || this.getOrderIdentity?.()?.orderId;
+    const orderId = tempOrder.order_id || this.store.order.getOrderIdentity?.()?.orderId;
     const customerId = Number(params?.customerId || tempOrder.customer_id || tempOrder.customer?.id || tempOrder._extend?.customerSnapshot?.id || tempOrder._extend?.customerSnapshot?.customer_id || 0);
     const currentDiscountList = discountModule?.getDiscountList?.() || [];
     const originalDiscountList = discountModule?.getOriginalDiscountList?.() || [];
     const hasManualDiscountSelection = this.hasManualDiscountSelection || currentDiscountList.some(discount => discount.isManualSelect);
     const discountAction = params?.action || (orderId ? 'edit' : 'create');
-    const discountConfigCacheKey = [customerId, discountAction, Number(orderId) || 0].join(':');
-    let preparedDiscountList = [];
+    const requestOrderIdentityKey = this.getDiscountConfigOrderIdentityKey(tempOrder);
+    const discountConfigCacheKey = JSON.stringify([customerId, discountAction, Number(orderId) || 0, requestOrderIdentityKey]);
+    let requestEpoch = this.store.order.getCustomerWalletPrepareConfigEpoch?.();
+    const isCurrentRequest = () => {
+      const currentTempOrder = this.store.order?.getTempOrder?.();
+      return Boolean(currentTempOrder && (requestEpoch === undefined || this.store.order?.getCustomerWalletPrepareConfigEpoch?.() === requestEpoch) && this.resolveDiscountConfigCustomerId(currentTempOrder) === customerId && this.getDiscountConfigOrderIdentityKey(currentTempOrder) === requestOrderIdentityKey);
+    };
+    const getCurrentResult = () => {
+      const currentTempOrder = this.store.order?.getTempOrder?.();
+      return {
+        productList: currentTempOrder?.products || [],
+        discountList: discountModule?.getDiscountList?.() || [],
+        availableWalletIds: this.getAvailableWalletIds(),
+        virtualCurrencyList: this.getVirtualCurrencyList()
+      };
+    };
+
+    // Walk-In 不请求 prepare config；当前搜索/扫码券必须继续参与本次重算。
+    // current 优先于 original，保留搜索后的最新选择与可用状态。
+    const searchedDiscountList = currentDiscountList.filter(discount => discount.isScan);
+    const searchedDiscountIds = new Set(searchedDiscountList.map(discount => String(discount.id)));
+    let preparedDiscountList = [...searchedDiscountList, ...originalDiscountList.filter(discount => !searchedDiscountIds.has(String(discount.id)))];
     if (customerId && customerId !== 1) {
       if (!params?.force && this.discountConfigCacheKey === discountConfigCacheKey) {
         preparedDiscountList = originalDiscountList;
       } else {
-        preparedDiscountList = await this.store.order.loadDiscountConfig({
+        const prepareConfigPromise = this.store.order.loadDiscountConfig({
           customerId,
           action: discountAction,
           orderId: Number(orderId) || undefined,
           apply: false
         });
-        this.discountConfigCacheKey = discountConfigCacheKey;
+        // OrderModule increments this epoch synchronously before its first await.
+        requestEpoch = this.store.order.getCustomerWalletPrepareConfigEpoch?.();
+        preparedDiscountList = await prepareConfigPromise;
+        if (!isCurrentRequest()) return getCurrentResult();
         await discountModule?.setOriginalDiscountList?.(preparedDiscountList);
+        if (!isCurrentRequest()) return getCurrentResult();
+        this.discountConfigCacheKey = discountConfigCacheKey;
       }
     }
     if (this.isActiveVirtualSettlementOrder(tempOrder)) {
+      if (!isCurrentRequest()) return getCurrentResult();
       await discountModule?.setOriginalDiscountList?.([]);
+      if (!isCurrentRequest()) return getCurrentResult();
       await discountModule?.setDiscountList?.([]);
+      if (!isCurrentRequest()) return getCurrentResult();
       tempOrder.discount_list = [];
       tempOrder.shop_discount = '0.00';
       return {
         productList: tempOrder.products || [],
         discountList: [],
         availableWalletIds: this.getAvailableWalletIds(),
-        virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+        virtualCurrencyList: this.getVirtualCurrencyList()
       };
     }
     if (hasManualDiscountSelection && currentDiscountList.length) {
@@ -1823,12 +1974,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         productList: tempOrder.products || [],
         discountList: currentDiscountList,
         availableWalletIds: this.getAvailableWalletIds(),
-        virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+        virtualCurrencyList: this.getVirtualCurrencyList()
       };
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(preparedDiscountList || discountModule?.getDiscountList?.() || [], tempOrder.products || []);
     nextDiscountList = this.mergeCurrentDiscountSelectionState(nextDiscountList, currentDiscountList);
+    if (!isCurrentRequest()) return getCurrentResult();
     await discountModule?.setDiscountList(nextDiscountList);
+    if (!isCurrentRequest()) return getCurrentResult();
     const shouldSkipAutoApplyFetchedDiscounts = this.shouldSkipAutoApplyFetchedDiscountsInEditMode({
       discountAction,
       products: tempOrder.products || [],
@@ -1836,24 +1989,28 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       nextDiscountList
     });
     if (shouldSkipAutoApplyFetchedDiscounts) {
-      const summary = await this.store.order.recalculateSummary({
+      await this.store.order.recalculateSummary({
         createIfMissing: true
       });
+      if (!isCurrentRequest()) return getCurrentResult();
       this.store.order.persistTempOrder();
+      if (!isCurrentRequest()) return getCurrentResult();
       await this.effectsEmit('onDiscountApplied', {
         productList: tempOrder.products || [],
         discountList: nextDiscountList,
         selectedDiscountList: tempOrder.discount_list || [],
         tempOrder
       });
+      if (!isCurrentRequest()) return getCurrentResult();
       return {
         productList: tempOrder.products || [],
         discountList: nextDiscountList,
         availableWalletIds: this.getAvailableWalletIds(),
-        virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+        virtualCurrencyList: this.getVirtualCurrencyList()
       };
     }
     if (rulesModule) {
+      if (!isCurrentRequest()) return getCurrentResult();
       const orderTotalAmount = Number(orderStore.summary?.total_amount || 0);
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
@@ -1889,25 +2046,31 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (result.discountList) {
         nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
         _Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
+        if (!isCurrentRequest()) return getCurrentResult();
         await discountModule?.setDiscountList(nextDiscountList);
+        if (!isCurrentRequest()) return getCurrentResult();
         tempOrder.discount_list = nextDiscountList.filter(discount => discount.isSelected);
       }
     }
-    const summary = await this.store.order.recalculateSummary({
+    if (!isCurrentRequest()) return getCurrentResult();
+    await this.store.order.recalculateSummary({
       createIfMissing: true
     });
+    if (!isCurrentRequest()) return getCurrentResult();
     this.store.order.persistTempOrder();
+    if (!isCurrentRequest()) return getCurrentResult();
     await this.effectsEmit('onDiscountApplied', {
       productList: tempOrder.products || [],
       discountList: nextDiscountList,
       selectedDiscountList: tempOrder.discount_list || [],
       tempOrder
     });
+    if (!isCurrentRequest()) return getCurrentResult();
     return {
       productList: tempOrder.products || [],
       discountList: nextDiscountList,
       availableWalletIds: this.getAvailableWalletIds(),
-      virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+      virtualCurrencyList: this.getVirtualCurrencyList()
     };
   }
   getAvailableWalletIds() {
@@ -2761,7 +2924,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (this.store.payment) {
       const committed = this.getCommittedWalletAssets();
       const state = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-      void this.publishWalletAssetsState(state);
+      void this.publishWalletAssetsState(state, 'local');
     }
     return payments;
   }
@@ -2907,9 +3070,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       })
     };
   }
-  async publishWalletAssetsState(state) {
+  async publishWalletAssetsState(state, changeSource = 'derived') {
     await this.effectsEmit(_types.BaseSalesHookNames.onWalletAssetsStateChanged, {
-      state
+      state,
+      changeSource
     });
     return state;
   }
@@ -3043,7 +3207,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       source: params.source
     });
     await this.syncSelectedWalletAssets(state);
-    return this.publishWalletAssetsState(state);
+    return this.publishWalletAssetsState(state, 'local');
   }
 
   /** 更新已选钱包资产的手动使用金额，并同步 pending payment。 */
@@ -3051,7 +3215,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     const state = this.store.payment.wallet.updateWalletAssetAmount(params.assetId, params.amount);
     await this.syncSelectedWalletAssets(state);
-    return this.publishWalletAssetsState(state);
+    return this.publishWalletAssetsState(state, 'local');
   }
 
   /** 扫码精确查券；仅可用资产会被自动选中。 */
@@ -3066,7 +3230,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     const result = await wallet.scanWalletAssetAsync(code);
     if (result.type === 'normalCode') {
       await this.syncSelectedWalletAssets(result.state);
-      await this.publishWalletAssetsState(result.state);
+      await this.publishWalletAssetsState(result.state, 'local');
     }
     return result;
   }
@@ -3076,7 +3240,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     const state = this.store.payment.wallet.clearWalletAssetSelection();
     await this.syncSelectedWalletAssets(state);
-    return this.publishWalletAssetsState(state);
+    return this.publishWalletAssetsState(state, 'local');
   }
 
   /**
@@ -3087,7 +3251,13 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
    */
   updateOrderCustomer(customer) {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    const previousCustomerId = this.resolveDiscountConfigCustomerId(this.store.order.getTempOrder?.());
     const result = this.store.order.updateTempOrderCustomer(customer);
+    const nextCustomerId = this.resolveDiscountConfigCustomerId(this.store.order.getTempOrder?.());
+    if (String(previousCustomerId) !== String(nextCustomerId)) {
+      this.discountConfigCacheKey = null;
+      this.hasManualDiscountSelection = false;
+    }
     this.store.order.recalculateSummary({
       createIfMissing: true
     });
@@ -3220,7 +3390,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       try {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-        await this.publishWalletAssetsState(walletState);
+        await this.publishWalletAssetsState(walletState, 'local');
       } catch (error) {
         this.logWarning('confirmWalletPayment: Wallet committed 状态同步失败', {
           error: error instanceof Error ? error.message : String(error)
@@ -3304,7 +3474,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-        await this.publishWalletAssetsState(walletState);
+        await this.publishWalletAssetsState(walletState, 'local');
       }
       return {
         payment: payment || {},
@@ -3410,7 +3580,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-        await this.publishWalletAssetsState(walletState);
+        await this.publishWalletAssetsState(walletState, 'local');
       }
       return {
         payment: payment || {},

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerDiscountRefreshTarget;
     private orderCustomerPromotionRefreshInFlight;
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;

package/lib/solution/BookingTicket/index.js

@@ -160,6 +160,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   addTimeProductsCatalog = [];
   orderCustomerDiscountRefreshInFlight = null;
   orderCustomerDiscountRefreshCustomerId = null;
+  orderCustomerDiscountRefreshTarget = null;
   orderCustomerPromotionRefreshInFlight = null;
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
@@ -1123,7 +1124,13 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   }
   refreshDiscountConfigAfterOrderCustomerChange(customerId) {
     if (!customerId || customerId === 1) return Promise.resolve();
-    if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
+    const tempOrder = this.store.order.getTempOrder?.();
+    const orderIdentity = this.getOrderIdentity?.();
+    const orderId = tempOrder?.order_id || orderIdentity?.orderId;
+    const action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+    const orderTarget = orderId ? `order:${String(orderId)}` : `external:${String(tempOrder?.external_sale_number || orderIdentity?.externalSaleNumber || orderIdentity?.localId || 'new')}`;
+    const refreshTarget = `${customerId}:${action}:${orderTarget}`;
+    if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshTarget === refreshTarget) {
       return this.orderCustomerDiscountRefreshInFlight;
     }
     const previousRefresh = this.orderCustomerDiscountRefreshInFlight;
@@ -1135,22 +1142,33 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       if (!currentCustomer || Number(currentCustomer.customer_id) !== customerId) {
         return;
       }
-      const tempOrder = this.store.order.getTempOrder?.();
-      const orderId = tempOrder?.order_id || this.getOrderIdentity?.()?.orderId;
-      const action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+      const currentTempOrder = this.store.order.getTempOrder?.();
+      const currentOrderIdentity = this.getOrderIdentity?.();
+      const currentOrderId = currentTempOrder?.order_id || currentOrderIdentity?.orderId;
+      const currentAction = !currentOrderId || String(currentOrderId).startsWith('local_order') ? 'create' : 'edit';
+      const currentOrderTarget = currentOrderId ? `order:${String(currentOrderId)}` : `external:${String(currentTempOrder?.external_sale_number || currentOrderIdentity?.externalSaleNumber || currentOrderIdentity?.localId || 'new')}`;
+      if (`${customerId}:${currentAction}:${currentOrderTarget}` !== refreshTarget) {
+        return;
+      }
+
+      // 上一个订单的迟到请求可能在客户切换后重新写入 BaseSales cache key；
+      // 客户变更触发的目标订单刷新必须绕过该缓存。
       await this.loadDiscountConfig({
         customerId,
-        action
+        action,
+        force: true
       });
     })();
     this.orderCustomerDiscountRefreshInFlight = refreshTask;
     this.orderCustomerDiscountRefreshCustomerId = customerId;
+    this.orderCustomerDiscountRefreshTarget = refreshTarget;
     refreshTask.catch(error => {
       console.error('Failed to load discount config after customer change:', error);
     }).finally(() => {
       if (this.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
       this.orderCustomerDiscountRefreshInFlight = null;
       this.orderCustomerDiscountRefreshCustomerId = null;
+      this.orderCustomerDiscountRefreshTarget = null;
     });
     return refreshTask;
   }

package/lib/solution/BookingTicket/utils/orderCustomer.js

@@ -23,7 +23,8 @@ function resolveCustomerDisplayName(customer) {
 
 /** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
 function formatOrderCustomerPatch(customer) {
-  const rawId = customer.id;
+  const c = customer;
+  const rawId = c.customer_id ?? c.customerId ?? customer.id;
   const numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && rawId !== null && rawId !== '' ? Number(rawId) : null;
   return {
     customer_id: Number.isFinite(numericId) ? numericId : null,

package/lib/solution/RegisterAndLogin/config.d.ts

@@ -10,7 +10,11 @@ export interface ApiConfig {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE';
     transformParams?: (params: any) => any;
     transformResponse?: (response: any) => any;
-    options?: Record<string, any>;
+    options?: Record<string, any> | ((params: any) => Record<string, any>);
+}
+export interface ApiCallerOptions {
+    baseUrl?: string;
+    shopDomain?: string;
 }
 /**
  * 渠道配置接口
@@ -65,12 +69,14 @@ export declare function getChannelConfig(channel: string): ChannelConfig;
 export declare class ApiCaller {
     private request;
     private config;
+    private options;
     constructor(request: {
         get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         delete: <T = any>(url: string, options?: any) => Promise<T>;
-    }, config: ChannelConfig);
+    }, config: ChannelConfig, options?: ApiCallerOptions);
+    private resolveUrl;
     /**
      * 执行 API 调用
      */
@@ -84,4 +90,4 @@ export declare function createApiCaller(request: {
     post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     delete: <T = any>(url: string, options?: any) => Promise<T>;
-}, channel: string): ApiCaller;
+}, channel: string, options?: ApiCallerOptions): ApiCaller;

package/lib/solution/RegisterAndLogin/config.js

@@ -15,6 +15,8 @@ exports.getChannelConfig = getChannelConfig;
  * API 配置接口
  */
 
+const h5CustomerAuthApiNames = new Set(['sendEmailVerificationCode', 'sendEmailLoginCode', 'sendSmsRegisterCode', 'sendEmailRegisterLink', 'verifyEmailRegistrationLink', 'emailPasswordLogin', 'emailCodeRegister', 'phoneCodeRegister', 'resendEmailRegisterLink', 'checkEmailLinkCode', 'sendSmsLoginCode', 'phoneCodeLogin', 'guestLogin', 'checkEmailExists', 'checkEmailCode', 'checkMobileCode', 'phonePasswordLogin', 'sendPasswordResetEmail', 'sendPasswordResetSms', 'sendResetPasswordLink', 'checkResetPasswordCode', 'resetPasswordByCode', 'resetPasswordByEmail', 'resetPasswordByPhone', 'verifyCode', 'register', 'login', 'oauthLogin', 'facebookLogin', 'appleLogin']);
+
 /**
  * 渠道配置接口
  */
@@ -278,6 +280,31 @@ const onlineStoreConfig = {
     })
   }
 };
+function withH5AuthPrefix(config) {
+  const nextConfig = {};
+  Object.entries(config).forEach(([key, apiConfig]) => {
+    if (!apiConfig.url.startsWith('/auth/')) {
+      nextConfig[key] = apiConfig;
+      return;
+    }
+    nextConfig[key] = {
+      ...apiConfig,
+      url: apiConfig.url.startsWith('/h5/') ? apiConfig.url : `/h5${apiConfig.url}`,
+      options: params => {
+        const {
+          withCredentials,
+          ...baseOptions
+        } = (typeof apiConfig.options === 'function' ? apiConfig.options(params) : apiConfig.options) || {};
+        return {
+          ...baseOptions,
+          prefix: false
+        };
+      }
+    };
+  });
+  return nextConfig;
+}
+const h5OnlineStoreConfig = withH5AuthPrefix(onlineStoreConfig);
 
 /**
  * 默认配置（通用配置）
@@ -1066,6 +1093,7 @@ const shopWebposConfig = {
  */
 const channelConfigMap = exports.channelConfigMap = {
   'online-store': onlineStoreConfig,
+  'online-store-h5': h5OnlineStoreConfig,
   'default': defaultConfig,
   'webpos': webposConfig,
   'shop.webpos': shopWebposConfig
@@ -1083,9 +1111,16 @@ function getChannelConfig(channel) {
  * 负责根据配置执行 API 调用
  */
 class ApiCaller {
-  constructor(request, config) {
+  constructor(request, config, options = {}) {
     this.request = request;
     this.config = config;
+    this.options = options;
+  }
+  resolveUrl(url) {
+    if (!this.options.baseUrl || !url.startsWith('/h5/auth/')) {
+      return url;
+    }
+    return `${this.options.baseUrl.replace(/\/$/, '')}${url}`;
   }
 
   /**
@@ -1111,6 +1146,12 @@ class ApiCaller {
       ...options,
       ...additionalOptions
     };
+    if (apiConfig.url.startsWith('/h5/auth/') && h5CustomerAuthApiNames.has(apiName)) {
+      requestOptions.h5CustomerAuth = true;
+      if (this.options.shopDomain) {
+        requestOptions.h5AuthShopDomain = this.options.shopDomain;
+      }
+    }
 
     // 处理动态 headers
     if (requestOptions.headers && typeof requestOptions.headers === 'function') {
@@ -1123,19 +1164,19 @@ class ApiCaller {
     switch (apiConfig.method) {
       case 'GET':
         if (transformedParams && Object.keys(transformedParams).length > 0) {
-          response = await this.request.get(apiConfig.url, transformedParams, requestOptions);
+          response = await this.request.get(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
         } else {
-          response = await this.request.get(apiConfig.url, undefined, requestOptions);
+          response = await this.request.get(this.resolveUrl(apiConfig.url), undefined, requestOptions);
         }
         break;
       case 'POST':
-        response = await this.request.post(apiConfig.url, transformedParams, requestOptions);
+        response = await this.request.post(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
         break;
       case 'PUT':
-        response = await this.request.put(apiConfig.url, transformedParams, requestOptions);
+        response = await this.request.put(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
         break;
       case 'DELETE':
-        response = await this.request.delete(apiConfig.url, requestOptions);
+        response = await this.request.delete(this.resolveUrl(apiConfig.url), requestOptions);
         break;
       default:
         throw new Error(`不支持的 HTTP 方法: ${apiConfig.method}`);
@@ -1150,7 +1191,7 @@ class ApiCaller {
  * 创建 API 调用器
  */
 exports.ApiCaller = ApiCaller;
-function createApiCaller(request, channel) {
+function createApiCaller(request, channel, options) {
   const config = getChannelConfig(channel);
-  return new ApiCaller(request, config);
+  return new ApiCaller(request, config, options);
 }

package/lib/solution/RegisterAndLogin/index.js

@@ -227,7 +227,10 @@ class RegisterAndLoginImpl extends _BaseModule.BaseModule {
     }
 
     // 创建 API 调用器
-    this.apiCaller = (0, _config.createApiCaller)(this.request, this.channel);
+    this.apiCaller = (0, _config.createApiCaller)(this.request, this.channel, {
+      baseUrl: this.otherParams.h5AuthBaseUrl,
+      shopDomain: this.otherParams.h5AuthShopDomain
+    });
 
     // 尝试从本地存储恢复登录状态
     await this.restoreLoginState();