@pisell/pisellos 0.10.57 → 0.10.59

package/dist/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/dist/modules/Order/utils.d.ts

@@ -121,8 +121,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   = `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 内部保持不变）：
@@ -131,8 +132,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   `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 归零）

package/dist/modules/Order/utils.js

@@ -580,8 +580,9 @@ export 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 内部保持不变）：
@@ -590,8 +591,9 @@ export 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 归零）
@@ -814,6 +816,15 @@ export function createDefaultOrderRulesHooks(getBookings) {
     var effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+
+  // optionDiscountAmount 已是每件主商品内的单规格优惠合计，不再乘商品数量。
+  var getOptionDiscountAmount = function getOptionDiscountAmount(discountList) {
+    return (discountList || []).reduce(function (total, discount) {
+      var _discount$metadata, _discount$metadata2;
+      if (discount !== null && discount !== void 0 && (_discount$metadata = discount.metadata) !== null && _discount$metadata !== void 0 && _discount$metadata.custom_product_bundle_map_id) return total;
+      return total.plus(Number(discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.optionDiscountAmount) || 0);
+    }, new Decimal(0));
+  };
   var getBundleIdentity = function getBundleIdentity(bundle) {
     var _ref21, _bundle$bundle_id, _ref22, _ref23, _bundle$bundle_produc, _ref24, _ref25, _bundle$bundle_varian, _ref26, _bundle$bundle_group_;
     return [(_ref21 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref21 !== void 0 ? _ref21 : '', (_ref22 = (_ref23 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : '', (_ref24 = (_ref25 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref25 !== void 0 ? _ref25 : bundle.product_variant_id) !== null && _ref24 !== void 0 ? _ref24 : 0, (_ref26 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref26 !== void 0 ? _ref26 : ''].join('|');
@@ -851,12 +862,14 @@ export function createDefaultOrderRulesHooks(getBookings) {
       var _product$metadata7, _product$metadata8, _product$metadata9, _metadataAny$_promoti;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
-      var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
+      var productOptions = getProductSkuOptions(product);
+      var optionSum = sumOptionUnitPrice(productOptions);
+      var optionSellingSum = optionSum.minus(getOptionDiscountAmount(product.discount_list));
       var sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
       } else if (metadataAny.main_product_selling_price !== undefined) {
-        sourcePrice = new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
+        sourcePrice = new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString();
       } else {
         var _product$selling_pric;
         sourcePrice = String((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
@@ -887,6 +900,12 @@ export function createDefaultOrderRulesHooks(getBookings) {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
+        // 仅在 Rules 入参中映射 price，避免折后价污染订单的 add_price。
+        options: productOptions.map(function (option) {
+          return _objectSpread(_objectSpread({}, option), {}, {
+            price: option.add_price
+          });
+        }),
         booking_id: ((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_id) || null,
         isClient: false,
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
@@ -894,20 +913,22 @@ export function createDefaultOrderRulesHooks(getBookings) {
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.holder_id,
         startDate: getProductStartDate(product),
-        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(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(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
         _promotion: metadataAny._promotion
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref32, _values$quantity, _ref33, _metadataAny$source_p, _product$product_sku, _values$discount_list, _values$quantity2;
+      var _ref32, _values$quantity, _ref33, _metadataAny$source_p, _values$discount_list, _product$product_sku, _values$quantity2;
       var nextNum = Number((_ref32 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref32 !== void 0 ? _ref32 : 1) || 1;
       var metadataAny = product.metadata || {};
       var existedSource = (_ref33 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref33 !== void 0 ? _ref33 : '0';
       var nextOptions = getProductSkuOptions(product);
       var optionSum = sumOptionUnitPrice(nextOptions);
+      var nextDiscountList = (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list;
+      var 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。
       var 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);
@@ -916,8 +937,8 @@ export function createDefaultOrderRulesHooks(getBookings) {
       // 缺省时保留现有 source（券前 = 当前 source）。
       var nextSourceOriginalPrice = values.original_price !== undefined ? String(values.original_price) : String(existedSource);
 
-      // 含 option 的 main_product_*
-      var nextMainSellingPrice = new Decimal(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+      // 成交价只加回 option 折后合计；原价仍使用订单中保存的 option 原价。
+      var nextMainSellingPrice = new Decimal(Number(nextSourceSellingPrice) || 0).plus(optionSellingSum).toDecimalPlaces(2).toFixed(2);
       var nextMainOriginalPrice = new Decimal(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       var nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       var composedSellingPrice = composeLinePrice({
@@ -937,7 +958,7 @@ export function createDefaultOrderRulesHooks(getBookings) {
       return _objectSpread(_objectSpread({}, product), {}, {
         selling_price: composedSellingPrice,
         original_price: finalOriginalPrice,
-        discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
+        discount_list: nextDiscountList,
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
         metadata: _objectSpread(_objectSpread({}, metadataAny), {}, {

package/dist/modules/ProductList/index.js

@@ -99,7 +99,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOtherParams",
     value: function updateOtherParams(params) {
+      var 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("".concat(this.name, ":changed"), this.store.list);
+      }
     }
   }, {
     key: "storeChange",
@@ -155,12 +161,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$otherParams,
+        var _this2 = this,
+          _this$otherParams,
           _this$otherParams$bus,
           _this$otherParams2,
           _this$otherParams3,
-          _this$otherParams4,
-          _this2 = this;
+          _this$otherParams4;
         var _ref,
           _ref$category_ids,
           category_ids,
@@ -182,6 +188,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           status,
           strategy_context,
           options,
+          scope,
+          assertScope,
           userPlugin,
           customer_id,
           _userPlugin$get,
@@ -203,7 +211,14 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _ref = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
               options = _args5.length > 1 ? _args5[1] : undefined;
-              // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
+              scope = this.otherParams.catalogScopeKey;
+              assertScope = function assertScope() {
+                if (scope !== _this2.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
               //     .getScheduleListByIds(schedule_ids)
@@ -276,39 +291,46 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               subscriptionCallback = originalCallback ? ( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(result) {
                   var _result$data;
-                  var callbackList, resolvedCallbackList;
+                  var callbackList, products;
                   return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                     while (1) switch (_context4.prev = _context4.next) {
                       case 0:
+                        if (!(scope !== _this2.otherParams.catalogScopeKey)) {
+                          _context4.next = 2;
+                          break;
+                        }
+                        return _context4.abrupt("return");
+                      case 2:
                         callbackList = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.list;
                         if (Array.isArray(callbackList)) {
-                          _context4.next = 4;
+                          _context4.next = 6;
                           break;
                         }
                         originalCallback(result);
                         return _context4.abrupt("return");
-                      case 4:
+                      case 6:
                         if (!handledByOsServer) {
                           // Subscription payloads may contain only changed products, so keep
                           // the existing raw catalog scope and upsert the changed records.
                           _this2.rememberRawProductQueryResult(callbackList);
                         }
-                        resolvedCallbackList = resolveClientDataVariants({
+                        products = resolveClientDataVariants({
                           core: _this2.core,
                           otherParams: _this2.otherParams,
                           products: callbackList,
                           queryPayload: queryPayload,
                           handledByOsServer: handledByOsServer
                         });
-                        _context4.next = 8;
-                        return _this2.addProduct(resolvedCallbackList);
-                      case 8:
-                        originalCallback(resolvedCallbackList === callbackList ? result : _objectSpread(_objectSpread({}, result), {}, {
+                        assertScope();
+                        _context4.next = 11;
+                        return _this2.addProduct(products);
+                      case 11:
+                        originalCallback(handledByOsServer ? result : _objectSpread(_objectSpread({}, result), {}, {
                           data: _objectSpread(_objectSpread({}, result.data), {}, {
-                            list: resolvedCallbackList
+                            list: products
                           })
                         }));
-                      case 9:
+                      case 12:
                       case "end":
                         return _context4.stop();
                     }
@@ -318,15 +340,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                   return _ref2.apply(this, arguments);
                 };
               }()) : undefined;
-              _context5.next = 16;
+              _context5.next = 18;
               return this.request.post("/product/query", queryPayload, {
                 osServer: true,
                 callback: subscriptionCallback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 16:
+            case 18:
               productsData = _context5.sent;
+              assertScope();
               if (!handledByOsServer && Array.isArray(productsData.data.list)) {
                 this.replaceRawProductQueryResult(productsData.data.list, product_ids);
               }
@@ -348,7 +371,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context5.abrupt("return", sortedList);
-            case 22:
+            case 25:
             case "end":
               return _context5.stop();
           }

package/dist/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 工作区。