@pisell/pisellos 2.2.281 → 2.2.283

package/dist/core/index.js

@@ -45,6 +45,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log('constructor123456543');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

package/dist/modules/Order/index.d.ts

@@ -512,7 +512,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -37,7 +37,7 @@ import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
-import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
+import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { hasManualProductDiscountFlag, syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
@@ -4018,8 +4018,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         booking: booking
       }) : null;
       var productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
-      var incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
+      var disableMerge = (options === null || options === void 0 ? void 0 : options.disableMerge) === true;
+      var incomingFingerprint = disableMerge ? '' : buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
       var normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
+      if (disableMerge) {
+        normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, _defineProperty({}, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY, true));
+      }
       var isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
       var netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
       if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
@@ -4038,7 +4042,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
       var hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
       var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
-      var shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+      var shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
         var _item$metadata3;
         if (_this27.hasGoodPassDiscount(item)) return false;
@@ -4168,7 +4172,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               singleLine.num = 1;
               delete singleLine.product_quantity;
               _appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
-                insertAtIndex: insertAtIndex
+                insertAtIndex: insertAtIndex,
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
               if (!_appendResult) {
                 _context21.next = 17;
@@ -4189,7 +4194,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context21.abrupt("return", tempOrder.products);
             case 24:
               appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
-                insertAtIndex: insertAtIndex
+                insertAtIndex: insertAtIndex,
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
               if (!appendResult) {
                 _context21.next = 28;

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

@@ -157,13 +157,11 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
- * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
-    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
@@ -330,6 +328,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。

package/dist/modules/Order/types.js

@@ -60,7 +60,6 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
- * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 

package/dist/modules/Order/utils.js

@@ -1124,7 +1124,12 @@ export function buildSubmitPayload(params) {
     var _tempOrder$bookings;
     // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
     if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
-      submitType = 'appointment_booking';
+      // 260807 如果 biz 是堂食，type 使用table-order
+      if (businessCode === 'dine_in') {
+        submitType = 'table-order';
+      } else {
+        submitType = 'appointment_booking';
+      }
     } else {
       submitType = 'virtual';
     }

package/dist/solution/BaseSales/index.js

@@ -2126,23 +2126,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return !_this12.isPersistedOrderProduct(product);
       });
       if (hasDraftProduct) return false;
-
-      // 编辑详情 hydrate 时，商品行上的历史券卡会被还原为 isEditMode=true、
-      // isSelected=true 的只读记录。它们表示“该折扣已在原订单结算”，不是用户在
-      // 当前编辑会话中新做的选择，不能据此放行刚从 prepare/config 拉回来的折扣。
-      // 否则后续 Rules.calcDiscount 会把没有 isManualSelect 标记的可用 runtime 卡
-      // 当作自动候选，再次写入 tempOrder。这里只识别非 isEditMode 的 runtime 状态；
-      // 新建单、编辑态新增商品以及用户本次明确选择/取消折扣的原有流程保持不变。
-      var hasRuntimeDiscountSelection = params.currentDiscountList.some(function (discount) {
-        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
+      var hasSelectedDiscount = params.currentDiscountList.some(function (discount) {
+        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
       });
-      if (hasRuntimeDiscountSelection) return false;
-
-      // nextDiscountList 已经合并了历史只读折扣与本次获取的 runtime 折扣，
-      // 因此这里同样必须排除 isEditMode；只有 runtime 条目已有明确选择状态时，
-      // 才允许继续进入折扣重算。
+      if (hasSelectedDiscount) return false;
       return !params.nextDiscountList.some(function (discount) {
-        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
+        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
       });
     }
   }, {

package/dist/solution/BaseSales/utils/cartPromotion.d.ts

@@ -1,4 +1,9 @@
 import type { OrderProduct } from '../../../modules/Order/types';
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export declare const PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = "_productLineMergeDisabled";
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *

package/dist/solution/BaseSales/utils/cartPromotion.js

@@ -23,6 +23,12 @@ import { cloneDeep } from 'lodash-es';
 import { composeLinePrice, createUuidV4, getProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildProductLineFingerprint, getSafeProductNum } from "../../ScanOrder/utils";
 
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export var PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = '_productLineMergeDisabled';
+
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *
@@ -483,10 +489,13 @@ function hasGoodPassDiscount(product) {
 }
 
 /**
- * 商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
+ * 不合并商品、商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
  */
 function getPromotionLineMergeBoundary(product) {
-  var _product$product_sku, _product$metadata3;
+  var _product$metadata3, _product$product_sku, _product$metadata4;
+  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3[PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY]) === true) {
+    return "separate:".concat(getOrderProductUid(product));
+  }
   if ((product === null || product === void 0 ? void 0 : product.product_id) === undefined || (product === null || product === void 0 ? void 0 : product.product_id) === null) {
     return "custom:".concat(getOrderProductUid(product));
   }
