@pisell/pisellos 0.10.6 → 0.10.8

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");
@@ -65,8 +66,7 @@ function isSameDiscountList(left, right) {
   );
 }
 function isManualProductDiscountProduct(product) {
-  var _a, _b;
-  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
+  return (0, import_manualProductDiscount.hasManualProductDiscountFlag)(product == null ? void 0 : product.metadata) || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
 }
 var ORDER_PAYMENT_STATUS_PAID = "paid";
 var ORDER_PAYMENT_STATUS_PENDING = "payment_pending";
@@ -136,7 +136,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) || []) {
@@ -151,16 +151,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) {
@@ -169,7 +171,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 || {},
@@ -192,9 +194,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: {
@@ -224,8 +226,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]
@@ -277,7 +279,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);
         }
@@ -694,6 +696,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(
@@ -916,6 +920,52 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       cacheKey: ["tempOrder"]
     });
   }
+  /**
+   * 终止当前模块实例的 sessionStorage 订单恢复会话。
+   *
+   * 支付跳转等终态场景需要同时删除当前 cacheId 的 tempOrder 快照，并关闭
+   * 本实例后续异步任务的再次写入；新模块实例初始化时会按 otherParams 重新启用。
+   */
+  clearSessionStoragePersistedTempOrder() {
+    var _a;
+    this.sessionStorageRestoreRecord = null;
+    if (!this.sessionStoragePersistEnabled)
+      return;
+    this.sessionStoragePersistEnabled = false;
+    if (!this.cacheId || !this.fatherModule || !((_a = this.window) == null ? void 0 : _a.sessionStorage)) {
+      return;
+    }
+    const sessionStorage = this.window.sessionStorage;
+    const rawCacheData = sessionStorage.getItem(this.fatherModule);
+    if (!rawCacheData)
+      return;
+    let parsedCacheData;
+    try {
+      parsedCacheData = JSON.parse(rawCacheData);
+    } catch {
+      return;
+    }
+    if (!parsedCacheData || typeof parsedCacheData !== "object" || Array.isArray(parsedCacheData)) {
+      return;
+    }
+    const cacheRoot = parsedCacheData;
+    const cacheBucket = cacheRoot[this.cacheId];
+    if (!cacheBucket || typeof cacheBucket !== "object" || Array.isArray(cacheBucket)) {
+      return;
+    }
+    const moduleBucket = cacheBucket[this.name];
+    if (!moduleBucket || typeof moduleBucket !== "object" || Array.isArray(moduleBucket)) {
+      return;
+    }
+    delete moduleBucket.tempOrder;
+    if (Object.keys(moduleBucket).length === 0) {
+      delete cacheBucket[this.name];
+    }
+    if (Object.keys(cacheBucket).length === 0) {
+      delete cacheRoot[this.cacheId];
+    }
+    sessionStorage.setItem(this.fatherModule, JSON.stringify(cacheRoot));
+  }
   consumeSessionStorageRestore() {
     const record = this.sessionStorageRestoreRecord;
     this.sessionStorageRestoreRecord = null;
@@ -1921,6 +1971,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") {
@@ -1931,6 +1982,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return tempOrder._extend;
   }
+  repairDuplicateProductLineIdentities(tempOrder) {
+    var _a;
+    const result = (0, import_orderCollectionIdentity.repairDuplicateProductLineIdentities)(
+      tempOrder.products,
+      (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid
+    );
+    if (!result.repairs.length)
+      return;
+    tempOrder.products = result.products;
+    if (result.productsByUid) {
+      this.ensureExtend(tempOrder).productsByUid = result.productsByUid;
+    }
+    this.logWarning("Repaired duplicate product line identities", {
+      repairCount: result.repairs.length,
+      repairs: result.repairs
+    });
+  }
   captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
     var _a;
     const uid = existedUid || this.getProductUid(normalizedProduct);
@@ -2576,6 +2644,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);
@@ -2940,8 +3009,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
    */
