@pisell/pisellos 2.2.246 → 2.2.248

package/lib/modules/Order/index.js

@@ -76,6 +76,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.giftSelectResolver = null;
     /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
     this.isApplyingPromotion = false;
+    /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
+    this.hasActiveCustomerBoundDiscount = false;
     /** 最近一次 applyPromotion 的未满足促销提示 */
     this.lastUnfulfilledPromotions = [];
     /** 最近一次 applyPromotion 的赠品操作 diff（debug / SDK 读取使用） */
@@ -166,33 +168,53 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   static populateSavedAmounts(productList, discountList) {
     const savedMap = /* @__PURE__ */ new Map();
-    const addDiscountAmount = (discount, quantity) => {
+    const editModeSavedMap = /* @__PURE__ */ new Map();
+    const runtimeSavedMap = /* @__PURE__ */ new Map();
+    const editModeDiscountKeys = new Set(
+      (discountList || []).filter((discount) => discount == null ? void 0 : discount.isEditMode).map((discount) => discount == null ? void 0 : discount.id).filter((id) => id !== void 0 && id !== null)
+    );
+    const addDiscountAmount = (targetMap, discountKey, amount) => {
+      targetMap.set(
+        discountKey,
+        (targetMap.get(discountKey) || new import_decimal.default(0)).plus(amount)
+      );
+    };
+    const addProductDiscountAmount = (discount, quantity, isPersistedProduct) => {
       var _a, _b;
       const discountKey = ((_a = discount.discount) == null ? void 0 : _a.resource_id) || discount.id;
       if (discountKey == null)
         return;
       const qty = Number(quantity) || 1;
       const amount = new import_decimal.default(discount.amount || 0).times(qty).plus(((_b = discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0);
-      savedMap.set(
+      addDiscountAmount(savedMap, discountKey, amount);
+      addDiscountAmount(
+        isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap,
         discountKey,
-        (savedMap.get(discountKey) || new import_decimal.default(0)).plus(amount)
+        amount
       );
     };
     for (const product of productList) {
       const qty = product.num || 1;
+      const isPersistedProduct = Boolean(
+        product.order_detail_id || product.orderDetailId || product.booking_id
+      );
       for (const pd of product.discount_list || []) {
-        addDiscountAmount(pd, qty);
+        addProductDiscountAmount(pd, qty, isPersistedProduct);
       }
       for (const bundle of product.product_bundle || []) {
+        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();
         for (const pd of (bundle == null ? void 0 : bundle.discount_list) || []) {
-          addDiscountAmount(pd, bundleQty);
+          addProductDiscountAmount(pd, bundleQty, isPersistedBundleProduct);
         }
       }
     }
     for (const d of discountList) {
       const key = d.id;
-      d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
+      const sourceMap = d.isEditMode ? editModeSavedMap : editModeDiscountKeys.has(key) ? runtimeSavedMap : savedMap;
+      d.savedAmount = d.isSelected && key != null && sourceMap.has(key) ? sourceMap.get(key).toNumber() : 0;
     }
   }
   applyProductDiscountPrices(products) {
@@ -369,12 +391,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }));
     if (discountList) {
       const currentEditDiscounts = (((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || []).filter((discount) => discount == null ? void 0 : discount.isEditMode);
-      const currentEditDiscountIds = new Set(
-        currentEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
-      );
+      const runtimeDiscountIds = /* @__PURE__ */ new Set();
+      const runtimeDiscounts = discountList.filter((discount) => {
+        if (runtimeDiscountIds.has(discount == null ? void 0 : discount.id))
+          return false;
+        runtimeDiscountIds.add(discount == null ? void 0 : discount.id);
+        return true;
+      });
       const mergedDiscountList = [
         ...currentEditDiscounts,
-        ...discountList.filter((discount) => !currentEditDiscountIds.has(discount == null ? void 0 : discount.id))
+        ...runtimeDiscounts
       ];
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(mergedDiscountList));
       await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(mergedDiscountList));
@@ -471,6 +497,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!tempOrder)
       return;
     delete tempOrder.discount_list;
+    if (this.shouldSkipDiscountCalculation(tempOrder))
+      return;
     const rulesModule = this.store.rules;
     if (!rulesModule)
       return;
@@ -512,6 +540,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       );
       (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(result.discountList);
     }
+    this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(
+      (product) => this.productHasCustomerBoundDiscount(product)
+    );
   }
   // ─── 促销/赠品 ──────────────────────────────────────
   /**
@@ -556,7 +587,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
    */
   async applyPromotion() {
-    var _a;
+    var _a, _b, _c;
     if (this.isApplyingPromotion) {
       return;
     }
@@ -567,6 +598,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!tempOrder) {
       return;
     }
