@pisell/pisellos 0.10.58 → 0.10.59

package/lib/modules/Order/index.js

@@ -145,6 +145,63 @@ class OrderModule extends _BaseModule.BaseModule {
   rulesHooksOverride;
   moduleHooksOverride;
   orderHooks;
+  cartCommandQueue = Promise.resolve();
+  queueCartCommand(run) {
+    if (!this.orderHooks?.onBeforeCartCommit) return run();
+    const pending = this.cartCommandQueue.then(run, run);
+    this.cartCommandQueue = pending.catch(() => undefined);
+    return pending;
+  }
+
+  /** Use the exact Order normalizers/merge rules on a private draft, not a second projection. */
+  beginCartMutation() {
+    const current = this.ensureTempOrder();
+    const guard = this.orderHooks?.onBeforeCartCommit;
+    if (!guard) return {
+      current,
+      draft: current,
+      commit: undefined
+    };
+    const before = (0, _lodashEs.cloneDeep)(current);
+    const draft = (0, _lodashEs.cloneDeep)(current);
+    return {
+      current,
+      draft,
+      commit: async beforeCommit => {
+        await guard({
+          currentItems: (0, _lodashEs.cloneDeep)(before.products),
+          proposedItems: (0, _lodashEs.cloneDeep)(draft.products)
+        });
+        if (this.store.tempOrder !== current || guard !== this.orderHooks?.onBeforeCartCommit || !(0, _lodashEs.isEqual)(current, before)) {
+          throw Object.assign(new Error('The cart changed. Please try again.'), {
+            code: 'SALES_GUARD_REJECTED'
+          });
+        }
+        // Recheck the accepted intent's scope after asynchronous inventory validation.
+        beforeCommit?.();
+        Object.assign(current, draft);
+        return current;
+      }
+    };
+  }
+
+  /** Serializes checkout preparation with local cart commands; hydration remains outside this guard. */
+  async prepareCheckout(prepare) {
+    const run = async () => {
+      const order = this.ensureTempOrder();
+      const items = (0, _lodashEs.cloneDeep)(order.products);
+      const result = await prepare(items);
+      if (this.store.tempOrder !== order || !(0, _lodashEs.isEqual)(order.products, items)) {
+        throw Object.assign(new Error('The cart changed. Please try again.'), {
+          code: 'SALES_GUARD_REJECTED'
+        });
+      }
+      return result;
+    };
+    const pending = this.cartCommandQueue.then(run, run);
+    this.cartCommandQueue = pending.catch(() => undefined);
+    return pending;
+  }
   otherParams;
   // ─── 促销/赠品 ────────────────────────────────────
   /** 评估器引用；由 SalesSdkProvider 注入，未注入时 applyPromotion 静默跳过 */
@@ -432,8 +489,11 @@ class OrderModule extends _BaseModule.BaseModule {
    * @example
    * orderModule.updateOtherParams({ cacheId: 'cache-2', channel: 'pos' });
    */
-  updateOtherParams(params) {
+  updateOtherParams(params, options) {
     const otherParams = params || {};
+    if (options && Object.prototype.hasOwnProperty.call(options, 'hooks')) {
+      this.moduleHooksOverride = options.hooks;
+    }
     this.syncSessionStorageOptions(otherParams);
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
     this.rulesHooksOverride = otherParams.rules?.hooks;
@@ -3704,8 +3764,12 @@ class OrderModule extends _BaseModule.BaseModule {
    * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
    */
   async addProductToOrder(product, booking, options) {
-    const tempOrder = this.ensureTempOrder();
-    const beforeCommit = this.createCartIntentCommitGuard('add_product', tempOrder);
+    return this.queueCartCommand(() => this.addProductToOrderDraft(product, booking, options));
+  }
+  async addProductToOrderDraft(product, booking, options) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
+    const beforeCommit = this.createCartIntentCommitGuard('add_product', mutation.current);
     const salesNoteDrafts = (options?.salesNotes || []).map(draft => ({
       note_type: String(draft.note_type || '').trim(),
       text: {
@@ -3802,6 +3866,7 @@ class OrderModule extends _BaseModule.BaseModule {
       rollbackProductAndNotesMutation();
       throw error;
     }
+    if (mutation.commit) tempOrder = await mutation.commit(beforeCommit);
     await this.finalizeProductOrderMutation(tempOrder);
     this.logInfo('addProductToOrder success', {
       product_id: product.product_id,
@@ -3820,9 +3885,13 @@ class OrderModule extends _BaseModule.BaseModule {
    * ]);
    */
   async addProductsToOrder(items, options) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.addProductsToOrderDraft(items, options));
+  }
+  async addProductsToOrderDraft(items, options) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     if (!Array.isArray(items) || items.length === 0) return tempOrder.products;
-    const beforeCommit = this.createCartIntentCommitGuard('add_product', tempOrder);
+    const beforeCommit = this.createCartIntentCommitGuard('add_product', mutation.current);
     for (const item of items || []) {
       const {
         product,
@@ -3848,6 +3917,7 @@ class OrderModule extends _BaseModule.BaseModule {
       });
       if (appendResult) await appendResult;
     }
+    if (mutation.commit) tempOrder = await mutation.commit(beforeCommit);
     await this.finalizeProductOrderMutation(tempOrder, options);
     this.logInfo('addProductsToOrder success', {
       itemsCount: items.length
@@ -4190,12 +4260,16 @@ class OrderModule extends _BaseModule.BaseModule {
     return tempOrder.products[productIndex].metadata?.unique_identification_number;
   }
   async updateOrderProduct(params) {
-    const tempOrder = this.ensureTempOrder();
-    if (this.isRestrictedCartProductUpdate(tempOrder, params)) {
-      this.createCartIntentCommitGuard('update_product', tempOrder)();
-    }
+    return this.queueCartCommand(() => this.updateOrderProductDraft(params));
+  }
+  async updateOrderProductDraft(params) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
+    const beforeCommit = this.isRestrictedCartProductUpdate(tempOrder, params) ? this.createCartIntentCommitGuard('update_product', mutation.current) : undefined;
+    beforeCommit?.();
     const reapplyWeighedDiscountProductUids = [];
     const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
+    if (mutation.commit) tempOrder = await mutation.commit(beforeCommit);
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
       reapplyWeighedDiscountProductUids,
@@ -4213,13 +4287,16 @@ class OrderModule extends _BaseModule.BaseModule {
     return tempOrder.products;
   }
   async updateOrderProducts(paramsList) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.updateOrderProductsDraft(paramsList));
+  }
+  async updateOrderProductsDraft(paramsList) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     if (!paramsList.length) {
       return tempOrder.products;
     }
-    if (paramsList.some(params => this.isRestrictedCartProductUpdate(tempOrder, params))) {
-      this.createCartIntentCommitGuard('update_product', tempOrder)();
-    }
+    const beforeCommit = paramsList.some(params => this.isRestrictedCartProductUpdate(tempOrder, params)) ? this.createCartIntentCommitGuard('update_product', mutation.current) : undefined;
+    beforeCommit?.();
     const reapplyWeighedDiscountProductUids = [];
     const reapplyBookingDiscountProductUids = paramsList.reduce((acc, params) => {
       const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
@@ -4229,6 +4306,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
       return acc;
     }, []);
+    if (mutation.commit) tempOrder = await mutation.commit(beforeCommit);
     await this.finalizeAfterProductsMutation(tempOrder, {
       reapplyWeighedDiscountProductUids,
       reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
@@ -4239,6 +4317,9 @@ class OrderModule extends _BaseModule.BaseModule {
     return tempOrder.products;
   }
   async updateOrderProductQuantity(params) {
+    return this.queueCartCommand(() => this.updateOrderProductQuantityDraft(params));
+  }
+  async updateOrderProductQuantityDraft(params) {
     const {
       product_id,
       product_variant_id,
@@ -4248,7 +4329,8 @@ class OrderModule extends _BaseModule.BaseModule {
       product_sku,
       product_bundle
     } = params;
-    const tempOrder = this.ensureTempOrder();
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     this.repairDuplicateProductLineIdentities(tempOrder);
     const identityLookup = {
       product_id,
@@ -4304,10 +4386,10 @@ class OrderModule extends _BaseModule.BaseModule {
         throw new _virtualSettlement.VirtualCurrencyBalanceError(balance.toFixed(2), requiredAmount.toFixed(2));
       }
     }
-    if (normalizedProduct.num > targetProduct.num) {
-      this.createCartIntentCommitGuard('increase_quantity', tempOrder)();
-    }
+    const beforeCommit = normalizedProduct.num > targetProduct.num ? this.createCartIntentCommitGuard('increase_quantity', mutation.current) : undefined;
+    beforeCommit?.();
     tempOrder.products[productIndex] = normalizedProduct;
+    if (mutation.commit) tempOrder = await mutation.commit(beforeCommit);
     this.prepareVirtualSettlementTempOrder(tempOrder);
     const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
     const promotionPayload = !isVirtualSettlement ? await this.evaluatePromotion() : null;
@@ -4384,7 +4466,11 @@ class OrderModule extends _BaseModule.BaseModule {
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
   async removeProductsFromOrder(identities, options) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.removeProductsFromOrderDraft(identities, options));
+  }
+  async removeProductsFromOrderDraft(identities, options) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     if (!identities.length) {
       return tempOrder.products;
     }
@@ -4451,6 +4537,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     }
     this.removeSalesNotesForMissingProductLines(tempOrder);
+    if (mutation.commit) tempOrder = await mutation.commit();
     await this.finalizeAfterProductsMutation(tempOrder);
     this.logInfo('removeProductsFromOrder success', {
       identities
@@ -4466,7 +4553,11 @@ class OrderModule extends _BaseModule.BaseModule {
    * 普通整单 note 保持不变；以商品行为主体的 Sales Notes 同步删除。
    */
   async clearOrderCartLines() {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.clearOrderCartLinesDraft());
+  }
+  async clearOrderCartLinesDraft() {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     this.ensureSalesNotesLoadedForMutation(tempOrder);
     tempOrder.products = [];
     tempOrder.bookings = [];
@@ -4479,6 +4570,7 @@ class OrderModule extends _BaseModule.BaseModule {
         productsByUid: {}
       };
     }
+    if (mutation.commit) tempOrder = await mutation.commit();
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount();
     this.sanitizeTempOrderProducts(tempOrder);

package/lib/modules/Order/types.d.ts

@@ -526,6 +526,11 @@ export interface OrderHooksConfig {
     beforeCartIntentCommit?: (context: OrderCartIntentCommitContext) => void;
     /** Captures tenant/business runtime identity for asynchronous cart intents. */
     getCartIntentScope?: () => unknown;
+    /** Awaited before a local cart draft is published. Reject to leave the live order unchanged. */
+    onBeforeCartCommit?: (context: {
+        currentItems: readonly OrderProduct[];
+        proposedItems: readonly OrderProduct[];
+    }) => void | Promise<void>;
     onBeforeMergeProductToOrder?: (context: OrderProductMergeDecisionContext) => OrderProductMergeDecisionResult | Promise<OrderProductMergeDecisionResult>;
 }
 /**

package/lib/modules/ProductList/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ProductListLoadProductsParams, ProductListStoreQueryParams, ProductEnrichmentContext } from './types';
+import { ProductListLoadProductsParams, ProductListStoreQueryParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -19,8 +19,6 @@ export declare class ProductList extends BaseModule implements Module {
      * productList.updateOtherParams({ channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
-    enrichProducts(products: ProductData[], context: ProductEnrichmentContext): Promise<ProductData[]>;
-    private enrichCatalog;
     storeChange(path?: string, value?: any): Promise<void>;
     /**
      * 获取加时商品列表。

package/lib/modules/ProductList/index.js

@@ -66,30 +66,12 @@ class ProductList extends _BaseModule.BaseModule {
    * productList.updateOtherParams({ channel: 'pos' });
    */
   updateOtherParams(params) {
+    const previousScope = this.otherParams.catalogScopeKey;
     this.otherParams = params || {};
-  }
-  async enrichProducts(products, context) {
-    const enrich = this.otherParams.enrichProducts;
-    if (!enrich) return products;
-    if (context.signal?.aborted) throw new Error('Product enrichment cancelled');
-    const result = await enrich((0, _lodashEs.cloneDeep)(products), {
-      businessCode: this.otherParams.businessCode,
-      channel: this.otherParams.channel,
-      ...context
-    });
-    if (context.signal?.aborted) throw new Error('Product enrichment cancelled');
-    if (!Array.isArray(result)) throw new Error('Product enrichment must return an array');
-    return result;
-  }
-  async enrichCatalog(products, reason) {
-    try {
-      return await this.enrichProducts(products, {
-        reason
-      });
-    } catch {
-      // An unavailable supplementary source is not zero stock or an empty catalog.
-      console.warn('[ProductList] Supplementary product data could not be refreshed');
-      return products;
+    if (previousScope !== this.otherParams.catalogScopeKey && (previousScope || this.otherParams.catalogScopeKey)) {
+      this.store.list = [];
+      this.rawProductPriceSources.clear();
+      this.core.effects.emit(`${this.name}:changed`, this.store.list);
     }
   }
   async storeChange(path, value) {
@@ -125,6 +107,14 @@ class ProductList extends _BaseModule.BaseModule {
     status = 'published',
     strategy_context
   } = {}, options) {
+    const scope = this.otherParams.catalogScopeKey;
+    const assertScope = () => {
+      if (scope !== this.otherParams.catalogScopeKey) {
+        throw Object.assign(new Error('Product catalog context changed'), {
+          name: 'AbortError'
+        });
+      }
+    };
     // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
     // if (!schedule_ids?.length) {
     //   const schedule_ids_data = this.store.schedule
@@ -204,6 +194,7 @@ class ProductList extends _BaseModule.BaseModule {
     const handledByOsServer = (0, _clientDataVariants.isProductQueryHandledByOsServer)(this.core, this.request);
     const originalCallback = typeof options?.callback === 'function' ? options.callback : undefined;
     const subscriptionCallback = originalCallback ? async result => {
+      if (scope !== this.otherParams.catalogScopeKey) return;
       const callbackList = result?.data?.list;
       if (!Array.isArray(callbackList)) {
         originalCallback(result);
@@ -214,20 +205,20 @@ class ProductList extends _BaseModule.BaseModule {
         // the existing raw catalog scope and upsert the changed records.
         this.rememberRawProductQueryResult(callbackList);
       }
-      const resolvedCallbackList = (0, _clientDataVariants.resolveClientDataVariants)({
+      const products = (0, _clientDataVariants.resolveClientDataVariants)({
         core: this.core,
         otherParams: this.otherParams,
         products: callbackList,
         queryPayload,
         handledByOsServer
       });
-      const enrichedCallbackList = await this.enrichCatalog(resolvedCallbackList, 'catalog-update');
-      await this.addProduct(enrichedCallbackList);
-      originalCallback(enrichedCallbackList === callbackList ? result : {
+      assertScope();
+      await this.addProduct(products);
+      originalCallback(handledByOsServer ? result : {
         ...result,
         data: {
           ...result.data,
-          list: enrichedCallbackList
+          list: products
         }
       });
     } : undefined;
@@ -237,6 +228,7 @@ class ProductList extends _BaseModule.BaseModule {
       subscriberId: options?.subscriberId,
       customToast: () => {}
     });
+    assertScope();
     if (!handledByOsServer && Array.isArray(productsData.data.list)) {
       this.replaceRawProductQueryResult(productsData.data.list, product_ids);
     }
@@ -247,8 +239,7 @@ class ProductList extends _BaseModule.BaseModule {
       queryPayload,
       handledByOsServer
     });
-    const enrichedList = await this.enrichCatalog(resolvedList, 'catalog');
-    const sortedList = enrichedList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    const sortedList = resolvedList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
     // if (sortedList.length) {
     //   sortedList.forEach((n: any) => {
     //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
@@ -256,7 +247,7 @@ class ProductList extends _BaseModule.BaseModule {
     //     }
     //   })
     // }
-    await this.addProduct(sortedList);
+    this.addProduct(sortedList);
     return sortedList;
   }
   async loadProductsPrice({

package/lib/modules/ProductList/types.d.ts

@@ -1,12 +1,4 @@
 import { ProductData } from '../Product/types';
-/** Runtime-only enrichment; never serialized into a product query. */
-export interface ProductEnrichmentContext {
-    reason: 'catalog' | 'catalog-update' | 'detail-open';
-    businessCode?: string;
-    channel?: string;
-    signal?: AbortSignal;
-}
-export type ProductEnricher = (products: ProductData[], context: ProductEnrichmentContext) => Promise<ProductData[]>;
 export interface ProductListLoadProductsParams {
     category_ids?: number[];
     product_ids?: number[];

package/lib/modules/ProductList/types.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProductListHooks = void 0;
-/** Runtime-only enrichment; never serialized into a product query. */
 let ProductListHooks = exports.ProductListHooks = /*#__PURE__*/function (ProductListHooks) {
   ProductListHooks["onGetProducts"] = "productList:onGetProducts";
   ProductListHooks["onGetProduct"] = "productList:onGetProduct";

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

@@ -1,3 +1,4 @@
+import { InventoryController, type CheckoutRuntimeSnapshot } from '../../inventory';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesSubmitSalesOrderParams, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentOptions, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
@@ -49,6 +50,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
+    getInventory(): InventoryController | undefined;
+    prepareCheckout(signal?: AbortSignal): Promise<CheckoutRuntimeSnapshot | undefined>;
     protected cacheId: string | undefined;
     /**
      * 由已在初始化阶段解析过设备短号的业务解决方案写入。
@@ -187,6 +190,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 可覆盖此方法并把未识别的 name 委托给 `super.createSubModule(name)`。
      */
     protected createSubModule(moduleName: string): Module | null;
+    private inventoryOrderHooks?;
     protected getSubModuleHooks(moduleName: string): any;
     /**
      * 构造传给 BaseSales 子模块的完整运行态参数，保证初始化和后续同步语义一致。
@@ -224,7 +228,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private isActiveVirtualSettlementOrder;
     private isHistoricalVirtualSettlementOrder;
     private syncAppDataToTempOrder;
+    private initialization?;
+    /** Hosts can await readiness without changing Core's synchronous registration API. */
+    whenInitialized(): Promise<void>;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    private initializeSalesRuntime;
     destroy(): Promise<void>;
     /**
      * 加载销售订单到统一 tempOrder 工作区。

package/lib/solution/BaseSales/index.js

@@ -7,6 +7,7 @@ var _exportNames = {
   BaseSalesImpl: true
 };
 exports.BaseSalesImpl = void 0;
+var _inventory = require("../../inventory");
 var _BaseModule = require("../../modules/BaseModule");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
@@ -470,6 +471,40 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     order: undefined
   };
   otherParams = {};
+  getInventory() {
+    return this.otherParams.inventory;
+  }
+  async prepareCheckout(signal) {
+    const inventory = this.getInventory();
+    const hooks = this.otherParams.checkoutHooks;
+    if (!inventory && !hooks?.beforeCheckout) return undefined;
+    if (!this.store.order) throw new Error('Order module is not ready');
+    return this.store.order.prepareCheckout(async items => {
+      const assertCurrent = () => {
+        if (signal?.aborted) throw Object.assign(new Error('Checkout cancelled'), {
+          name: 'AbortError'
+        });
+        if (inventory !== this.getInventory() || hooks !== this.otherParams.checkoutHooks) throw (0, _inventory.salesGuardError)('The sales context changed. Please try again.');
+      };
+      assertCurrent();
+      try {
+        await hooks?.beforeCheckout?.({
+          items,
+          signal
+        });
+        if (inventory) await inventory.refresh({
+          reason: 'checkout',
+          force: true,
+          signal
+        });
+        assertCurrent();
+        return inventory?.freezeCheckout(items);
+      } catch (error) {
+        if (error?.name === 'AbortError') throw error;
+        throw (0, _inventory.salesGuardError)(error instanceof Error ? error.message : String(error));
+      }
+    });
+  }
   cacheId;
   /**
    * 由已在初始化阶段解析过设备短号的业务解决方案写入。
@@ -1302,12 +1337,37 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     return (0, _types2.createModule)(moduleName, this.name);
   }
+  inventoryOrderHooks;
   getSubModuleHooks(moduleName) {
     const optionHooks = this.initializeOptions.hooks || {};
     const otherHooks = this.otherParams.hooks || {};
     if (moduleName === 'order') {
       const directOrderHooks = optionHooks;
-      return optionHooks.order || this.otherParams.order?.hooks || otherHooks.order || (directOrderHooks.onBeforeMergeProductToOrder ? directOrderHooks : undefined);
+      const hooks = optionHooks.order || this.otherParams.order?.hooks || otherHooks.order || (directOrderHooks.onBeforeMergeProductToOrder || directOrderHooks.onBeforeCartCommit || directOrderHooks.beforeCartIntentCommit || directOrderHooks.getCartIntentScope ? directOrderHooks : undefined);
+      const inventory = this.getInventory();
+      if (!inventory) {
+        this.inventoryOrderHooks = undefined;
+        return hooks;
+      }
+      if (this.inventoryOrderHooks?.inventory === inventory && this.inventoryOrderHooks.base === hooks) {
+        return this.inventoryOrderHooks.hooks;
+      }
+      const combined = {
+        ...hooks,
+        onBeforeCartCommit: async context => {
+          await hooks?.onBeforeCartCommit?.(context);
+          if (inventory !== this.getInventory()) {
+            throw (0, _inventory.salesGuardError)('The sales context changed. Please try again.');
+          }
+          inventory.validate(context.proposedItems, context.currentItems);
+        }
+      };
+      this.inventoryOrderHooks = {
+        inventory,
+        base: hooks,
+        hooks: combined
+      };
+      return combined;
     }
     return optionHooks[moduleName] || this.otherParams[moduleName]?.hooks || otherHooks[moduleName];
   }
@@ -1355,7 +1415,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       const nextSubModuleOtherParams = this.buildSubModuleOtherParams(moduleName);
       await targetModule.updateOtherParams(nextSubModuleOtherParams, {
         changedParams,
-        cover
+        cover,
+        ...(moduleName === 'order' ? {
+          hooks: this.getSubModuleHooks(moduleName)
+        } : {})
       });
     }));
   }
@@ -1504,7 +1567,17 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     return isChanged;
   }
-  async initialize(core, options = {}) {
+  initialization;
+
+  /** Hosts can await readiness without changing Core's synchronous registration API. */
+  whenInitialized() {
+    return this.initialization || Promise.reject(new Error('Sales module is not registered'));
+  }
+  initialize(core, options = {}) {
+    this.initialization = this.initializeSalesRuntime(core, options);
+    return this.initialization;
+  }
+  async initializeSalesRuntime(core, options = {}) {
     this.resetPickupTimingCache();
     this.core = core;
     this.initializeOptions = options || {};
@@ -1563,17 +1636,19 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     this.serverOrderChangeUnsubscribe = null;
     this.paymentMethodsChangedUnsubscribe?.();
     this.paymentMethodsChangedUnsubscribe = null;
-    Object.keys(this.store).forEach(key => {
-      if (this.reusedSharedSubModuleNames.has(key)) return;
+    for (const key of Object.keys(this.store)) {
+      if (this.reusedSharedSubModuleNames.has(key)) continue;
       const sub = this.store[key];
       if (sub && typeof sub.destroy === 'function') {
         try {
-          sub.destroy();
+          // A host may register a replacement after destroy resolves. Wait for
+          // nested modules so their cleanup cannot unregister the replacement.
+          await sub.destroy();
         } catch (error) {
           console.warn(`[BaseSales] 子模块 ${key} 销毁失败`, error);
         }
       }
-    });
+    }
     this.currentSalesDetail = null;
     this.paymentNumberDevicePrefix = null;
     this.queuedServerOrderChanges = [];

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 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -2,7 +2,7 @@ import type { Module, ModuleOptions, PisellCore } from '../../types';
 import type { ProductData } from '../../modules';
 import { type InvoiceLayoutConfig, type InvoiceTemplateSettings, type OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
-import type { ProductListLoadProductsParams, ProductListStoreQueryParams, ProductEnrichmentContext } from '../../modules/ProductList';
+import type { ProductListLoadProductsParams, ProductListStoreQueryParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
 import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesResolveProductAllergyRequirementParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
 import type { BusinessAvailability } from '../../modules/BusinessAvailability';
@@ -205,12 +205,6 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     getProductCatalog(): {
         products: ProductData[];
     };
-    /** Detail reads share the catalog adapter, including when basic detail is cached. */
-    enrichProducts(products: ProductData[], context: ProductEnrichmentContext): Promise<ProductData[]>;
-    /** Apply only enrichment changes, never the cart's selection/price snapshot. */
-    applyProductEnrichment(before: ProductData, after: ProductData, context?: {
-        signal?: AbortSignal;
-    }): Promise<void>;
     /**
      * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
      * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.