@pisell/pisellos 0.10.57 → 0.10.59

package/lib/modules/Order/utils.js

@@ -633,8 +633,9 @@ function getBundleSellingMagnitude(bundle) {
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -643,8 +644,9 @@ function getBundleSellingMagnitude(bundle) {
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
@@ -843,6 +845,14 @@ function createDefaultOrderRulesHooks(getBookings) {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new _decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+
+  // optionDiscountAmount 已是每件主商品内的单规格优惠合计，不再乘商品数量。
+  const getOptionDiscountAmount = discountList => {
+    return (discountList || []).reduce((total, discount) => {
+      if (discount?.metadata?.custom_product_bundle_map_id) return total;
+      return total.plus(Number(discount?.metadata?.optionDiscountAmount) || 0);
+    }, new _decimal.default(0));
+  };
   const getBundleIdentity = bundle => {
     return [bundle.bundle_id ?? bundle.id ?? '', bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? '', bundle.bundle_variant_id ?? bundle.variant_id ?? bundle.product_variant_id ?? 0, bundle.bundle_group_id ?? bundle.group_id ?? ''].join('|');
   };
@@ -885,12 +895,14 @@ function createDefaultOrderRulesHooks(getBookings) {
     getProduct: product => {
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       const metadataAny = product.metadata || {};
-      const optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
+      const productOptions = getProductSkuOptions(product);
+      const optionSum = sumOptionUnitPrice(productOptions);
+      const optionSellingSum = optionSum.minus(getOptionDiscountAmount(product.discount_list));
       let sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
       } else if (metadataAny.main_product_selling_price !== undefined) {
-        sourcePrice = new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
+        sourcePrice = new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString();
       } else {
         sourcePrice = String(product.selling_price ?? 0);
       }
@@ -920,6 +932,11 @@ function createDefaultOrderRulesHooks(getBookings) {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
+        // 仅在 Rules 入参中映射 price，避免折后价污染订单的 add_price。
+        options: productOptions.map(option => ({
+          ...option,
+          price: option.add_price
+        })),
         booking_id: product.metadata?.booking_id || null,
         isClient: false,
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
@@ -927,7 +944,7 @@ function createDefaultOrderRulesHooks(getBookings) {
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: product.metadata?.holder_id,
         startDate: getProductStartDate(product),
-        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
+        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: metadataAny._promotion?.inPromotion === true,
         _promotion: metadataAny._promotion
       };
@@ -938,8 +955,10 @@ function createDefaultOrderRulesHooks(getBookings) {
       const existedSource = metadataAny.source_product_price ?? product.selling_price ?? '0';
       const nextOptions = getProductSkuOptions(product);
       const optionSum = sumOptionUnitPrice(nextOptions);
+      const nextDiscountList = values.discount_list ?? product.discount_list;
+      const optionSellingSum = optionSum.minus(getOptionDiscountAmount(nextDiscountList));
 
-      // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
+      // Rules 返回的 main_product_selling_price / price 为不含 option 的主商品价。
       // 优先级：main_product_selling_price（per-unit 券后 source）> price（还原/good_pass 分支）>
       // total/num（仅当 Rules 只给 total 时的兜底）> 保留当前 source。
       const nextSourceSellingPrice = values.main_product_selling_price !== undefined ? String(values.main_product_selling_price) : values.price !== undefined ? String(values.price) : values.total !== undefined ? toUnitPriceString(values.total, nextNum) : String(existedSource);
@@ -948,8 +967,8 @@ function createDefaultOrderRulesHooks(getBookings) {
       // 缺省时保留现有 source（券前 = 当前 source）。
       const nextSourceOriginalPrice = values.original_price !== undefined ? String(values.original_price) : String(existedSource);
 
-      // 含 option 的 main_product_*
-      const nextMainSellingPrice = new _decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+      // 成交价只加回 option 折后合计；原价仍使用订单中保存的 option 原价。
+      const nextMainSellingPrice = new _decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSellingSum).toDecimalPlaces(2).toFixed(2);
       const nextMainOriginalPrice = new _decimal.default(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       const nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       const composedSellingPrice = composeLinePrice({
@@ -970,7 +989,7 @@ function createDefaultOrderRulesHooks(getBookings) {
         ...product,
         selling_price: composedSellingPrice,
         original_price: finalOriginalPrice,
-        discount_list: values.discount_list ?? product.discount_list,
+        discount_list: nextDiscountList,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
         metadata: {

package/lib/modules/ProductList/index.js

@@ -66,7 +66,13 @@ class ProductList extends _BaseModule.BaseModule {
    * productList.updateOtherParams({ channel: 'pos' });
    */
   updateOtherParams(params) {
+    const previousScope = this.otherParams.catalogScopeKey;
     this.otherParams = params || {};
+    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) {
     // No longer needed - products are stored as plain objects instead of Product instances
@@ -101,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
@@ -180,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);
@@ -190,19 +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
       });
-      await this.addProduct(resolvedCallbackList);
-      originalCallback(resolvedCallbackList === callbackList ? result : {
+      assertScope();
+      await this.addProduct(products);
+      originalCallback(handledByOsServer ? result : {
         ...result,
         data: {
           ...result.data,
-          list: resolvedCallbackList
+          list: products
         }
       });
     } : undefined;
@@ -212,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);
     }

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

package/lib/solution/UnifiedBookingSales/index.js

@@ -1425,6 +1425,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     cover = false
   } = {}) {
     const previousScope = this.getAvailabilityScopeDescriptor(this.otherParams || {});
+    const previousCatalogScope = this.otherParams?.catalogScopeKey;
     const previousItemRuleConfig = this.otherParams?.itemRule;
     const explicitlySetsOpenData = Object.prototype.hasOwnProperty.call(params, 'openData');
     const nextParams = cover ? params : {
@@ -1437,6 +1438,10 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     await super.setOtherParams(params, {
       cover
     });
+    if (previousCatalogScope !== this.otherParams?.catalogScopeKey && (previousCatalogScope || this.otherParams?.catalogScopeKey)) {
+      this.unifiedProductCatalog = [];
+      await this.core.effects.emit(`${this.name}:onProductsLoaded`, []);
+    }
     const nextScope = this.getAvailabilityScopeDescriptor(this.otherParams || {});
     if (explicitlySetsOpenData) {
       this.openDataTarget = this.otherParams?.openData && nextScope.businessCode && nextScope.channel ? `${nextScope.businessCode}+${nextScope.channel}` : null;
@@ -2024,6 +2029,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
    */
   async loadProducts(params = {}, options) {
     if (!this.store.products) throw new Error('[UnifiedBookingSales] products 模块未初始化');
+    const catalogScope = this.otherParams.catalogScopeKey;
     const schedule_date = params.schedule_date || (0, _dayjs.default)().format('YYYY-MM-DD');
     const schedule_datetime = params.schedule_datetime || `${schedule_date} ${(0, _dayjs.default)().format('HH:mm:ss')}`;
     const result = await this.store.products.loadProducts({
@@ -2034,6 +2040,11 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       schedule_datetime,
       cacheId: this.cacheId
     }, options);
+    if (catalogScope !== this.otherParams.catalogScopeKey) {
+      throw Object.assign(new Error('Product scope changed'), {
+        name: 'AbortError'
+      });
+    }
     this.unifiedProductCatalog = Array.isArray(result) ? [...result] : [];
     await this.core.effects.emit(`${this.name}:onProductsLoaded`, result);
     return result;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.57",
+  "version": "0.10.59",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",