+    const strategyConfigs = (_b = (_a = this.promotionEvaluator).getStrategyConfigs) == null ? void 0 : _b.call(_a);
+    if (Array.isArray(strategyConfigs) && strategyConfigs.length === 0) {
+      return;
+    }
     this.isApplyingPromotion = true;
     try {
       const result = (0, import_cartPromotion.processCartPromotion)(
@@ -608,11 +643,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             if (addAction.giftOptions.length === 1) {
               const sameStrategy = result.products.find(
                 (p) => {
-                  var _a2, _b;
-                  return ((_b = (_a2 = p.metadata) == null ? void 0 : _a2._giftInfo) == null ? void 0 : _b.strategyId) === addAction.strategyId;
+                  var _a2, _b2;
+                  return ((_b2 = (_a2 = p.metadata) == null ? void 0 : _a2._giftInfo) == null ? void 0 : _b2.strategyId) === addAction.strategyId;
                 }
               );
-              if (sameStrategy && !sameStrategy.booking_uid && !((_a = sameStrategy.metadata) == null ? void 0 : _a.booking_uid)) {
+              if (sameStrategy && !sameStrategy.booking_uid && !((_c = sameStrategy.metadata) == null ? void 0 : _c.booking_uid)) {
                 sameStrategy.num = (Number(sameStrategy.num) || 0) + (addAction.giftCount || 1);
                 continue;
               }
@@ -1977,12 +2012,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const type = (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag);
     return type === "good_pass" || type === "discount_card" || type === "product_discount_card";
   }
+  productHasCustomerBoundDiscount(product) {
+    if (((product == null ? void 0 : product.discount_list) || []).some((discount) => this.isCustomerBoundDiscount(discount))) {
+      return true;
+    }
+    return ((product == null ? void 0 : product.product_bundle) || []).some(
+      (bundle) => ((bundle == null ? void 0 : bundle.discount_list) || []).some((discount) => this.isCustomerBoundDiscount(discount))
+    );
+  }
+  shouldSkipDiscountCalculation(tempOrder) {
+    var _a, _b;
+    if (this.hasActiveCustomerBoundDiscount)
+      return false;
+    const discountList = ((_b = (_a = this.store.discount) == null ? void 0 : _a.getDiscountList) == null ? void 0 : _b.call(_a)) || [];
+    if (discountList.length > 0)
+      return false;
+    return !(tempOrder.products || []).some(
+      (product) => this.productHasCustomerBoundDiscount(product)
+    );
+  }
   clearCustomerBoundDiscounts(tempOrder) {
     var _a, _b, _c, _d;
+    let didRemoveCustomerBoundDiscount = false;
     const filterDiscountList = (discountList) => {
       if (!Array.isArray(discountList))
         return [];
-      return discountList.filter((discount) => !this.isCustomerBoundDiscount(discount));
+      return discountList.filter((discount) => {
+        const shouldRemove = this.isCustomerBoundDiscount(discount);
+        if (shouldRemove)
+          didRemoveCustomerBoundDiscount = true;
+        return !shouldRemove;
+      });
     };
     tempOrder.products = (tempOrder.products || []).map((product) => {
       const nextProduct = {
@@ -1998,6 +2058,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return nextProduct;
     });
     delete tempOrder.discount_list;
+    if (didRemoveCustomerBoundDiscount) {
+      this.hasActiveCustomerBoundDiscount = true;
+    }
     const discountModule = this.store.discount;
     if (!discountModule)
       return;
@@ -3631,12 +3694,59 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       };
     }
     tempOrderExtend.productsByUid = productsByUid;
+    this.hydrateLinkedBookingIdentity(nextTempOrder);
     if ((options == null ? void 0 : options.ensureIdentity) !== false) {
       this.ensureExternalSaleNumber(nextTempOrder);
     }
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
+  hydrateLinkedBookingIdentity(tempOrder) {
+    const bookingUidByProductUid = /* @__PURE__ */ new Map();
+    const productByUid = /* @__PURE__ */ new Map();
+    (tempOrder.products || []).forEach((product) => {
+      var _a;
+      const productUid = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) || (product == null ? void 0 : product.unique_identification_number);
+      if (productUid !== void 0 && productUid !== null && String(productUid) !== "") {
+        productByUid.set(String(productUid), product);
+      }
+    });
+    (tempOrder.bookings || []).forEach((booking) => {
+      var _a;
+      if (!booking || typeof booking !== "object")
+        return;
+      if (!booking.metadata || typeof booking.metadata !== "object") {
+        booking.metadata = {};
+      }
+      const productUid = booking.product_uid || booking.metadata.product_uid;
+      if (productUid === void 0 || productUid === null || String(productUid) === "")
+        return;
+      const matchedProduct = productByUid.get(String(productUid));
+      const existedProductBookingUid = (matchedProduct == null ? void 0 : matchedProduct.booking_uid) || ((_a = matchedProduct == null ? void 0 : matchedProduct.metadata) == null ? void 0 : _a.booking_uid);
+      const bookingUid = String(
+        booking.metadata.unique_identification_number || existedProductBookingUid || (0, import_utils.createUuidV4)()
+      );
+      booking.metadata.unique_identification_number = bookingUid;
+      bookingUidByProductUid.set(String(productUid), bookingUid);
+    });
+    (tempOrder.products || []).forEach((product) => {
+      var _a;
+      const productUid = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) || (product == null ? void 0 : product.unique_identification_number);
+      if (productUid === void 0 || productUid === null || String(productUid) === "")
+        return;
+      const bookingUid = bookingUidByProductUid.get(String(productUid));
+      if (!bookingUid)
+        return;
+      if (!product.metadata || typeof product.metadata !== "object") {
+        product.metadata = {};
+      }
+      const linkedBookingUid = String(
+        product.booking_uid || product.metadata.booking_uid || bookingUid
+      );
+      product.booking_uid = linkedBookingUid;
+      product.metadata.booking_uid = linkedBookingUid;
+    });
+  }
   pickHydratedDisplayText(value) {
     if (value === void 0 || value === null)
       return "";

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

@@ -34,6 +34,7 @@ export interface OrderPromotionEvaluator {
         products: any[];
         channel?: string;
     }, matchVariant?: boolean): any[];
+    getStrategyConfigs?: () => unknown[];
 }
 /** 赠品解析回调 context（OS → SDK 的请求体） */
 export interface OrderGiftSelectContext {

package/lib/modules/Payment/walletpass.js

@@ -214,7 +214,7 @@ var WalletPassPaymentImpl = class {
       };
       const [allList, orderBasicDetail] = await Promise.all([
         this.getUserIdentificationCodeListAsync(identificationParams),
-        baseParams.payment_order_id ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)
+        baseParams.payment_order_id && typeof baseParams.payment_order_id === "string" && !baseParams.payment_order_id.startsWith("LOCAL_") ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)
       ]);
       const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
       if (!walletPassEvaluator) {

package/lib/server/utils/small-ticket.d.ts

@@ -35,6 +35,7 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
+    discount_list?: any[];
     options?: Array<{
         name: string;
         num?: number;

package/lib/server/utils/small-ticket.js

@@ -57,8 +57,11 @@ var LABELS = {
     remainingPoints: "Remaining points",
     table: "Table",
     orderDiscount: "Order discount",
+    manualDiscount: "Manual discount",
     payProcessingFee: "Pay processing fee",
-    rounding: "Rounding"
+    rounding: "Rounding",
+    gross: "Gross",
+    tare: "Tare"
   },
   zh_CN: {
     contactName: "联系人姓名",
@@ -80,8 +83,11 @@ var LABELS = {
     remainingPoints: "剩余积分",
     table: "桌台",
     orderDiscount: "整单折扣",
+    manualDiscount: "手动折扣",
     payProcessingFee: "支付手续费",
-    rounding: "抹零"
+    rounding: "抹零",
+    gross: "重量",
+    tare: "去皮"
   },
   zh_HK: {
     contactName: "聯絡人姓名",
@@ -103,8 +109,11 @@ var LABELS = {
     remainingPoints: "剩餘積分",
     table: "桌台",
     orderDiscount: "整單折扣",
+    manualDiscount: "手動折扣",
     payProcessingFee: "支付手續費",
-    rounding: "抹零"
+    rounding: "抹零",
+    gross: "重量",
+    tare: "去皮"
   }
 };
 function buildSmallTicketData(params) {
@@ -184,19 +193,112 @@ function buildProducts(order, locale, productMap) {
       parentProduct
     });
     const resolvedVariant = resolveProductVariantText({ product, parentProduct, locale });
+    const extensionList = buildProductExtensionList({
+      product,
+      locale,
+      currencySymbol,
+      quantity,
+      originalPrice
+    });
+    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol, quantity });
     return {
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
-      extension_list: Array.isArray(product.extension_list) ? product.extension_list : [],
+      extension_list: extensionList,
+      ...discountList.length ? { discount_list: discountList } : {},
       ...options.length ? { options } : {},
       ...resolvedVariant ? { variant: resolvedVariant } : {},
       ...Array.isArray(product.combinations) ? { combinations: product.combinations } : combinations.length ? { combinations } : {}
     };
   });
 }
