@pisell/pisellos 0.10.6 → 0.10.8

package/lib/modules/Order/utils/discountProductLineIdentity.js

@@ -0,0 +1,170 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Order/utils/discountProductLineIdentity.ts
+var discountProductLineIdentity_exports = {};
+__export(discountProductLineIdentity_exports, {
+  DISCOUNT_SPLIT_ORIGIN_UID_KEY: () => DISCOUNT_SPLIT_ORIGIN_UID_KEY,
+  consolidateDiscountFreeProductLines: () => consolidateDiscountFreeProductLines,
+  ensureUniqueProductLineUids: () => ensureUniqueProductLineUids
+});
+module.exports = __toCommonJS(discountProductLineIdentity_exports);
+var import_lodash_es = require("lodash-es");
+var import_utils = require("../../../solution/ScanOrder/utils");
+var import_orderCollectionIdentity = require("./orderCollectionIdentity");
+var DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
+function getProductLineUid(product) {
+  var _a;
+  if (!product || typeof product !== "object")
+    return null;
+  const uid = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ?? product.unique_identification_number;
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
+}
+function getProductSkuOptions(product) {
+  var _a;
+  return Array.isArray((_a = product.product_sku) == null ? void 0 : _a.option) ? product.product_sku.option : [];
+}
+function hasProductLineNote(product) {
+  return typeof product.note === "string" && product.note.trim().length > 0;
+}
+function isManualProductDiscountLine(product) {
+  var _a, _b;
+  return ((_a = product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || (product.discount_list || []).some((item) => (item == null ? void 0 : item.type) === "product");
+}
+function ensureProductsByUid(tempOrder) {
+  if (!tempOrder._extend || typeof tempOrder._extend !== "object") {
+    tempOrder._extend = { productsByUid: {} };
+  }
+  if (!tempOrder._extend.productsByUid) {
+    tempOrder._extend.productsByUid = {};
+  }
+  return tempOrder._extend.productsByUid;
+}
+function ensureUniqueProductLineUids(tempOrder) {
+  const usedUids = /* @__PURE__ */ new Set();
+  const productsByUid = ensureProductsByUid(tempOrder);
+  tempOrder.products = (tempOrder.products || []).map((product) => {
+    const sourceUid = getProductLineUid(product);
+    if (!sourceUid)
+      return product;
+    if (!usedUids.has(sourceUid)) {
+      usedUids.add(sourceUid);
+      return product;
+    }
+    let splitUid = (0, import_orderCollectionIdentity.createUuidV4)();
+    while (usedUids.has(splitUid)) {
+      splitUid = (0, import_orderCollectionIdentity.createUuidV4)();
+    }
+    product.metadata = {
+      ...product.metadata || {},
+      unique_identification_number: splitUid
+    };
+    const sourceRuntime = productsByUid[sourceUid] || {};
+    const discountSplitOriginUid = String(
+      sourceRuntime[DISCOUNT_SPLIT_ORIGIN_UID_KEY] || sourceUid
+    );
+    productsByUid[sourceUid] = {
+      ...sourceRuntime,
+      [DISCOUNT_SPLIT_ORIGIN_UID_KEY]: discountSplitOriginUid
+    };
+    productsByUid[splitUid] = {
+      ...(0, import_lodash_es.cloneDeep)(sourceRuntime),
+      [DISCOUNT_SPLIT_ORIGIN_UID_KEY]: discountSplitOriginUid
+    };
+    usedUids.add(splitUid);
+    return product;
+  });
+}
+function consolidateDiscountFreeProductLines(tempOrder) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  const consolidatedProducts = [];
+  const productIndexByKey = /* @__PURE__ */ new Map();
+  for (const product of tempOrder.products || []) {
+    const productBundle = Array.isArray(product.product_bundle) ? product.product_bundle : [];
+    const hasDiscount = (product.discount_list || []).length > 0 || productBundle.some((bundle) => ((bundle == null ? void 0 : bundle.discount_list) || []).length > 0);
+    const bookingUid = product.booking_uid ?? ((_a = product.metadata) == null ? void 0 : _a.booking_uid);
+    const bookingId = product.booking_id ?? ((_b = product.metadata) == null ? void 0 : _b.booking_id);
+    const orderDetailId = product.order_detail_id ?? product.orderDetailId;
+    const holderId = product.holder_id ?? ((_c = product.metadata) == null ? void 0 : _c.holder_id);
+    const hasMergeBoundary = hasDiscount || Boolean(((_d = product.metadata) == null ? void 0 : _d._giftInfo) || product._giftInfo) || Boolean((_e = product.metadata) == null ? void 0 : _e._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(((_f = product.product_sku) == null ? void 0 : _f.open_sold_weight) || 0) === 1 || ((_g = product.metadata) == null ? void 0 : _g.is_edit_for_runtime) === true || bookingId !== void 0 && bookingId !== null && bookingId !== 0 && bookingId !== "0" || bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "" || holderId !== void 0 && holderId !== null && String(holderId) !== "" || orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "";
+    if (hasMergeBoundary) {
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const productUid = getProductLineUid(product);
+    const discountSplitOriginUid = productUid ? (_j = (_i = (_h = tempOrder._extend) == null ? void 0 : _h.productsByUid) == null ? void 0 : _i[productUid]) == null ? void 0 : _j[DISCOUNT_SPLIT_ORIGIN_UID_KEY] : void 0;
+    if (!discountSplitOriginUid) {
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const fingerprint = (0, import_utils.buildProductLineFingerprint)(
+      getProductSkuOptions(product),
+      productBundle
+    );
+    const priceSignature = JSON.stringify({
+      selling_price: String(product.selling_price ?? ""),
+      original_price: String(product.original_price ?? ""),
+      custom_price: String(product.custom_price ?? ""),
+      is_charge_tax: Number(product.is_charge_tax ?? 0),
+      gift_card: Number(product.gift_card ?? 0),
+      bundle_edit: Number(product.bundle_edit ?? 0),
+      price_schema_version: ((_k = product.metadata) == null ? void 0 : _k.price_schema_version) ?? "",
+      source_product_price: String(((_l = product.metadata) == null ? void 0 : _l.source_product_price) ?? ""),
+      main_product_selling_price: String(
+        ((_m = product.metadata) == null ? void 0 : _m.main_product_selling_price) ?? ""
+      ),
+      main_product_original_price: String(
+        ((_n = product.metadata) == null ? void 0 : _n.main_product_original_price) ?? ""
+      ),
+      bundle: productBundle.map((bundle) => ({
+        bundle_id: (bundle == null ? void 0 : bundle.bundle_id) ?? (bundle == null ? void 0 : bundle.id) ?? "",
+        product_id: (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id) ?? "",
+        product_variant_id: (bundle == null ? void 0 : bundle.bundle_variant_id) ?? (bundle == null ? void 0 : bundle.variant_id) ?? (bundle == null ? void 0 : bundle.product_variant_id) ?? 0,
+        price: String((bundle == null ? void 0 : bundle.price) ?? ""),
+        original_price: String((bundle == null ? void 0 : bundle.original_price) ?? ""),
+        bundle_selling_price: String((bundle == null ? void 0 : bundle.bundle_selling_price) ?? "")
+      }))
+    });
+    const mergeKey = [
+      discountSplitOriginUid,
+      product.product_id,
+      product.product_variant_id ?? 0,
+      fingerprint,
+      priceSignature
+    ].join("#");
+    const matchedIndex = productIndexByKey.get(mergeKey);
+    if (matchedIndex === void 0) {
+      productIndexByKey.set(mergeKey, consolidatedProducts.length);
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const matchedProduct = consolidatedProducts[matchedIndex];
+    matchedProduct.num = (0, import_utils.getSafeProductNum)(
+      Number(matchedProduct.num || 0) + Number(product.num || 0)
+    );
+  }
+  tempOrder.products = consolidatedProducts;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DISCOUNT_SPLIT_ORIGIN_UID_KEY,
+  consolidateDiscountFreeProductLines,
+  ensureUniqueProductLineUids
+});

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

@@ -24,6 +24,16 @@ export interface NormalizeOrderCollectionsResult<T> {
     stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
     uidRemaps: OrderCollectionUidRemap[];
 }
+export interface ProductLineIdentityRepair {
+    index: number;
+    from: string;
+    to: string;
+}
+export interface RepairDuplicateProductLineIdentitiesResult<T> {
+    products: T[];
+    productsByUid?: Record<string, Record<string, any>>;
+    repairs: ProductLineIdentityRepair[];
+}
 export declare function createUuidV4(): string;
 export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
 export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
@@ -31,6 +41,11 @@ export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: u
 export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
 export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
 export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export declare function repairDuplicateProductLineIdentities<T extends Record<string, any>>(products: T[] | null | undefined, productsByUid?: Record<string, Record<string, any>> | null): RepairDuplicateProductLineIdentitiesResult<T>;
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
  */

package/lib/modules/Order/utils/orderCollectionIdentity.js

@@ -30,6 +30,7 @@ __export(orderCollectionIdentity_exports, {
   mergeOrderCollectionItems: () => mergeOrderCollectionItems,
   normalizeOrderCollection: () => normalizeOrderCollection,
   normalizeOrderCollections: () => normalizeOrderCollections,
+  repairDuplicateProductLineIdentities: () => repairDuplicateProductLineIdentities,
   setOrderCollectionUid: () => setOrderCollectionUid
 });
 module.exports = __toCommonJS(orderCollectionIdentity_exports);
@@ -105,6 +106,74 @@ function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
+function getGoodPassResourceId(product) {
+  var _a;
+  const goodPass = (product.discount_list || []).find((item) => {
+    var _a2, _b;
+    const type = (item == null ? void 0 : item.type) || (item == null ? void 0 : item.tag) || ((_a2 = item == null ? void 0 : item.discount) == null ? void 0 : _a2.type) || ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.tag);
+    return type === "good_pass";
+  });
+  if (!goodPass)
+    return null;
+  const resourceId = ((_a = goodPass.discount) == null ? void 0 : _a.resource_id) ?? goodPass.resource_id ?? goodPass.discount_id ?? goodPass.id;
+  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+}
+function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
+  const encodedOriginalUid = encodeURIComponent(originalUid);
+  const resourceId = getGoodPassResourceId(product);
+  if (resourceId) {
+    return `os-split:product:${encodedOriginalUid}:good-pass:${encodeURIComponent(resourceId)}:${duplicateOrdinal}`;
+  }
+  return `os-split:product:${encodedOriginalUid}:duplicate:${duplicateOrdinal}`;
+}
+function repairDuplicateProductLineIdentities(products, productsByUid) {
+  const repairedProducts = (0, import_lodash_es.cloneDeep)(products || []);
+  const repairedProductsByUid = productsByUid ? (0, import_lodash_es.cloneDeep)(productsByUid) : void 0;
+  const occupiedUids = new Set(
+    repairedProducts.map((product) => getOrderCollectionUid("product", product)).filter((uid) => Boolean(uid))
+  );
+  Object.keys(repairedProductsByUid || {}).forEach((uid) => occupiedUids.add(uid));
+  const occurrences = /* @__PURE__ */ new Map();
+  const repairs = [];
+  repairedProducts.forEach((product, index) => {
+    const originalUid = getOrderCollectionUid("product", product);
+    if (!originalUid)
+      return;
+    const occurrence = (occurrences.get(originalUid) || 0) + 1;
+    occurrences.set(originalUid, occurrence);
+    if (occurrence === 1)
+      return;
+    const duplicateOrdinal = occurrence - 1;
+    const baseCandidate = buildSplitProductUid(
+      originalUid,
+      product,
+      duplicateOrdinal
+    );
+    let nextUid = baseCandidate;
+    let conflictOrdinal = 1;
+    while (occupiedUids.has(nextUid)) {
+      nextUid = `${baseCandidate}:conflict:${conflictOrdinal}`;
+      conflictOrdinal += 1;
+    }
+    const repairedProduct = setOrderCollectionUid("product", product, nextUid);
+    repairedProduct.identity_key = nextUid;
+    repairedProducts[index] = repairedProduct;
+    occupiedUids.add(nextUid);
+    repairs.push({ index, from: originalUid, to: nextUid });
+    const runtimeSource = repairedProductsByUid == null ? void 0 : repairedProductsByUid[originalUid];
+    if (runtimeSource && repairedProductsByUid) {
+      repairedProductsByUid[nextUid] = {
+        ...(0, import_lodash_es.cloneDeep)(runtimeSource),
+        ...runtimeSource.rowKey !== void 0 ? { rowKey: nextUid } : {}
+      };
+    }
+  });
+  return {
+    products: repairedProducts,
+    ...repairedProductsByUid ? { productsByUid: repairedProductsByUid } : {},
+    repairs
+  };
+}
 function isSameOrderCollectionItem(kind, left, right) {
   const leftPersistentId = getOrderCollectionPersistentId(kind, left);
   const rightPersistentId = getOrderCollectionPersistentId(kind, right);
@@ -414,5 +483,6 @@ function normalizeOrderCollections(sourceOrder, options) {
   mergeOrderCollectionItems,
   normalizeOrderCollection,
   normalizeOrderCollections,
+  repairDuplicateProductLineIdentities,
   setOrderCollectionUid
 });

package/lib/modules/Rules/index.js

@@ -243,7 +243,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const discountType = selectedDiscount.tag || selectedDiscount.type;
       return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
     };
-    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
+    const resolveReapplyBookingDiscountPercent = (originProduct, selectedDiscount) => {
       var _a2;
       if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
         return void 0;
@@ -318,6 +318,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundleIndex,
               // 虚拟商品属性
               price: Number(bundleItem.price || 0),
+              // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+              // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+              // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
               id: bundleItem.bundle_product_id ?? bundleItem._bundle_product_id ?? bundleItem.product_id,
               _id: `${product._id}_bundle_${bundleIndex}`,
               parentId: product._id,
@@ -779,13 +782,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isPersistedProduct && hasExistingWalletDiscount) {
         if (flatItem.type === "main") {
           processedProductsMap.set(product._id, [originProduct]);
-        } else {
-          processedFlatItemsMap.set(flatItem._id, [
-            {
-              ...flatItem,
-              processed: true
-            }
-          ]);
         }
         return;
       }
@@ -862,15 +858,46 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const explicitlySelectedDiscountCard = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
+      const explicitlySelectedDiscount = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
         const discountType = discount.tag || discount.type;
-        return String(discount.id) === String(options.discountId) && ["discount_card", "product_discount_card"].includes(discountType);
+        return String(discount.id) === String(options.discountId) && ["good_pass", "discount_card", "product_discount_card"].includes(
+          discountType
+        );
       }) : void 0;