@@ -496,7 +505,7 @@ function getPromotionLineMergeBoundary(product) {
   if (Number((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1) {
     return "weighing:".concat(getOrderProductUid(product));
   }
-  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_edit_for_runtime) !== true) return '';
+  if ((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.is_edit_for_runtime) !== true) return '';
   return "edit:".concat(getOrderProductUid(product));
 }
 function isPersistedGeneratedVoucher(product) {
@@ -921,13 +930,13 @@ export function resolveStrategyEligibleProducts(matched) {
 export function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts) {
   var unfulfilledMap = new Map();
   var _loop2 = function _loop2() {
-      var _product$metadata4, _ref13, _product$_originalPro, _product$metadata5, _product$num2;
+      var _product$metadata5, _ref13, _product$_originalPro, _product$metadata6, _product$num2;
       var product = processedProducts[i];
-      var promotion = product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4._promotion;
+      var promotion = product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5._promotion;
       if (!promotion || promotion.inPromotion !== false) return 0; // continue
       var strategyId = promotion.strategyId;
       if (!strategyId) return 0; // continue
-      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
+      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
       var originalIndex = mainProducts.findIndex(function (item) {
         return getOrderProductUid(item) === lookupUid;
       });

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

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
+import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,9 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null, options?: {
-        source?: OrderCustomerChangePayload['source'];
-    }): void;
+    setOrderCustomer(customer: ICustomer | null): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -453,7 +451,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/index.js

@@ -41,7 +41,7 @@ import { handleGlobalScan, handleCustomerScan, handleUniversalScan } from "./uti
 import scanCache from "./utils/scan/scanCache";
 import { formatGlobalScanResult } from "./utils/scan/formatGlobalScan";
 import { applyGlobalScan } from "./utils/scan/applyGlobalScan";
-import { buildCartView } from "./utils/cartView";
+import { buildCartView, isWalkInCustomer } from "./utils/cartView";
 import { buildCacheItemFromCartDetail, buildCacheItemFromDetail, buildRequiresDetailPayload as _buildRequiresDetailPayload, decideAddProduct as decideAddProductUtil, decideAfterDetail as decideAfterDetailUtil, decideAutoClose as decideAutoCloseUtil, getIsEject as getIsEjectUtil, getIsOnlySession as getIsOnlySessionUtil, transformDetailToProductAndBooking as transformDetailToProductAndBookingUtil } from "./utils/addProductDecision";
 import { buildCacheItemFromOrderLine as buildCacheItemFromOrderLineUtil } from "../../modules/BookingContext/utils/buildCacheItemFromOrderLine";
 import { buildSessionCatalogStaleInfo, isSessionCatalogDateStale } from "./utils/sessionCatalogStale";
@@ -542,12 +542,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   country_calling_code: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.country_calling_code
                 });
                 customerModule.setSelectedCustomer(customer);
-                // 详情 hydrate 后仍需广播一次，让 CustomerContext 等 UI 订阅方拿到刚补齐的
-                // customerSnapshot；但它不是用户主动切换客户。通过 source 明确标记初始化事件，
-                // 商品报价/折扣订阅方即可跳过 prepare/config，其他旧订阅方仍可照常刷新 UI。
-                this.setOrderCustomer(customer, {
-                  source: 'detailHydrate'
-                });
+                this.setOrderCustomer(customer);
                 // await this.store.order.saveDraft();
               }
               return _context6.abrupt("return", sales);