+function normalizeProductDiscounts(params) {
+  const { product, locale, currencySymbol, quantity } = params;
+  return normalizeArray(product.discount_list).map((discount) => {
+    const title = resolveDiscountTitleWithPercent(discount, locale);
+    const amount = discount.amount ?? discount.value ?? discount.discount_amount;
+    const formattedAmount = formatNegativeMoney(new import_decimal.default(toMoneyNumber(amount)).mul(quantity), currencySymbol);
+    return {
+      ...discount,
+      item: title,
+      name: title,
+      title,
+      value: formattedAmount
+    };
+  });
+}
+function buildProductExtensionList(params) {
+  const { product, locale, currencySymbol, quantity, originalPrice } = params;
+  const extensionList = [
+    ...buildProductOpenWeightRows({ product, locale, currencySymbol }),
+    ...quantity > 1 ? [{
+      item: buildProductQuantityPriceText({ quantity, currencySymbol, price: originalPrice }),
+      value: ""
+    }] : []
+  ];
+  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+}
+function buildProductOpenWeightRows(params) {
+  const { product, locale, currencySymbol } = params;
+  const productSku = product.product_sku || {};
+  if (productSku.open_sold_weight != 1)
+    return [];
+  const unit = productSku.unit ?? "";
+  const manualFlag = productSku.weight_source === "manual" ? "(M) " : "";
+  const hasTare = toNumber(productSku.tare_weight, 0) > 0;
+  const rows = [];
+  if (hasTare) {
+    rows.push({
+      item: `${manualFlag}${label(locale, "gross")}: ${productSku.weight ?? 0}${unit}`,
+      value: ""
+    });
+    rows.push({
+      item: `${label(locale, "tare")}: ${productSku.tare_weight}${unit}`,
+      value: ""
+    });
+  }
+  const netWeight = productSku.net_weight ?? 0;
+  const unitPrice = productSku.unit_price ?? 0;
+  const netItem = `${netWeight} ${unit} NET @ ${currencySymbol}${unitPrice}/${unit}`;
+  rows.push({
+    item: hasTare ? netItem : `${manualFlag}${netItem}`,
+    value: ""
+  });
+  return rows;
+}
+function buildProductQuantityPriceText(params) {
+  const { quantity, currencySymbol, price } = params;
+  return `${quantity} @ ${currencySymbol}${stringify(price)} EACH`;
+}
+function resolveDiscountTitleWithPercent(discount, locale) {
+  var _a, _b;
+  const title = resolveDiscountTitle(discount, locale);
+  const percentRaw = (_a = discount.discount) == null ? void 0 : _a.percent;
+  const cardType = ((_b = discount.discount) == null ? void 0 : _b.discount_card_type) ?? "percent";
+  const percent = percentRaw !== void 0 && percentRaw !== null ? Math.trunc(Number(percentRaw)) : NaN;
+  if (percentRaw === void 0 || percentRaw === null)
+    return title;
+  if (cardType !== "percent")
+    return title;
+  if (Number.isNaN(percent))
+    return title;
+  return `${title} (${percent}%)`;
+}
+function resolveDiscountTitle(discount, locale) {
+  var _a, _b, _c;
+  const title = getLocalizedValue(
+    ((_a = discount.discount) == null ? void 0 : _a.name) ?? ((_b = discount.discount) == null ? void 0 : _b.title) ?? ((_c = discount.discount) == null ? void 0 : _c.message) ?? discount.name ?? discount.title ?? discount.message,
+    locale
+  );
+  if (title)
+    return title;
+  if (discount.type === "product")
+    return label(locale, "manualDiscount");
+  return "";
+}
 function resolveProductTitle(params) {
   const { product, productMap, locale } = params;
   const ownTitle = getProductTitleSource(product, locale);
@@ -480,11 +582,11 @@ function buildFees(params) {
       value: formatMoney(value, currencySymbol)
     });
   }
