@pisell/pisellos 2.3.55 → 2.3.57

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/BookingContext/utils/productExtend.js

@@ -83,12 +83,13 @@ function getTimeObj(params) {
   const { cacheItem, useStartTime, useDuration, ctx } = params;
   const isMultiDay = (0, import_serviceTimes.isMultiDayProduct)(cacheItem);
   const flexibleOption = getFlexibleOption({ cacheItem, useStartTime, ctx });
-  const baseSlices = (0, import_timeSlices.sliceDayIntoFiveMinutes)(
+  const {
+    timeSlices,
+    durationSlicesBasedOnTime
+  } = (0, import_timeSlices.sliceDayIntoFiveMinutes)(
     (_c = (_b = (_a = ctx == null ? void 0 : ctx.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
     isMultiDay
   );
-  const timeSlices = [...baseSlices.timeSlices];
-  const durationSlicesBasedOnTime = [...baseSlices.durationSlicesBasedOnTime];
   if (flexibleOption) {
     durationSlicesBasedOnTime.unshift(flexibleOption);
   }

package/lib/modules/BookingContext/utils/timeSlices.js

@@ -38,10 +38,21 @@ __export(timeSlices_exports, {
 module.exports = __toCommonJS(timeSlices_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_flexible = require("./flexible");
+var timeSlicesCache = /* @__PURE__ */ new Map();
+function copyTimeSlices(result) {
+  return {
+    timeSlices: [...result.timeSlices],
+    durationSlicesBasedOnTime: [...result.durationSlicesBasedOnTime]
+  };
+}
 function sliceDayIntoFiveMinutes(config, isDay) {
+  const timeSlice = config && config.value || 5;
+  const cacheKey = isDay ? "days" : `minutes:${timeSlice}`;
+  const cached = timeSlicesCache.get(cacheKey);
+  if (cached)
+    return copyTimeSlices(cached);
   const startTime = (0, import_dayjs.default)().startOf("day");
   const endTime = (0, import_dayjs.default)().endOf("day");
-  const timeSlice = config && config.value || 5;
   const timeSlices = [];
   const durationSlicesBasedOnTime = [];
   let currentTime = startTime;
@@ -58,7 +69,9 @@ function sliceDayIntoFiveMinutes(config, isDay) {
       });
       currentDay += 1;
     }
-    return { timeSlices, durationSlicesBasedOnTime };
+    const result2 = { timeSlices, durationSlicesBasedOnTime };
+    timeSlicesCache.set(cacheKey, result2);
+    return copyTimeSlices(result2);
   }
   while (currentTime.isBefore(endTime)) {
     timeSlices.push({
@@ -73,7 +86,9 @@ function sliceDayIntoFiveMinutes(config, isDay) {
     });
     currentTime = nextTime;
   }
-  return { timeSlices, durationSlicesBasedOnTime };
+  const result = { timeSlices, durationSlicesBasedOnTime };
+  timeSlicesCache.set(cacheKey, result);
+  return copyTimeSlices(result);
 }
 function findNextDuration(current, array, defaultValue) {
   if (defaultValue !== void 0 && defaultValue !== null)

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

@@ -354,6 +354,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateVoucherOrderPaymentsAsync(payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
     }): Promise<OrderPaymentData[]>;
+    private normalizeShouldMergeProductResult;
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -375,7 +376,12 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
      *
      * @example
-     * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+     * const pending = this.appendProductLineToTempOrder(
+     *   tempOrder,
+     *   { product_id: 1, num: 1 },
+     *   booking,
+     * );
+     * if (pending) await pending;
      */
     private appendProductLineToTempOrder;
     /**
@@ -487,7 +493,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

@@ -44,6 +44,7 @@ var import_utils3 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 var import_bundleDiscountHydration = require("./utils/bundleDiscountHydration");
 var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var import_discountProductLineIdentity = require("./utils/discountProductLineIdentity");
 var import_Discount = require("../Discount");
 var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
@@ -133,7 +134,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.draftPersistEnabled = true;
   }
   collectHydratedEditDiscounts(products) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const discountMap = /* @__PURE__ */ new Map();
     for (const product of (0, import_bundleDiscountHydration.expandHydratedProductsForDiscountCollection)(products)) {
       for (const item of (product == null ? void 0 : product.discount_list) || []) {
@@ -148,16 +149,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const key = Number.isFinite(id) ? id : String(resourceId);
         const title = ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.title) ?? {};
         const amount = Number((item == null ? void 0 : item.amount) || 0);
+        const discountCardType = (_c = item == null ? void 0 : item.discount) == null ? void 0 : _c.discount_card_type;
+        const parValue = isDiscountCard ? discountCardType === "fixed_amount" ? ((_d = item == null ? void 0 : item.discount) == null ? void 0 : _d.fixed_amount) ?? (item == null ? void 0 : item.amount) : (_e = item == null ? void 0 : item.discount) == null ? void 0 : _e.percent : "0";
         const detail = {
           amount: String((item == null ? void 0 : item.amount) ?? "0"),
           type,
           resource_id: key,
           title,
-          original_amount: String(((_c = item == null ? void 0 : item.discount) == null ? void 0 : _c.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
-          num: Number(((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1,
+          original_amount: String(((_f = item == null ? void 0 : item.discount) == null ? void 0 : _f.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          num: Number(((_g = item == null ? void 0 : item.metadata) == null ? void 0 : _g.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1,
           metadata: item == null ? void 0 : item.metadata,
           discount: item == null ? void 0 : item.discount,
-          _num: Number(((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
+          _num: Number(((_h = item == null ? void 0 : item.metadata) == null ? void 0 : _h.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
         };
         const existed = discountMap.get(key);
         if (existed) {
@@ -166,7 +169,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           if (!isDiscountCard) {
             existed.balance = String(Number(existed.balance || 0) + amount);
           }
-          const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+          const productIds = Array.isArray((_i = existed.limited_relation_product_data) == null ? void 0 : _i.product_ids) ? existed.limited_relation_product_data.product_ids : [];
           if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
             existed.limited_relation_product_data = {
               ...existed.limited_relation_product_data || {},
@@ -189,9 +192,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           encoded: "",
           code: "",
           tag: type,
-          product_id: ((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+          product_id: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
           relation_type: "",
-          par_value: String(((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          par_value: String(parValue ?? "0"),
           used_par_value: String((item == null ? void 0 : item.amount) ?? "0"),
           limit_status: "enable",
           limited_relation_product_data: {
@@ -221,8 +224,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           discount: {
             ...(item == null ? void 0 : item.discount) || {},
             resource_id: key,
-            discount_product_id: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
-            discount_calculation_mode: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_calculation_mode) ?? "item_level"
+            discount_product_id: ((_k = item == null ? void 0 : item.discount) == null ? void 0 : _k.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+            discount_calculation_mode: ((_l = item == null ? void 0 : item.discount) == null ? void 0 : _l.discount_calculation_mode) ?? "item_level"
           },
           applicableProductDetails: [detail],
           appliedProductDetails: [detail]
@@ -274,7 +277,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const isPersistedBundleProduct = isPersistedProduct || Boolean(
           (bundle == null ? void 0 : bundle.order_detail_id) || (bundle == null ? void 0 : bundle.orderDetailId) || (bundle == null ? void 0 : bundle.booking_id)
         );
-        const bundleQty = new import_decimal.default(Number(qty) || 1).times(Number((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity) ?? 1) || 1).toNumber();
+        const bundleQty = Number(qty) || 1;
         for (const pd of (bundle == null ? void 0 : bundle.discount_list) || []) {
           addProductDiscountAmount(pd, bundleQty, isPersistedBundleProduct);
         }
@@ -670,6 +673,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           };
         })
       );
+      (0, import_discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder);
+      (0, import_discountProductLineIdentity.consolidateDiscountFreeProductLines)(tempOrder);
     }
     if (result == null ? void 0 : result.discountList) {
       OrderModule.populateSavedAmounts(
@@ -1878,6 +1883,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.products = (tempOrder.products || []).map(
       (product) => this.sanitizeOrderProductForTempOrder(product)
     );
+    (0, import_discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder);
   }
   ensureExtend(tempOrder) {
     if (!tempOrder._extend || typeof tempOrder._extend !== "object") {
@@ -2533,6 +2539,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       delete tempOrder._extend.customerSnapshot;
     this.store.availableWalletIds = [];
     this.clearCustomerBoundDiscounts(tempOrder);
+    this.applyDiscount();
     this.persistTempOrder();
     this.saveDraftInBackground();
     this.core.effects.emit(import_types.OrderHooks.OnOrderCustomerChange, null);
@@ -2838,21 +2845,29 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       devicePrefix
     });
   }
-  async shouldMergeProductToOrder(params) {
+  normalizeShouldMergeProductResult(result) {
+    if (typeof result === "boolean")
+      return result;
+    if (result && typeof result === "object" && typeof result.shouldMerge === "boolean") {
+      return result.shouldMerge;
+    }
+    return true;
+  }
+  shouldMergeProductToOrder(params) {
     var _a;
     const onBeforeMergeProductToOrder = (_a = this.orderHooks) == null ? void 0 : _a.onBeforeMergeProductToOrder;
     if (!onBeforeMergeProductToOrder)
       return true;
-    const result = await onBeforeMergeProductToOrder({
+    const result = onBeforeMergeProductToOrder({
       ...params,
       defaultShouldMerge: true
     });
-    if (typeof result === "boolean")
-      return result;
-    if (result && typeof result === "object" && typeof result.shouldMerge === "boolean") {
-      return result.shouldMerge;
+    if (result && typeof result === "object" && typeof result.then === "function") {
+      return Promise.resolve(result).then(
+        (resolved) => this.normalizeShouldMergeProductResult(resolved)
+      );
     }
-    return true;
+    return this.normalizeShouldMergeProductResult(result);
   }
   hasOrderProductLineNote(product) {
     return typeof (product == null ? void 0 : product.note) === "string" && product.note.trim().length > 0;
@@ -2895,10 +2910,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
    *
    * @example
-   * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+   * const pending = this.appendProductLineToTempOrder(
+   *   tempOrder,
+   *   { product_id: 1, num: 1 },
+   *   booking,
+   * );
+   * if (pending) await pending;
    */
-  async appendProductLineToTempOrder(tempOrder, product, booking, options) {
-    var _a, _b, _c, _d, _e, _f, _g;
+  appendProductLineToTempOrder(tempOrder, product, booking, options) {
+    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)(
@@ -2957,7 +2977,107 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       (0, import_utils.getProductSkuOptions)(matchedProduct),
       matchedProduct.product_bundle
     ) : "";
-    const shouldMerge = matchedProduct ? await this.shouldMergeProductToOrder({
+    const commitProductLine = (shouldMerge2) => {
+      var _a2;
+      if (matchedIndex === -1 || !matchedProduct || !shouldMerge2) {
+        this.captureProductRuntime(
+          tempOrder,
+          productToAdd,
+          normalizedIncoming
+        );
+        if (linked) {
+          normalizedIncoming.booking_uid = linked.bookingUid;
+          normalizedIncoming.metadata = {
+            ...normalizedIncoming.metadata || {},
+            booking_uid: linked.bookingUid
+          };
+        }
+        const insertAtIndex = options == null ? void 0 : options.insertAtIndex;
+        if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+          tempOrder.products = [
+            ...tempOrder.products.slice(0, insertAtIndex),
+            normalizedIncoming,
+            ...tempOrder.products.slice(insertAtIndex)
+          ];
+        } else {
+          tempOrder.products = [...tempOrder.products, normalizedIncoming];
+        }
+      } else {
+        const targetProduct = matchedProduct;
+        const targetUid = (_a2 = targetProduct.metadata) == null ? void 0 : _a2.unique_identification_number;
+        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
+        );
+        const nextNum = (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num);
+        const targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
+        const nextDiscountList = targetIsManualProductDiscount ? (0, import_utils.normalizeOrderProductDiscountList)(
+          (0, import_manualProductDiscount.syncManualProductDiscountProductNum)(
+            targetProduct.discount_list,
+            nextNum
+          )
+        ) : normalizedProduct.discount_list;
+        tempOrder.products[matchedIndex] = {
+          ...targetProduct,
+          ...normalizedProduct,
+          discount_list: nextDiscountList,
+          metadata: {
+            ...targetProduct.metadata || {},
+            ...normalizedProduct.metadata || {},
+            unique_identification_number: targetUid
+          },
+          product_sku: {
+            ...targetProduct.product_sku || { option: [] },
+            ...normalizedProduct.product_sku || { option: [] },
+            option: (0, import_utils.getProductSkuOptions)(normalizedProduct)
+          },
+          ...targetIsManualProductDiscount ? {
+            selling_price: targetProduct.selling_price,
+            original_price: targetProduct.original_price,
+            payment_price: targetProduct.payment_price,
+            metadata: {
+              ...normalizedProduct.metadata || {},
+              ...targetProduct.metadata || {},
+              unique_identification_number: targetUid
+            }
+          } : {},
+          note: targetProduct.note,
+          order_detail_id: targetProduct.order_detail_id,
+          num: nextNum
+        };
+        this.captureProductRuntime(
+          tempOrder,
+          productToAdd,
+          tempOrder.products[matchedIndex],
+          targetUid
+        );
+        if (matchedIndex !== tempOrder.products.length - 1) {
+          const mergedProduct = tempOrder.products[matchedIndex];
+          tempOrder.products = [
+            ...tempOrder.products.slice(0, matchedIndex),
+            ...tempOrder.products.slice(matchedIndex + 1),
+            mergedProduct
+          ];
+        }
+      }
+      if (linked) {
+        tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
+      }
+    };
+    if (!matchedProduct) {
+      commitProductLine(false);
+      return;
+    }
+    const shouldMerge = this.shouldMergeProductToOrder({
       incomingProduct: productToAdd,
       normalizedIncoming,
       matchedProduct,
@@ -2966,100 +3086,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       existedFingerprint,
       tempOrder,
       booking
-    }) : false;
-    if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-      this.captureProductRuntime(
-        tempOrder,
-        productToAdd,
-        normalizedIncoming
-      );
-      if (linked) {
-        normalizedIncoming.booking_uid = linked.bookingUid;
-        normalizedIncoming.metadata = {
-          ...normalizedIncoming.metadata || {},
-          booking_uid: linked.bookingUid
-        };
-      }
-      const insertAtIndex = options == null ? void 0 : options.insertAtIndex;
-      if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
-        tempOrder.products = [
-          ...tempOrder.products.slice(0, insertAtIndex),
-          normalizedIncoming,
-          ...tempOrder.products.slice(insertAtIndex)
-        ];
-      } else {
-        tempOrder.products = [...tempOrder.products, normalizedIncoming];
-      }
-    } else {
-      const targetProduct = matchedProduct;
-      const targetUid = (_g = targetProduct.metadata) == null ? void 0 : _g.unique_identification_number;
-      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
-      );
-      const nextNum = (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num);
-      const targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
-      const nextDiscountList = targetIsManualProductDiscount ? (0, import_utils.normalizeOrderProductDiscountList)(
-        (0, import_manualProductDiscount.syncManualProductDiscountProductNum)(
-          targetProduct.discount_list,
-          nextNum
-        )
-      ) : normalizedProduct.discount_list;
-      tempOrder.products[matchedIndex] = {
-        ...targetProduct,
-        ...normalizedProduct,
-        discount_list: nextDiscountList,
-        metadata: {
-          ...targetProduct.metadata || {},
-          ...normalizedProduct.metadata || {},
-          unique_identification_number: targetUid
-        },
-        product_sku: {
-          ...targetProduct.product_sku || { option: [] },
-          ...normalizedProduct.product_sku || { option: [] },
-          option: (0, import_utils.getProductSkuOptions)(normalizedProduct)
-        },
-        ...targetIsManualProductDiscount ? {
-          selling_price: targetProduct.selling_price,
-          original_price: targetProduct.original_price,
-          payment_price: targetProduct.payment_price,
-          metadata: {
-            ...normalizedProduct.metadata || {},
-            ...targetProduct.metadata || {},
-            unique_identification_number: targetUid
-          }
-        } : {},
-        note: targetProduct.note,
-        order_detail_id: targetProduct.order_detail_id,
-        num: nextNum
-      };
-      this.captureProductRuntime(
-        tempOrder,
-        productToAdd,
-        tempOrder.products[matchedIndex],
-        targetUid
-      );
-      if (matchedIndex !== tempOrder.products.length - 1) {
-        const mergedProduct = tempOrder.products[matchedIndex];
-        tempOrder.products = [
-          ...tempOrder.products.slice(0, matchedIndex),
-          ...tempOrder.products.slice(matchedIndex + 1),
-          mergedProduct
-        ];
-      }
-    }
-    if (linked) {
-      tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
+    });
+    if (shouldMerge && typeof shouldMerge === "object" && typeof shouldMerge.then === "function") {
+      return Promise.resolve(shouldMerge).then(commitProductLine);
     }
+    commitProductLine(shouldMerge);
   }
   /**
    * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
@@ -3087,12 +3118,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           const singleLine = (0, import_lodash_es.cloneDeep)(productRecord);
           singleLine.num = 1;
           delete singleLine.product_quantity;
-          await this.appendProductLineToTempOrder(
+          const appendResult2 = this.appendProductLineToTempOrder(
             tempOrder,
             singleLine,
             (0, import_lodash_es.cloneDeep)(booking),
             { insertAtIndex }
           );
+          if (appendResult2)
+            await appendResult2;
           if (insertAtIndex !== void 0)
             insertAtIndex += 1;
         }
@@ -3100,12 +3133,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return tempOrder.products;
       }
     }
-    await this.appendProductLineToTempOrder(
+    const appendResult = this.appendProductLineToTempOrder(
       tempOrder,
       product,
       booking,
       { insertAtIndex }
     );
+    if (appendResult)
+      await appendResult;
     await this.finalizeProductOrderMutation(tempOrder);
     this.logInfo("addProductToOrder success", {
       product_id: product.product_id,
@@ -3140,16 +3175,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             const singleLine = (0, import_lodash_es.cloneDeep)(productRecord);
             singleLine.num = 1;
             delete singleLine.product_quantity;
-            await this.appendProductLineToTempOrder(
+            const appendResult2 = this.appendProductLineToTempOrder(
               tempOrder,
               singleLine,
               (0, import_lodash_es.cloneDeep)(booking)
             );
+            if (appendResult2)
+              await appendResult2;
           }
           continue;
         }
       }
-      await this.appendProductLineToTempOrder(tempOrder, product, booking);
+      const appendResult = this.appendProductLineToTempOrder(
+        tempOrder,
+        product,
+        booking
+      );
+      if (appendResult)
+        await appendResult;
     }
     await this.finalizeProductOrderMutation(tempOrder, options);
     this.logInfo("addProductsToOrder success", {

package/lib/modules/Order/utils/discountProductLineIdentity.d.ts

@@ -0,0 +1,45 @@
+import type { OrderTempOrder } from '../types';
+/**
+ * 商品券拆行的身份与回并工具。
+ *
+ * 背景：
+ * Rules.calcDiscount 应用 good_pass 时，会把一个数量行拆成若干「用券行」和
+ * 「普通余量行」。Rules 返回的拆分行可能复制同一份
+ * metadata.unique_identification_number，进而造成：
+ * - 按 UID 删除时同时命中多行；
+ * - UI 把不同券行视为同一个商品；
+ * - 后续商品更新无法准确定位目标行。
+ *
+ * 处理原则：
+ * 1. 拆分后每一行必须拥有独立 UID；
+ * 2. 原始拆分来源仅记录在 tempOrder._extend.productsByUid 的运行态索引中，
+ *    不写入商品 metadata，不污染提交协议；
+ * 3. 券被移除后，只回并被本工具确认来自同一折扣拆分源的行；
+ * 4. 预约、赠品、促销、手动折扣、备注、称重、holder 和已落库行均为硬边界。
+ *
+ * 两个导出函数都会原地更新 tempOrder。调用顺序必须是：
+ * ensureUniqueProductLineUids -> consolidateDiscountFreeProductLines。
+ */
+/** productsByUid 运行态记录中用于关联同一次折扣拆分的字段。 */
+export declare const DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
+/**
+ * 修复 Rules 折扣拆行复制 UID 的问题，并为拆分行记录共同来源。
+ *
+ * 第一条商品保留原 UID，后续重复行生成新 UUID；对应的 productsByUid.runtime
+ * 会复制原行 runtime（包括 origin），以保证删除、编辑及展示字段回读仍可工作。
+ *
+ * 没有 UID 的裸商品不会被补写 UID。这是为了兼容 Rules/mock 的历史协议形状；
+ * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
+ */
+export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder): void;
+/**
+ * 把券移除后已经恢复原价的同源折扣拆分行重新合并。
+ *
+ * 此函数刻意不执行通用的「同 SKU 合并」：没有 discountSplitOriginUid 的普通行
+ * 可能是业务 hook、导入订单或其它流程主动拆开的，不能在折扣重算时擅自合并。
+ *
+ * payment_price、tax_fee、surcharge_fee 属于 summary 计算层的派生值。券行与普通行
+ * 在回并前可能暂时不同，因此它们不参与 mergeKey；原始价格、SKU/option/bundle
+ * 结构以及税务/商品类型配置仍参与比较，防止不同商品语义被误合并。
+ */
+export declare function consolidateDiscountFreeProductLines(tempOrder: OrderTempOrder): void;