@@ -683,7 +678,13 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var item = _step.value;
-          var topLevelId = Number(item.customer_id);
+          var rawCustomerId = item.customer_id;
+          if (!rawCustomerId || isWalkInCustomer({
+            id: rawCustomerId
+          })) {
+            continue;
+          }
+          var topLevelId = Number(rawCustomerId);
           if (Number.isFinite(topLevelId) && topLevelId > 0) {
             return topLevelId;
           }
@@ -1563,7 +1564,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
      */
   }, {
     key: "setOrderCustomer",
-    value: function setOrderCustomer(customer, options) {
+    value: function setOrderCustomer(customer) {
       var _this$store$order$get3,
         _this3 = this;
       if (!customer) {
@@ -1586,16 +1587,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         var snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
         if (snapshotReplenished) {
           var _next2 = this.buildOrderCustomerPayload();
-          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2 && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, _next2), {}, {
-            source: options.source
-          }) : _next2);
+          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2);
         }
         return;
       }
       var next = this.buildOrderCustomerPayload();
-      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, next), {}, {
-        source: options.source
-      }) : next);
+      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
       this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
       // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
       var promotionRefreshTask = this.store.order.applyPromotion().then(function () {

package/lib/core/index.js

@@ -50,6 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log("constructor123456543");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,51 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -512,7 +512,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -3048,7 +3048,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c, _d, _e, _f;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
-    const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+    const disableMerge = (options == null ? void 0 : options.disableMerge) === true;
+    const incomingFingerprint = disableMerge ? "" : (0, import_utils3.buildProductLineFingerprint)(
       (0, import_utils.getProductSkuOptions)(productToAdd),
       productToAdd.product_bundle
     );
@@ -3056,6 +3057,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       productToAdd,
       (0, import_utils3.normalizeOrderProduct)(productToAdd)
     );
+    if (disableMerge) {
+      normalizedIncoming.metadata = {
+        ...normalizedIncoming.metadata || {},
+        [import_cartPromotion.PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY]: true
+      };
+    }
     const isWeighingProduct = Number(((_a = normalizedIncoming.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1;
     const netWeight = Number((_b = normalizedIncoming.product_sku) == null ? void 0 : _b.net_weight);
     if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
@@ -3079,7 +3086,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
     const isIncomingCustomItem = ((_e = (_d = productToAdd.metadata) == null ? void 0 : _d.origin) == null ? void 0 : _e.isCustomItem) === true || ((_f = productToAdd._origin) == null ? void 0 : _f.isCustomItem) === true;
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+    const shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
@@ -3235,7 +3242,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             tempOrder,
             singleLine,
             (0, import_lodash_es.cloneDeep)(booking),
-            { insertAtIndex }
+            { insertAtIndex, disableMerge: options == null ? void 0 : options.disableMerge }
           );
           if (appendResult2)
             await appendResult2;
@@ -3250,7 +3257,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       product,
       booking,
-      { insertAtIndex }
+      { insertAtIndex, disableMerge: options == null ? void 0 : options.disableMerge }
     );
     if (appendResult)
       await appendResult;

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

@@ -157,13 +157,11 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
- * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
-    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
@@ -330,6 +328,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。

package/lib/modules/Order/utils.js

@@ -994,7 +994,11 @@ function buildSubmitPayload(params) {
   let submitType = type ?? tempOrder.type;
   if (!submitType) {
     if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
-      submitType = "appointment_booking";
+      if (businessCode === "dine_in") {
+        submitType = "table-order";
+      } else {
+        submitType = "appointment_booking";
+      }
     } else {
       submitType = "virtual";
     }

package/lib/solution/BaseSales/index.js

@@ -1494,13 +1494,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const hasDraftProduct = params.products.some((product) => !this.isPersistedOrderProduct(product));
     if (hasDraftProduct)
       return false;
-    const hasRuntimeDiscountSelection = params.currentDiscountList.some(
-      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
+    const hasSelectedDiscount = params.currentDiscountList.some(
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
     );
-    if (hasRuntimeDiscountSelection)
+    if (hasSelectedDiscount)
       return false;
     return !params.nextDiscountList.some(
-      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
     );
   }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {

package/lib/solution/BaseSales/utils/cartPromotion.d.ts

@@ -1,4 +1,9 @@
 import type { OrderProduct } from '../../../modules/Order/types';
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export declare const PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = "_productLineMergeDisabled";
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BaseSales/utils/cartPromotion.ts
 var cartPromotion_exports = {};
 __export(cartPromotion_exports, {
+  PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY: () => PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY,
   appendPromotionTags: () => appendPromotionTags,
   buildConsolidateKeyForPromotion: () => buildConsolidateKeyForPromotion,
   calculateUnfulfilledPromotions: () => calculateUnfulfilledPromotions,
@@ -46,6 +47,7 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var import_utils = require("../../../modules/Order/utils");
 var import_utils2 = require("../../ScanOrder/utils");
+var PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = "_productLineMergeDisabled";
 function getOrderProductBasePrice(product) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
   const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product)).toNumber();
@@ -382,17 +384,20 @@ function hasGoodPassDiscount(product) {
   );
 }
 function getPromotionLineMergeBoundary(product) {
-  var _a, _b;
+  var _a, _b, _c;
+  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a[PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY]) === true) {
+    return `separate:${getOrderProductUid(product)}`;
+  }
   if ((product == null ? void 0 : product.product_id) === void 0 || (product == null ? void 0 : product.product_id) === null) {
     return `custom:${getOrderProductUid(product)}`;
   }
   if (hasGoodPassDiscount(product)) {
     return `good-pass:${getOrderProductUid(product)}`;
   }
-  if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
+  if (Number(((_b = product == null ? void 0 : product.product_sku) == null ? void 0 : _b.open_sold_weight) || 0) === 1) {
     return `weighing:${getOrderProductUid(product)}`;
   }
-  if (((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_edit_for_runtime) !== true)
+  if (((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.is_edit_for_runtime) !== true)
     return "";
   return `edit:${getOrderProductUid(product)}`;
 }
@@ -1065,6 +1070,7 @@ function processCartPromotion(list, evaluator, options) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY,
   appendPromotionTags,
   buildConsolidateKeyForPromotion,
   calculateUnfulfilledPromotions,

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

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
+import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,9 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null, options?: {
-        source?: OrderCustomerChangePayload['source'];
-    }): void;
+    setOrderCustomer(customer: ICustomer | null): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -453,7 +451,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -343,7 +343,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
         country_calling_code: selectedCustomer == null ? void 0 : selectedCustomer.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
-      this.setOrderCustomer(customer, { source: "detailHydrate" });
+      this.setOrderCustomer(customer);
     }
     return sales;
   }
