@pisell/pisellos 2.2.183 → 2.2.184

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

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

package/dist/solution/BookingTicket/index.js

@@ -929,6 +929,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return;
       }
       var previousCustomerId = (_this$store$order$get3 = this.store.order.getOrderCustomer()) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.customer_id;
+      var snapshotBeforeSet = this.store.order.getOrderCustomerSnapshot();
       var patch = formatOrderCustomerPatch(customer);
       var customerUnchanged = Number(previousCustomerId || 0) === Number(patch.customer_id || 0);
       if (!customerUnchanged) {
@@ -936,7 +937,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         this.hasManualDiscountSelection = false;
       }
       this.store.order.setOrderCustomer(patch, customer);
+      var snapshotAfterOrderSet = this.store.order.getOrderCustomerSnapshot();
       if (customerUnchanged) {
+        // hydrate 后 customer_id 已存在但 _extend.customerSnapshot 仍为空时，
+        // 须通知 SalesSdk 刷新 selected（否则会一直停在 onSalesOrderLoaded 时的 null）。
+        var snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
+        if (snapshotReplenished) {
+          var _next2 = this.buildOrderCustomerPayload();
+          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2);
+        }
         return;
       }
       var next = this.buildOrderCustomerPayload();

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

@@ -528,7 +528,8 @@ var PromotionEvaluator = class {
       return b.price - a.price;
     });
     const totalUnits = unitProducts.length;
-    const groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
+    const isCumulative = cumulative !== false;
+    const groupCount = isCumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
     const promotionUnits = groupCount * x;
     const inPromotionUnits = unitProducts.slice(0, promotionUnits);
     const notInPromotionUnits = unitProducts.slice(promotionUnits);

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

@@ -0,0 +1,49 @@
+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,
+  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,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -312,6 +312,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private normalizeHydratedProductOptionItem;
+    private resolveHydratedProductOptions;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;

package/lib/modules/Order/index.js

@@ -1443,7 +1443,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       productToAdd.product_option_item,
       productToAdd.product_bundle
     );
-    const normalizedIncoming = (0, import_utils3.normalizeOrderProduct)(productToAdd);
+    const normalizedIncoming = (0, import_utils.mergeOrderProductDisplayFields)(
+      productToAdd,
+      (0, import_utils3.normalizeOrderProduct)(productToAdd)
+    );
     normalizedIncoming.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedIncoming.discount_list
     );
@@ -1496,13 +1499,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     } else {
       const targetProduct = matchedProduct;
       const targetUid = (_a = targetProduct.metadata) == null ? void 0 : _a.unique_identification_number;
-      const normalizedProduct = (0, import_utils3.normalizeOrderProduct)({
-        ...productToAdd,
-        metadata: {
-          ...productToAdd.metadata || {},
-          unique_identification_number: targetUid
-        }
-      });
+      const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
+        targetProduct,
+        (0, import_utils3.normalizeOrderProduct)({
+          ...productToAdd,
+          metadata: {
+            ...productToAdd.metadata || {},
+            unique_identification_number: targetUid
+          }
+        })
+      );
       normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
         normalizedProduct.discount_list
       );
@@ -1621,7 +1627,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       delete nextProduct.metadata.main_product_original_price;
       delete nextProduct.metadata.price_schema_version;
     }
-    let normalizedProduct = (0, import_utils3.normalizeOrderProduct)(nextProduct);
+    let normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
+      nextProduct,
+      (0, import_utils3.normalizeOrderProduct)(nextProduct)
+    );
     normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedProduct.discount_list
     );
@@ -2240,7 +2249,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async getOrderInfoByRemote(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"]
-    });
+    }, { osServer: true });
     if (res.code === 200) {
       this.store.lastOrderInfo = res.data;
     }