-  const discountAmount = summary.discount_amount || order.discount_amount || order.shop_discount;
+  const discountAmount = order.shop_discount ?? summary.discount_amount ?? order.discount_amount;
   if (isNonZero(discountAmount)) {
     fees.push({
       item: label(locale, "orderDiscount"),
-      value: formatMoney(new import_decimal.default(toMoneyNumber(discountAmount)).neg(), currencySymbol)
+      value: formatNegativeMoney(discountAmount, currencySymbol)
     });
   }
   const taxFee = summary.tax_fee || order.tax_fee;
@@ -508,14 +610,14 @@ function buildFees(params) {
       value: formatMoney(payProcessingFee, currencySymbol)
     });
   }
+  const productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
+  const productOriginalAmount = summary.product_original_amount ?? order.product_original_amount ?? productExpectAmount;
+  const totalSavingsAmount = new import_decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
   return {
     fees,
     countFee: {
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
-      product_expect_amount: formatMoney(
-        summary.product_expect_amount || summary.product_amount || order.product_expect_amount,
-        currencySymbol
-      ),
+      product_expect_amount: formatMoney(productExpectAmount, currencySymbol),
       expect_amount: formatMoney(summary.expect_amount || order.expect_amount || summary.total_amount || order.total_amount, currencySymbol),
       product_quantity: toNumber(
         summary.product_quantity || products.reduce((sum, product) => sum + product.product_quantity, 0),
@@ -526,7 +628,7 @@ function buildFees(params) {
       tax_title: stringify(summary.tax_title || order.tax_title || shopInfo.tax_title),
       total_refund_amount: formatMoney(summary.total_refund_amount || order.total_refund_amount, currencySymbol),
       ...isNonZero(roundingAmount) ? { rounding_amount: formatMoney(roundingAmount, currencySymbol) } : {},
-      ...isNonZero(discountAmount) ? { order_total_discount: formatMoney(discountAmount, currencySymbol) } : {},
+      ...isNonZero(totalSavingsAmount) ? { order_total_discount: formatMoney(totalSavingsAmount, currencySymbol) } : {},
       ...isNonZero(payProcessingFee) ? { pay_processing_fee: formatMoney(payProcessingFee, currencySymbol) } : {},
       ...isNonZero(taxFee) ? { tax_fee: formatMoney(taxFee, currencySymbol) } : {}
     }
@@ -712,8 +814,9 @@ function getLocalizedValue(value, locale) {
   if (typeof value !== "object")
     return stringify(value);
   const dashedLocale = locale.replace("_", "-");
+  const underscoredLocale = locale.replace("-", "_");
   return stringify(
-    value[locale] ?? value[dashedLocale] ?? value.default ?? value.en ?? ""
+    value[locale] ?? value[dashedLocale] ?? value[underscoredLocale] ?? value.original ?? value.auto ?? value.default ?? value.en ?? ""
   );
 }
 function buildShopAddress(shopInfo) {
@@ -742,6 +845,10 @@ function formatMoney(value, currencySymbol) {
   const amount = new import_decimal.default(toMoneyNumber(value));
   return `${currencySymbol}${amount.toFixed(2)}`;
 }
+function formatNegativeMoney(value, currencySymbol) {
+  const amount = new import_decimal.default(toMoneyNumber(value)).abs();
+  return `-${currencySymbol}${amount.toFixed(2)}`;
+}
 function calculateReceiptPaidAmount(order, summary) {
   const paidAmount = sumPayments(order.payments);
   const payProcessingFee = new import_decimal.default(

package/lib/solution/BaseSales/index.js

@@ -70,6 +70,11 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
     return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
   });
 }
+function isBaseSalesHistoricalDiscountEntry(discount) {
+  return Boolean(
+    (discount == null ? void 0 : discount.isEditMode) || (discount == null ? void 0 : discount.isDisabled) || (discount == null ? void 0 : discount.order_discount_id) != null
+  );
+}
 function getBaseSalesUniqueArrayMetadataKey(key) {
   if (key === "products" || key === "bookings")
     return "unique_identification_number";
@@ -883,7 +888,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const historyIds = new Set(historyDiscountList.map((discount) => discount.id));
     return [
       ...historyDiscountList,
-      ...(discountList || []).filter((discount) => !historyIds.has(discount.id))
+      ...(discountList || []).filter((discount) => {
+        if (!historyIds.has(discount.id))
+          return true;
+        return !isBaseSalesHistoricalDiscountEntry(discount);
+      })
     ];
   }
   shouldSkipAutoApplyFetchedDiscountsInEditMode(params) {
@@ -906,11 +915,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
     if (!currentDiscountList.length)
       return discountList;
-    const currentDiscountMap = new Map(
-      currentDiscountList.map((discount) => [discount.id, discount])
-    );
+    const currentDiscountMap = /* @__PURE__ */ new Map();
+    currentDiscountList.forEach((discount) => {
+      currentDiscountMap.set(
+        `${discount.id}:${isBaseSalesHistoricalDiscountEntry(discount) ? "historical" : "runtime"}`,
+        discount
+      );
+    });
     return discountList.map((discount) => {
-      const currentDiscount = currentDiscountMap.get(discount.id);
+      const currentDiscount = currentDiscountMap.get(
+        `${discount.id}:${isBaseSalesHistoricalDiscountEntry(discount) ? "historical" : "runtime"}`
+      );
       if (!currentDiscount)
         return discount;
       if (currentDiscount.isManualSelect) {
@@ -1145,7 +1160,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         throw new Error("order 模块未初始化");
       const list = this.store.order.getDiscountList();
       const updated = list.map(
-        (d) => d.id === params.discountId ? {
+        (d) => d.id === params.discountId && !isBaseSalesHistoricalDiscountEntry(d) ? {
           ...d,
           isSelected: params.isSelected,
           isManualSelect: !params.isSelected

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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