@@ -392,7 +392,11 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   getDiscountCustomerId(discounts) {
     for (const item of discounts) {
-      const topLevelId = Number(item.customer_id);
+      const rawCustomerId = item.customer_id;
+      if (!rawCustomerId || (0, import_cartView.isWalkInCustomer)({ id: rawCustomerId })) {
+        continue;
+      }
+      const topLevelId = Number(rawCustomerId);
       if (Number.isFinite(topLevelId) && topLevelId > 0) {
         return topLevelId;
       }
@@ -891,7 +895,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
-  setOrderCustomer(customer, options) {
+  setOrderCustomer(customer) {
     var _a;
     if (!customer) {
       this.clearOrderCustomer();
@@ -911,18 +915,12 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       const snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
       if (snapshotReplenished) {
         const next2 = this.buildOrderCustomerPayload();
-        this.core.effects.emit(
-          `${this.name}:onOrderCustomerChange`,
-          next2 && (options == null ? void 0 : options.source) ? { ...next2, source: options.source } : next2
-        );
+        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next2);
       }
       return;
     }
     const next = this.buildOrderCustomerPayload();
-    this.core.effects.emit(
-      `${this.name}:onOrderCustomerChange`,
-      next && (options == null ? void 0 : options.source) ? { ...next, source: options.source } : next
-    );
+    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
     const promotionRefreshTask = this.store.order.applyPromotion().then(() => void 0);
     this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;

package/package.json

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