@@ -2265,6 +2274,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return nextTempOrder;
   }
   normalizeTempOrderForRuntime(raw, options) {
+    var _a, _b;
     const nextTempOrder = {
       ...this.createDefaultTempOrderInstance(),
       ...raw || {}
@@ -2284,7 +2294,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     delete nextTempOrder.holder_id;
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === "object" ? { ...raw.metadata } : {};
     nextTempOrder.holder = raw.holder && typeof raw.holder === "object" ? { ...raw.holder } : null;
-    nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
+    const rawProducts = Array.isArray(raw.products) ? raw.products : [];
+    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
     nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => ({
       ...b || {},
       is_all: (0, import_utils.normalizeBookingIsAll)(b || {}),
@@ -2299,19 +2310,57 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...raw._extend,
       productsByUid: raw._extend.productsByUid || {}
     } : { productsByUid: {} };
+    const tempOrderExtend = nextTempOrder._extend;
+    const productsByUid = tempOrderExtend.productsByUid || {};
+    for (const [index, product] of nextTempOrder.products.entries()) {
+      const uid = (_a = product.metadata) == null ? void 0 : _a.unique_identification_number;
+      if (!uid)
+        continue;
+      const existed = productsByUid[uid] && typeof productsByUid[uid] === "object" ? productsByUid[uid] : {};
+      const rawProduct = rawProducts[index] && typeof rawProducts[index] === "object" ? rawProducts[index] : product;
+      const origin = existed.origin ?? rawProduct._origin ?? ((_b = rawProduct.metadata) == null ? void 0 : _b.origin) ?? rawProduct;
+      productsByUid[uid] = {
+        ...existed,
+        origin: (0, import_lodash_es.cloneDeep)(origin)
+      };
+    }
+    tempOrderExtend.productsByUid = productsByUid;
     if ((options == null ? void 0 : options.ensureIdentity) !== false) {
       this.ensureExternalSaleNumber(nextTempOrder);
     }
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
+  normalizeHydratedProductOptionItem(optionItem) {
+    const rawNum = (optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity) ?? 1;
+    const parsedNum = Number(rawNum);
+    const rawPrice = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
+    const parsedPrice = Number(rawPrice);
+    return {
+      option_group_item_id: optionItem == null ? void 0 : optionItem.option_group_item_id,
+      option_group_id: optionItem == null ? void 0 : optionItem.option_group_id,
+      num: Number.isFinite(parsedNum) && parsedNum > 0 ? parsedNum : 1,
+      price: Number.isFinite(parsedPrice) ? parsedPrice : 0
+    };
+  }
+  resolveHydratedProductOptions(row) {
+    var _a;
+    if (Array.isArray(row.product_option_item) && row.product_option_item.length > 0) {
+      return row.product_option_item;
+    }
+    const skuOptions = (_a = row.product_sku) == null ? void 0 : _a.option;
+    if (!Array.isArray(skuOptions))
+      return [];
+    return skuOptions.map(
+      (optionItem) => this.normalizeHydratedProductOptionItem(optionItem || {})
+    );
+  }
   normalizeHydratedOrderProduct(product) {
     const row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
     }
-    if (!Array.isArray(row.product_option_item))
-      row.product_option_item = [];
+    row.product_option_item = this.resolveHydratedProductOptions(row);
     if (!Array.isArray(row.product_bundle))
       row.product_bundle = [];
     if (!row.metadata || typeof row.metadata !== "object")
@@ -2327,6 +2376,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const result = {
       ...row,
       ...normalized,
+      product_sku: row.product_sku,
       metadata: {
         ...row.metadata,
         ...normalized.metadata

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

@@ -397,6 +397,7 @@ export interface SubmitSalesOrderParams {
         products: OrderSubmitProduct[];
         bookings: OrderSubmitBooking[];
         payments: any[];
+        vouchers: any[];
         surcharges?: any[];
         relation_forms: any[];
         form_record_ids?: OrderSubmitFormRecord[];

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/solution/BaseSales/index.js

@@ -430,7 +430,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
     const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-    debugger;
     if (!params.forceRemote) {
       const localRecord = params.orderId !== void 0 ? await this.store.order.getLocalOrderByOrderId(params.orderId) : externalSaleNumber ? await this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber) : params.orderNumber ? await this.store.order.getLocalOrderByOrderNumber(params.orderNumber) : null;
       if (localRecord) {

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

@@ -176,6 +176,18 @@ export declare function getOrderProductOriginalPriceForPromotion(product: any):
 export declare function mergeIdenticalPromotionCartLines(products: any[]): any[];
 /** 获取行 uid（统一以 `metadata.unique_identification_number` 为唯一键） */
 export declare function getOrderProductUid(product: any): string;
+/**
+ * 促销评估前合并同 SKU 拆分行（含促销/原价行），避免加购后仅前 2 件享受优惠。
+ * 带 `booking_uid` 的预约行不参与合并（每次加车独立 booking + 商品行）。
+ *
+ * @example
+ * consolidateMainProductsForPromotion([
+ *   { item: promoLineNum2, originalListIndex: 0 },
+ *   { item: regularLineNum2, originalListIndex: 1 },
+ * ]);
+ * // => 单行 num=4，清除 _promotion 后重新评估
+ */
+export declare function buildConsolidateKeyForPromotion(item: any): string;
 /**
  * 从策略配置的 product_match 规则提取可参与商品列表。
  *

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

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cartPromotion_exports = {};
 __export(cartPromotion_exports, {
   appendPromotionTags: () => appendPromotionTags,
+  buildConsolidateKeyForPromotion: () => buildConsolidateKeyForPromotion,
   calculateUnfulfilledPromotions: () => calculateUnfulfilledPromotions,
   extractProductMatchIdentifiersFromStrategyConfig: () => extractProductMatchIdentifiersFromStrategyConfig,
   getOrderProductBasePrice: () => getOrderProductBasePrice,
@@ -151,7 +152,7 @@ function resolveXItemsExpectedUnitPrice(promotion, sourceCartNum) {
   return Number(new import_decimal.default(y).div(x).toDecimalPlaces(2).toFixed(2));
 }
 function mergeIdenticalPromotionCartLines(products) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (!Array.isArray(products) || products.length <= 1) {
     return [...products || []];
   }
@@ -177,10 +178,12 @@ function mergeIdenticalPromotionCartLines(products) {
     const promoUnitPrice = String(
       promotion.finalPrice ?? ((_c = line.metadata) == null ? void 0 : _c.main_product_selling_price) ?? ""
     );
+    const bookingUid = (line == null ? void 0 : line.booking_uid) ?? ((_d = line == null ? void 0 : line.metadata) == null ? void 0 : _d.booking_uid);
     const mergeKey = [
       line.product_id,
       line.product_variant_id ?? 0,
       fingerprint,
+      bookingUid ? String(bookingUid) : "",
       promotion.strategyId,
       unitPrice,
       promoUnitPrice
@@ -197,7 +200,7 @@ function mergeIdenticalPromotionCartLines(products) {
   return merged;
 }
 function dedupePromotionProcessedLines(lines) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   if (!Array.isArray(lines) || lines.length <= 1)
     return [...lines || []];
   const passthrough = [];
@@ -263,9 +266,24 @@ function dedupePromotionProcessedLines(lines) {
         return promotionDelta(line) > promotionDelta(best) ? line : best;
       }, pool[0]);
     }
-    winner.num = (0, import_utils2.getSafeProductNum)(sourceCartNum || winner.num || 1);
+    const winnerIsXItems = getPromotionActionType((_c = winner.metadata) == null ? void 0 : _c._promotion) === X_ITEMS_FOR_Y_PRICE;
+    if (winnerIsXItems) {
+      const xItemsGroupLines = group.filter(
+        (line) => {
+          var _a2;
+          return getPromotionActionType((_a2 = line.metadata) == null ? void 0 : _a2._promotion) === X_ITEMS_FOR_Y_PRICE;
+        }
+      );
+      const evaluatedPromoQty = xItemsGroupLines.reduce(
+        (sum, line) => sum + Number(line.num || 0),
+        0
+      );
+      winner.num = (0, import_utils2.getSafeProductNum)(evaluatedPromoQty || winner.num || 1);
+    } else {
+      winner.num = (0, import_utils2.getSafeProductNum)(sourceCartNum || winner.num || 1);
+    }
     const recomputeUnit = resolveXItemsExpectedUnitPrice(
-      (_c = winner.metadata) == null ? void 0 : _c._promotion,
+      (_d = winner.metadata) == null ? void 0 : _d._promotion,
       sourceCartNum
     );
     if (recomputeUnit != null) {
@@ -273,13 +291,13 @@ function dedupePromotionProcessedLines(lines) {
       applyPromoUnitPriceToLine(winner, {
         promoUnitPrice: recomputeUnit,
         originalBasePrice: Number(promo.originalPrice),
-        strategyTitle: (_d = promo.strategyMetadata) == null ? void 0 : _d.name
+        strategyTitle: (_e = promo.strategyMetadata) == null ? void 0 : _e.name
       });
       promo.finalPrice = recomputeUnit;
     }
     for (const line of group) {
-      const giftInfo = (_f = (_e = line.metadata) == null ? void 0 : _e._promotion) == null ? void 0 : _f.giftInfo;
-      if (giftInfo && ((_g = winner.metadata) == null ? void 0 : _g._promotion) && !winner.metadata._promotion.giftInfo) {
+      const giftInfo = (_g = (_f = line.metadata) == null ? void 0 : _f._promotion) == null ? void 0 : _g.giftInfo;
+      if (giftInfo && ((_h = winner.metadata) == null ? void 0 : _h._promotion) && !winner.metadata._promotion.giftInfo) {
         winner.metadata._promotion.giftInfo = giftInfo;
       }
     }
@@ -309,12 +327,93 @@ function getProductBundleForEvaluator(product) {
     _bundle_product_id: (b == null ? void 0 : b._bundle_product_id) ?? (b == null ? void 0 : b.bundle_product_id) ?? (b == null ? void 0 : b.product_id)
   }));
 }
+function buildConsolidateKeyForPromotion(item) {
+  var _a;
+  const fingerprint = (0, import_utils2.buildProductLineFingerprint)(
+    item.product_option_item,
+    item.product_bundle
+  );
+  const bookingUid = (item == null ? void 0 : item.booking_uid) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.booking_uid);
+  if (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "") {
+    return [
+      item.product_id,
+      item.product_variant_id ?? 0,
+      fingerprint,
+      String(bookingUid)
+    ].join("#");
+  }
+  return [item.product_id, item.product_variant_id ?? 0, fingerprint].join("#");
+}
+function consolidateMainProductsForPromotion(entries) {
+  if (!Array.isArray(entries) || entries.length <= 1) {
+    return [...entries || []];
+  }
+  const groups = /* @__PURE__ */ new Map();
+  for (const { item, originalListIndex } of entries) {
+    const key = buildConsolidateKeyForPromotion(item);
+    const existing = groups.get(key);
+    if (!existing) {
+      const mergedItem = (0, import_lodash_es.cloneDeep)(item);
+      const metadata = mergedItem.metadata || {};
+      delete metadata._promotion;
+      mergedItem.metadata = metadata;
+      if (Array.isArray(mergedItem.product_bundle)) {
+        for (const bundle of mergedItem.product_bundle) {
+          if (bundle && typeof bundle === "object")
+            delete bundle._promotion;
+        }
+      }
+      groups.set(key, { item: mergedItem, originalListIndex });
+      continue;
+    }
+    existing.item.num = (0, import_utils2.getSafeProductNum)(
+      Number(existing.item.num || 0) + Number(item.num || 0)
+    );
+  }
+  return Array.from(groups.values());
+}
+function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
+  var _a;
+  const result = [];
+  for (const line of lines) {
+    const promo = (_a = line == null ? void 0 : line.metadata) == null ? void 0 : _a._promotion;
+    if (!(promo == null ? void 0 : promo.inPromotion) || !promo.strategyId) {
+      result.push(line);
+      continue;
+    }
+    if (getPromotionActionType(promo) !== X_ITEMS_FOR_Y_PRICE) {
+      result.push(line);
+      continue;
+    }
+    const actionMeta = strategyActionMap.get(promo.strategyId);
+    const detail = (actionMeta == null ? void 0 : actionMeta.actionDetail) ?? promo.actionDetail;
+    const x = Number(detail == null ? void 0 : detail.x);
+    const num = Number(line.num || 0);
+    const isCumulative = (detail == null ? void 0 : detail.cumulative) !== false;
+    if (!isCumulative || !Number.isFinite(x) || x <= 0 || num <= x || num % x !== 0) {
+      result.push(line);
+      continue;
+    }
+    const groupCount = num / x;
+    for (let i = 0; i < groupCount; i++) {
+      const splitLine = (0, import_lodash_es.cloneDeep)(line);
+      splitLine.num = (0, import_utils2.getSafeProductNum)(x);
+      splitLine.metadata = {
+        ...splitLine.metadata || {},
+        unique_identification_number: (0, import_utils.createUuidV4)()
+      };
+      result.push(splitLine);
+    }
+  }
+  return result;
+}
 function generateNumericId() {
   return Math.floor(Math.random() * 1e9) + Date.now();
 }
 function convertToPromotionProduct(product, index) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
   const numericId = generateNumericId();
+  const originalItem = product;
   return {
     id: numericId,
     product_id: Number((product == null ? void 0 : product.product_id) ?? 0) || 0,
@@ -323,7 +422,7 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((product == null ? void 0 : product.num) ?? 1) || 1,
     bundle: getProductBundleForEvaluator(product),
-    _originalItem: product,
+    _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
   };
@@ -548,7 +647,10 @@ function processCartPromotion(list, evaluator, options) {
       mainProductsWithIndex.push({ item, originalListIndex: i });
     }
   }
-  const mainProducts = mainProductsWithIndex.map((x) => x.item);
+  const consolidatedMainProductsWithIndex = consolidateMainProductsForPromotion(
+    mainProductsWithIndex
+  );
+  const mainProducts = consolidatedMainProductsWithIndex.map((x) => x.item);
   const existingGifts = existingGiftsWithIndex.map((x) => x.item);
   if (mainProducts.length === 0) {
     const editProducts = editProductsWithIndex.map((x) => x.item);
@@ -574,7 +676,7 @@ function processCartPromotion(list, evaluator, options) {
   }
   const promotionProducts = [];
   const originalItemMap = /* @__PURE__ */ new Map();
-  const productsForStrategies = mainProductsWithIndex.map(({ item }, i) => {
+  const productsForStrategies = consolidatedMainProductsWithIndex.map(({ item }, i) => {
     var _a2;
     return {
       id: i,
@@ -586,8 +688,8 @@ function processCartPromotion(list, evaluator, options) {
       bundle: getProductBundleForEvaluator(item)
     };
   });
-  for (let i = 0; i < mainProductsWithIndex.length; i++) {
-    const { item, originalListIndex } = mainProductsWithIndex[i];
+  for (let i = 0; i < consolidatedMainProductsWithIndex.length; i++) {
+    const { item, originalListIndex } = consolidatedMainProductsWithIndex[i];
     const promotionProduct = convertToPromotionProduct(item, originalListIndex);
     promotionProducts.push(promotionProduct);
     originalItemMap.set(promotionProduct.id, { item, index: originalListIndex });
@@ -765,6 +867,8 @@ function processCartPromotion(list, evaluator, options) {
   processedProducts.splice(0, processedProducts.length, ...dedupedPromotionLines);
   const mergedPromotionLines = mergeIdenticalPromotionCartLines(processedProducts);
   processedProducts.splice(0, processedProducts.length, ...mergedPromotionLines);
+  const splitPromoLines = splitXItemsPromoLinesByGroup(processedProducts, strategyActionMap);
+  processedProducts.splice(0, processedProducts.length, ...splitPromoLines);
   for (const product of processedProducts) {
     const metadata = product.metadata || {};
     if (metadata._promotion)
@@ -812,6 +916,7 @@ function processCartPromotion(list, evaluator, options) {
     delete product._sortIndex;
     delete product._sortSubIndex;
     delete product._originalProductUid;
+    delete product._sourceCartNum;
   }
   return {
     products: processedProducts,
@@ -824,6 +929,7 @@ function processCartPromotion(list, evaluator, options) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   appendPromotionTags,
+  buildConsolidateKeyForPromotion,
   calculateUnfulfilledPromotions,
   extractProductMatchIdentifiersFromStrategyConfig,
   getOrderProductBasePrice,

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

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

package/lib/solution/BookingTicket/index.js

@@ -520,6 +520,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       return;
     }
     const previousCustomerId = (_a = this.store.order.getOrderCustomer()) == null ? void 0 : _a.customer_id;
+    const snapshotBeforeSet = this.store.order.getOrderCustomerSnapshot();
     const patch = (0, import_orderCustomer.formatOrderCustomerPatch)(customer);
     const customerUnchanged = Number(previousCustomerId || 0) === Number(patch.customer_id || 0);
     if (!customerUnchanged) {
@@ -527,7 +528,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       this.hasManualDiscountSelection = false;
     }
     this.store.order.setOrderCustomer(patch, customer);
+    const snapshotAfterOrderSet = this.store.order.getOrderCustomerSnapshot();
     if (customerUnchanged) {
+      const snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
+      if (snapshotReplenished) {
+        const next2 = this.buildOrderCustomerPayload();
+        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next2);
+      }
       return;
     }
     const next = this.buildOrderCustomerPayload();

package/package.json

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