-  async appendProductLineToTempOrder(tempOrder, product, booking) {
-    var _a, _b;
+  async appendProductLineToTempOrder(tempOrder, product, booking, options) {
+    var _a, _b, _c, _d, _e, _f, _g;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2952,7 +3021,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       productToAdd,
       (0, import_utils3.normalizeOrderProduct)(productToAdd)
     );
-    const incomingBookingUid = productToAdd.booking_uid ?? ((_a = productToAdd.metadata) == null ? void 0 : _a.booking_uid);
+    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)) {
+      throw new Error("[Order] 称重商品净重必须大于 0");
+    }
+    const incomingBookingUid = productToAdd.booking_uid ?? ((_c = productToAdd.metadata) == null ? void 0 : _c.booking_uid);
     if (incomingBookingUid !== void 0 && incomingBookingUid !== null && String(incomingBookingUid) !== "") {
       normalizedIncoming.booking_uid = String(incomingBookingUid);
       normalizedIncoming.metadata = {
@@ -2967,14 +3041,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalizedIncoming
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
+    const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
+    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 matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
         return false;
       if (this.hasOrderProductLineNote(item))
         return false;
+      if (isManualProductDiscountProduct(item))
+        return false;
       if (item.order_detail_id !== void 0 && item.order_detail_id !== null)
         return false;
       if ((_a2 = item.metadata) == null ? void 0 : _a2.is_edit_for_runtime)
@@ -3017,10 +3095,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           booking_uid: linked.bookingUid
         };
       }