+      const explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== "good_pass" ? explicitlySelectedDiscount : void 0;
+      const appliedDiscountCardIds = new Set(
+        (product.discount_list || []).filter(
+          (item) => ["discount_card", "product_discount_card"].includes(
+            (item == null ? void 0 : item.tag) || (item == null ? void 0 : item.type)
+          )
+        ).map(
+          (item) => {
+            var _a3;
+            return ((_a3 = item == null ? void 0 : item.discount) == null ? void 0 : _a3.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.id);
+          }
+        ).filter((id) => id !== void 0 && id !== null).map(String)
+      );
+      const appliedDiscountCard = (options == null ? void 0 : options.scan) ? void 0 : applicableDiscounts.find((discount) => {
+        const discountType = discount.tag || discount.type;
+        return discount.isSelected === true && ["discount_card", "product_discount_card"].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+      });
       const scannedSelectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
-      const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
-      const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
+      const selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
+      const selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
+      const prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === "good_pass" ? [
+        explicitlySelectedDiscount,
+        ...applicableDiscounts.filter(
+          (discount) => {
+            const discountType = discount.tag || discount.type;
+            return discountType === "good_pass" && String(discount.id) !== String(explicitlySelectedDiscount.id);
+          }
+        ),
+        ...applicableDiscounts.filter(
+          (discount) => (discount.tag || discount.type) !== "good_pass"
+        )
+      ] : applicableDiscounts;
       let isManualDiscount = false;
       let isItemRewardProductDiscount = false;
       if (flatItem.type === "main") {
@@ -1049,21 +1076,65 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const arr = [];
       if (flatItem.type === "main") {
         if (splitCount < totalQuantity && isNeedSplit) {
+          const remainingQuantity = totalQuantity - splitCount;
+          const applicableNonGoodPassById = new Map(
+            applicableDiscounts.filter((discount) => (discount.tag || discount.type) !== "good_pass").map((discount) => [String(discount.id), discount])
+          );
+          const remainderDiscountList = (product.discount_list || []).filter((discount) => {
+            var _a3;
+            const discountType = discount.tag || discount.type;
+            if (discountType === "promotion")
+              return true;
+            if (discountType === "good_pass")
+              return false;
+            const resourceId = ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) ?? discount.id;
+            return resourceId !== void 0 && resourceId !== null && applicableNonGoodPassById.has(String(resourceId));
+          }).map((discount) => {
+            var _a3;
+            if ((discount.tag || discount.type) === "promotion")
+              return discount;
+            const resourceId = ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) ?? discount.id;
+            const matchedDiscount = applicableNonGoodPassById.get(String(resourceId));
+            if (matchedDiscount) {
+              usedDiscounts.set(matchedDiscount.id, true);
+              const appliedProducts = appliedDiscountProducts.get(matchedDiscount.id) || [];
+              appliedProducts.push({
+                ...discount,
+                _num: remainingQuantity
+              });
+              appliedDiscountProducts.set(matchedDiscount.id, appliedProducts);
+            }
+            return {
+              ...discount,
+              // _num 是 Rules 运行态的行数量；Order 写回 tempOrder 时会裁剪该字段。
+              _num: remainingQuantity
+            };
+          });
+          const hasRetainedWalletDiscount = remainderDiscountList.some(
+            (discount) => !["promotion", "good_pass"].includes(discount.tag || discount.type)
+          );
           let total = product.origin_total ?? product.total;
           if ((product.discount_list || []).some((item) => item.type === "promotion")) {
             total = product.total ?? product.origin_total;
           }
           arr.push(
             this.hooks.setProduct(originProduct, {
-              discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
-              quantity: totalQuantity - splitCount,
+              // 商品券只替换被拆出的 splitCount 件。余量行原本仍有效的折扣卡
+              // 不能随 good_pass 拆分一起清除；已取消或已失效的折扣不会进入此列表。
+              discount_list: remainderDiscountList,
+              quantity: remainingQuantity,
               _id: product._id.split("___")[0],
-              total
+              total,
+              // 保留余量行当前的折后主价；Order.applyProductDiscountPrices 随后会基于
+              // source_product_price + discount_list 再归一化，避免出现重复折扣。
+              ...hasRetainedWalletDiscount ? {
+                main_product_selling_price: product.main_product_selling_price ?? product.price
+              } : {}
             })
           );
         }
         for (let i = 0; i < splitCount; i++) {
-          const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
+          const selectedDiscount2 = isNeedSplit ? prioritizedApplicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[i];
           usedDiscounts.set(selectedDiscount2.id, true);
           if ((selectedDiscount2.tag || selectedDiscount2.type) === "good_pass") {
             const currentCount = usedProductIdCounts.get(selectedDiscount2.product_id) || 0;
@@ -1091,8 +1162,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
-          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
-            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2);
             reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
             mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
             amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
@@ -1190,7 +1261,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const discountNum = splitCount;
           const normalNum = totalQuantity - discountNum;
           for (let i = 0; i < discountNum; i++) {
-            const selectedDiscount2 = applicableDiscounts[i];
+            const selectedDiscount2 = prioritizedApplicableDiscounts[i];
             usedDiscounts.set(selectedDiscount2.id, true);
             if ((selectedDiscount2.tag || selectedDiscount2.type) === "good_pass") {
               const currentCount = usedProductIdCounts.get(selectedDiscount2.product_id) || 0;
@@ -1267,10 +1338,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let targetProductTotal;
           let fixedAmountPerItem;
           let productDiscountDifference;
+          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             fixedAmountPerItem = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             targetProductTotal = Math.max(new import_decimal.default(productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(
+              originProduct,
+              selectedDiscount2
+            );
+            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
+            targetProductTotal = new import_decimal.default(productOriginTotal).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+            fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           } else {
             targetProductTotal = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1292,7 +1372,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
               product_id: product.id || product.product_id,
-              percent: selectedDiscount2.par_value,
+              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             metadata: {

package/lib/modules/SalesSummary/utils.js

@@ -99,7 +99,11 @@ function getUnitOriginalTotal(product) {
 function isGeneratedVoucherProduct(product) {
   const record = product;
   const metadata = (record == null ? void 0 : record.metadata) || {};
-  return (record == null ? void 0 : record.extension_type) === "product_voucher" || metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  const isGeneratedChild = metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  if (isGeneratedChild)
+    return true;
+  const isPersisted = (record == null ? void 0 : record.order_detail_id) !== void 0 && (record == null ? void 0 : record.order_detail_id) !== null;
+  return (record == null ? void 0 : record.extension_type) === "product_voucher" && !isPersisted;
 }
 function buildSurchargeServiceItems(products) {
   return products.map((product) => {

package/lib/server/index.d.ts

@@ -164,6 +164,12 @@ declare class Server {
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
     refreshOrdersInBackground(): Promise<void>;
+    /**
+     * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
+     * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
+     * UI 可复用 order:onRemoteProductMembershipChanged 处理冲突。
+     */
+    checkRemoteOrderProductMembership(orderId: string | number): Promise<void>;
     /**
      * 清空所有server模块的IndexedDB缓存
      * @returns Promise<void>

package/lib/server/index.js

@@ -1789,6 +1789,57 @@ var Server = class {
       });
     }
   }
+  /**
+   * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
+   * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
+   * UI 可复用 order:onRemoteProductMembershipChanged 处理冲突。
+   */
+  async checkRemoteOrderProductMembership(orderId) {
+    const normalizedOrderId = String(orderId ?? "").trim();
+    if (!normalizedOrderId || normalizedOrderId.startsWith("local_order")) {
+      this.logInfo("checkRemoteOrderProductMembership: 跳过非正式订单", {
+        orderId
+      });
+      return;
+    }
+    if (!this.order) {
+      const error = new Error("Order 模块未注册");
+      this.logWarning("checkRemoteOrderProductMembership: Order 模块未注册", {
+        orderId: normalizedOrderId
+      });
+      throw error;
+    }
+    this.logInfo("checkRemoteOrderProductMembership 开始", {
+      orderId: normalizedOrderId
+    });
+    const startTime = Date.now();
+    try {
+      const freshOrders = await this.order.fetchOrdersByHttp([
+        normalizedOrderId
+      ]);
+      const freshOrder = freshOrders.find(
+        (order) => String(order == null ? void 0 : order.order_id) === normalizedOrderId
+      );
+      if (!freshOrder) {
+        throw new Error("Server 未返回目标订单最新快照");
+      }
+      await this.order.upsertOrdersFromRemote(
+        [freshOrder],
+        "manual.editOpenRemoteCheck"
+      );
+      this.logInfo("checkRemoteOrderProductMembership 完成", {
+        orderId: normalizedOrderId,
+        duration: `${Date.now() - startTime}ms`
+      });
+    } catch (error) {
+      this.logError("checkRemoteOrderProductMembership 失败", {
+        orderId: normalizedOrderId,
+        duration: `${Date.now() - startTime}ms`,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
   /**
    * 清空所有server模块的IndexedDB缓存
    * @returns Promise<void>

package/lib/server/modules/order/index.d.ts

@@ -235,6 +235,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private lookupOrderIndexByIdentityKeys;
     private isRemoteEchoMergeSource;
+    private isRemoteProductMembershipChangeSource;
     private getProductMembershipKey;
     private doProductsHaveStableMembershipIdentity;
     /**

package/lib/server/modules/order/index.js

@@ -920,10 +920,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async upsertOrdersFromRemote(freshOrders, source = "upsertOrdersFromRemote") {
     if (!(freshOrders == null ? void 0 : freshOrders.length)) {
-      this.logInfo("upsertOrdersFromRemote-订单列表为空", {});
+      this.logInfo("upsertOrdersFromRemote-订单列表为空", { source });
       return;
     }
-    this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length, source });
+    this.logInfo("upsertOrdersFromRemote-开始", {
+      count: freshOrders.length,
+      source
+    });
     await this.mergeOrdersToStore(freshOrders, source);
   }
   async markOrderSyncedByExternalSaleNumber(params) {
@@ -1685,6 +1688,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   isRemoteEchoMergeSource(source) {
     return source === "pubsub.bodyUpsert" || source === "pubsub.httpRefresh";
   }
+  isRemoteProductMembershipChangeSource(source) {
+    return this.isRemoteEchoMergeSource(source) || source === "manual.editOpenRemoteCheck";
+  }
   getProductMembershipKey(product) {
     const persistentId = (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("product", product);
     if (persistentId)
@@ -1717,7 +1723,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
    */
   getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
-    if (!this.isRemoteEchoMergeSource(source))
+    if (!this.isRemoteProductMembershipChangeSource(source))
       return null;
     const previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
     const currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];

package/lib/server/modules/order/types.d.ts

@@ -568,7 +568,7 @@ export interface OrderChangedPayload {
     /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
     source?: string;
 }
-export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh';
+export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh' | 'manual.editOpenRemoteCheck';
 /**
  * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
  * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。