-      tempOrder.products = [...tempOrder.products, normalizedIncoming];
+      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 = (_b = targetProduct.metadata) == null ? void 0 : _b.unique_identification_number;
+      const targetUid = (_g = targetProduct.metadata) == null ? void 0 : _g.unique_identification_number;
       const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
         targetProduct,
         (0, import_utils3.normalizeOrderProduct)({
@@ -3035,17 +3122,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         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,
+        discount_list: normalizedProduct.discount_list,
         metadata: {
           ...targetProduct.metadata || {},
           ...normalizedProduct.metadata || {},
@@ -3056,16 +3136,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           ...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
@@ -3076,6 +3146,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         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];
@@ -3088,8 +3166,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
    * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
    */
-  async addProductToOrder(product, booking) {
+  async addProductToOrder(product, booking, options) {
     const tempOrder = this.ensureTempOrder();
+    const insertAfterProductUid = options == null ? void 0 : options.insertAfterProductUid;
+    const anchorIndex = booking && insertAfterProductUid ? tempOrder.products.findIndex((line) => {
+      var _a;
+      const uid = ((_a = line.metadata) == null ? void 0 : _a.unique_identification_number) || line.unique_identification_number;
+      return uid !== void 0 && uid !== null && String(uid) === String(insertAfterProductUid);
+    }) : -1;
+    let insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : void 0;
     if (booking) {
       const productRecord = product;
       const splitCount = (0, import_utils3.getSafeProductNum)(
@@ -3103,14 +3188,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           await this.appendProductLineToTempOrder(
             tempOrder,
             singleLine,
-            (0, import_lodash_es.cloneDeep)(booking)
+            (0, import_lodash_es.cloneDeep)(booking),
+            { insertAtIndex }
           );
+          if (insertAtIndex !== void 0)
+            insertAtIndex += 1;
         }
         await this.finalizeProductOrderMutation(tempOrder);
         return tempOrder.products;
       }
     }
-    await this.appendProductLineToTempOrder(tempOrder, product, booking);
+    await this.appendProductLineToTempOrder(
+      tempOrder,
+      product,
+      booking,
+      { insertAtIndex }
+    );
     await this.finalizeProductOrderMutation(tempOrder);
     this.logInfo("addProductToOrder success", {
       product_id: product.product_id,
@@ -3484,6 +3577,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product_bundle
     } = params;
     const tempOrder = this.ensureTempOrder();
+    this.repairDuplicateProductLineIdentities(tempOrder);
     const identityLookup = {
       product_id,
       product_variant_id
@@ -3591,14 +3685,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
-  async removeProductsFromOrder(identities) {
+  async removeProductsFromOrder(identities, options) {
     var _a, _b, _c, _d;
     const tempOrder = this.ensureTempOrder();
+    this.repairDuplicateProductLineIdentities(tempOrder);
     if (!identities.length) {
       return tempOrder.products;
     }
     const productsBeforeRemove = tempOrder.products || [];
     const bookingsBeforeRemove = tempOrder.bookings || [];
+    const preserveDisplayPosition = options == null ? void 0 : options.preserveDisplayPosition;
+    const anchorIndex = preserveDisplayPosition ? productsBeforeRemove.findIndex((item) => {
+      var _a2;
+      const uid = ((_a2 = item.metadata) == null ? void 0 : _a2.unique_identification_number) || item.unique_identification_number;
+      return uid !== void 0 && uid !== null && String(uid) === String(preserveDisplayPosition.anchorProductUid);
+    }) : -1;
+    const productsAfterAnchor = anchorIndex >= 0 ? productsBeforeRemove.slice(anchorIndex + 1) : [];
     const matchedProducts = productsBeforeRemove.filter((item) => {
       return identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
     });
@@ -3639,14 +3741,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return !(isAddTimeProduct && lineBookingUid !== void 0 && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
       });
     }
+    if (preserveDisplayPosition && anchorIndex >= 0) {
+      const remainingProductIndex = tempOrder.products.findIndex((item) => {
+        var _a2;
+        const uid = ((_a2 = item.metadata) == null ? void 0 : _a2.unique_identification_number) || item.unique_identification_number;
+        return uid !== void 0 && uid !== null && String(uid) === String(preserveDisplayPosition.remainingProductUid);
+      });
+      if (remainingProductIndex >= 0) {
+        const remainingProduct = tempOrder.products[remainingProductIndex];
+        const nextProduct = productsAfterAnchor.find(
+          (item) => tempOrder.products.includes(item)
+        );
+        const productsWithoutRemaining = [
+          ...tempOrder.products.slice(0, remainingProductIndex),
+          ...tempOrder.products.slice(remainingProductIndex + 1)
+        ];
+        const nextProductIndex = nextProduct ? productsWithoutRemaining.indexOf(nextProduct) : -1;
+        tempOrder.products = nextProductIndex >= 0 ? [
+          ...productsWithoutRemaining.slice(0, nextProductIndex),
+          remainingProduct,
+          ...productsWithoutRemaining.slice(nextProductIndex)
+        ] : [...productsWithoutRemaining, remainingProduct];
+      }
+    }
     await this.finalizeAfterProductsMutation(tempOrder);
     this.logInfo("removeProductsFromOrder success", {
       identities
     });
     return tempOrder.products;
   }
-  async removeProductFromOrder(identity) {
-    return this.removeProductsFromOrder([identity]);
+  async removeProductFromOrder(identity, options) {
+    return this.removeProductsFromOrder([identity], options);
   }
   /**
    * 仅清空购物车行（products / bookings），不重置整单。
@@ -4300,24 +4425,39 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 例如数组字段、商品行唯一值、价格 metadata、summary 派生状态和 _extend。
    */
   async hydrateTempOrderFromRecord(record, options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const sourceRaw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
+    const duplicateProductIdentityRepair = (0, import_orderCollectionIdentity.repairDuplicateProductLineIdentities)(
+      Array.isArray(sourceRaw.products) ? sourceRaw.products : [],
+      (_a = sourceRaw._extend) == null ? void 0 : _a.productsByUid
+    );
+    const duplicateIdentityReadySource = duplicateProductIdentityRepair.repairs.length ? {
+      ...sourceRaw,
+      products: duplicateProductIdentityRepair.products,
+      ...duplicateProductIdentityRepair.productsByUid ? {
+        _extend: {
+          ...sourceRaw._extend || {},
+          productsByUid: duplicateProductIdentityRepair.productsByUid
+        }
+      } : {}
+    } : sourceRaw;
     const identityReadySource = this.seedAnonymousBookingUidsFromProducts(
-      sourceRaw
+      duplicateIdentityReadySource
     );
     const normalizedCollections = (0, import_orderCollectionIdentity.normalizeOrderCollections)(identityReadySource);
     const raw = normalizedCollections.order;
-    const hasIdentityChanges = Object.values(normalizedCollections.stats).some(
+    const hasIdentityChanges = duplicateProductIdentityRepair.repairs.length > 0 || Object.values(normalizedCollections.stats).some(
       (stats) => stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0
     );
     if (hasIdentityChanges) {
       const identityLogMetadata = {
         collections: normalizedCollections.stats,
-        uidRemapCount: normalizedCollections.uidRemaps.length
+        uidRemapCount: normalizedCollections.uidRemaps.length,
+        duplicateProductUidRepairCount: duplicateProductIdentityRepair.repairs.length
       };
       const hasIdentityWarnings = Object.values(normalizedCollections.stats).some(
         (stats) => stats.uidConflictCount > 0 || stats.anonymousRowCount > 0
-      );
+      ) || duplicateProductIdentityRepair.repairs.length > 0;
       if (hasIdentityWarnings) {
         this.logWarning(
           "Normalized hydrated order collection identities",
@@ -4348,10 +4488,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       nextTempOrder.discount_list = restoredSessionDiscounts;
       this.store.summary = (0, import_utils.createEmptySummary)();
       this.store.lastOrderInfo = void 0;
-      await ((_a = this.store.discount) == null ? void 0 : _a.setOriginalDiscountList(
+      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(
         (0, import_lodash_es.cloneDeep)(restoredSessionDiscounts)
       ));
-      await ((_b = this.store.discount) == null ? void 0 : _b.setDiscountList(
+      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(
         (0, import_lodash_es.cloneDeep)(restoredSessionDiscounts)
       ));
       if (options == null ? void 0 : options.recalcOnHydrate) {
@@ -4394,7 +4534,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.syncState = "local";
     }
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-    const currentDiscounts = typeof ((_c = this.store.discount) == null ? void 0 : _c.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
+    const currentDiscounts = typeof ((_d = this.store.discount) == null ? void 0 : _d.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
     const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
     const hydratedDiscountIds = new Set(
       hydratedEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
@@ -4412,8 +4552,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         nextTempOrder.products,
         nextDiscounts
       );
-      await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(nextDiscounts));
-      await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(nextDiscounts));
+      await ((_e = this.store.discount) == null ? void 0 : _e.setOriginalDiscountList(nextDiscounts));
+      await ((_f = this.store.discount) == null ? void 0 : _f.setDiscountList(nextDiscounts));
     }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });

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

@@ -321,6 +321,24 @@ export interface ReplaceTempOrderOptions {
     saveDraft?: boolean;
 }
 export type AddProductBookingInput = Record<string, any>;
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+export interface AddProductToOrderOptions {
+    insertAfterProductUid?: string;
+}
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+export interface RemoveProductsFromOrderOptions {
+    preserveDisplayPosition?: {
+        remainingProductUid: string;
+        anchorProductUid: string;
+    };
+}
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -726,17 +744,22 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
-    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
+    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
-    removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
-    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
+    removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 在显式开启时保存当前 tempOrder 的 sessionStorage 会话快照。 */
     persistTempOrder: () => void;
+    /**
+     * 删除当前 cacheId 的 tempOrder 会话快照，并阻止当前模块实例再次写入。
+     * 新模块实例初始化时会按 otherParams 重新启用持久化。
+     */
+    clearSessionStoragePersistedTempOrder: () => void;
     /** 取出一次待恢复的 sessionStorage tempOrder 快照。 */
     consumeSessionStorageRestore: () => Record<string, any> | null;
     /**

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;