@pisell/pisellos 2.2.261 → 2.2.263

package/dist/modules/Order/utils.js

@@ -21,6 +21,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
+import { createUuidV4 } from "./utils/orderCollectionIdentity";
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -252,8 +253,8 @@ function getOrderProductDeposit(product, runtimeOrigin) {
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export function calculateOrderProductsDeposit() {
   var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -273,30 +274,18 @@ export function calculateOrderProductsDeposit() {
       product.deposit = deposit;
       if (!(deposit !== null && deposit !== void 0 && deposit.total) || Number(deposit.total) <= 0) continue;
       total = total.plus(deposit.total);
-      var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+      var _iterator4 = _createForOfIteratorHelper(deposit.protocols || []),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var discount = _step4.value;
-          total = total.minus((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+          var protocol = _step4.value;
+          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
         }
       } catch (err) {
         _iterator4.e(err);
       } finally {
         _iterator4.f();
       }
-      var _iterator5 = _createForOfIteratorHelper(deposit.protocols || []),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var protocol = _step5.value;
-          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
       hasDeposit = true;
     }
   } catch (err) {
@@ -460,19 +449,19 @@ function resolveSubmitBundleMapId(bundle) {
 }
 function collectSubmitProductDiscountList(product) {
   var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
-  var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
-    _step6;
+  var _iterator5 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
+    _step5;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var bundle = _step6.value;
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var bundle = _step5.value;
       if (!bundle || _typeof(bundle) !== 'object') continue;
       var bundleMapId = resolveSubmitBundleMapId(bundle);
       var bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
-      var _iterator7 = _createForOfIteratorHelper(bundleDiscountList),
-        _step7;
+      var _iterator6 = _createForOfIteratorHelper(bundleDiscountList),
+        _step6;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var discount = _step7.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var discount = _step6.value;
           if (!discount || _typeof(discount) !== 'object') continue;
           var discountMetadata = discount.metadata && _typeof(discount.metadata) === 'object' ? discount.metadata : {};
           var discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
@@ -483,15 +472,15 @@ function collectSubmitProductDiscountList(product) {
           } : {}));
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator7.f();
+        _iterator6.f();
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator5.e(err);
   } finally {
-    _iterator6.f();
+    _iterator5.f();
   }
   return normalizeOrderProductDiscountList(submitDiscountList);
 }
@@ -544,8 +533,7 @@ export function resolveEffectivePerUnitDiscount(product) {
     return sum + Number((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
   }, 0);
   var hasPromoDiscountItem = discountList.some(function (item) {
-    var _item$metadata, _item$metadata2;
-    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion' || (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
+    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion';
   });
   if (hasPromoDiscountItem) return fromList;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
@@ -587,11 +575,14 @@ export function createDefaultOrderRulesHooks() {
       if (!bundle || _typeof(bundle) !== 'object') return bundle;
       var current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current) return bundle;
+      var bundleWithDisplayFields = _objectSpread(_objectSpread({}, bundle), isEmptyOrderProductDisplayValue(bundle.cover) && !isEmptyOrderProductDisplayValue(current.cover) ? {
+        cover: current.cover
+      } : {});
       var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
-      if (!isProductPriceBundle) return bundle;
+      if (!isProductPriceBundle) return bundleWithDisplayFields;
       var sourcePrice = (_ref18 = (_ref19 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref19 !== void 0 ? _ref19 : current.original_price) !== null && _ref18 !== void 0 ? _ref18 : current.bundle_selling_price;
       var originalPrice = (_ref20 = (_ref21 = (_ref22 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref22 !== void 0 ? _ref22 : current.price) !== null && _ref21 !== void 0 ? _ref21 : current.custom_price) !== null && _ref20 !== void 0 ? _ref20 : sourcePrice;
-      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundle), sourcePrice !== undefined ? {
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundleWithDisplayFields), sourcePrice !== undefined ? {
         price: sourcePrice
       } : {}), originalPrice !== undefined ? {
         original_price: originalPrice
@@ -764,14 +755,7 @@ export var getAllDiscountList = function getAllDiscountList(cartItem) {
 
 // ─── 以下为从 ScanOrder/utils.ts 迁入的 Order 专属工具函数 ───
 
-export function createUuidV4() {
-  var template = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
-  return template.replace(/[xy]/g, function (char) {
-    var randomValue = Math.floor(Math.random() * 16);
-    var value = char === 'x' ? randomValue : randomValue & 0x3 | 0x8;
-    return value.toString(16);
-  });
-}
+export { createUuidV4 };
 export function isTempOrder(data) {
   if (!data || _typeof(data) !== 'object') return false;
   if (!Array.isArray(data.products)) return false;
@@ -864,6 +848,7 @@ function formatSubmitBundleItems(bundle) {
       bundle_group_id: (_rawBundle$bundle_gro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_group_id) !== null && _rawBundle$bundle_gro !== void 0 ? _rawBundle$bundle_gro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
       bundle_id: (_rawBundle$bundle_id = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_id) !== null && _rawBundle$bundle_id !== void 0 ? _rawBundle$bundle_id : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.id,
       bundle_product_id: (_rawBundle$bundle_pro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_product_id) !== null && _rawBundle$bundle_pro !== void 0 ? _rawBundle$bundle_pro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle._bundle_product_id,
+      cover: rawBundle.cover,
       metadata: _objectSpread(_objectSpread(_objectSpread({}, submitMetadata), hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
         custom_product_bundle_map_id: bundleMapId
       } : {}), {}, {
@@ -925,6 +910,9 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.is_rule !== undefined) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
+  if (rawMetadata.holder_config !== undefined) {
+    cleanMetadata.holder_config = rawMetadata.holder_config;
+  }
   var productSku = _objectSpread(_objectSpread({}, submitProduct.product_sku && _typeof(submitProduct.product_sku) === 'object' ? submitProduct.product_sku : {}), {}, {
     option: formatSubmitOptionItems((_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
   });
@@ -955,19 +943,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator8 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step8;
+  var _iterator7 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step7;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var key = _step8.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var key = _step7.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator8.f();
+    _iterator7.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -1280,25 +1268,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
     target[key] = null;
     changed = true;
   };
-  var _iterator9 = _createForOfIteratorHelper(tempOrder.products || []),
-    _step9;
+  var _iterator8 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step8;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var product = _step9.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var product = _step8.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         resetHolderField(product.metadata);
       }
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator9.f();
+    _iterator8.f();
   }
-  var _iterator10 = _createForOfIteratorHelper(tempOrder.bookings || []),
-    _step10;
+  var _iterator9 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step9;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var booking = _step10.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var booking = _step9.value;
       var bookingRecord = booking;
       if (booking.metadata && _typeof(booking.metadata) === 'object') {
         resetHolderField(booking.metadata);
@@ -1309,9 +1297,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator10.f();
+    _iterator9.f();
   }
   var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {
@@ -1362,11 +1350,16 @@ export function isHolderConfigRequired(holderConfig) {
   return Number(holderConfig.required) === 1;
 }
 export function productRequiresFormSubject(tempOrder, product) {
+  var _tempOrder$products, _orderProduct$metadat;
+  var _orderProduct = tempOrder === null || tempOrder === void 0 || (_tempOrder$products = tempOrder.products) === null || _tempOrder$products === void 0 ? void 0 : _tempOrder$products.find(function (item) {
+    return item.metadata.unique_identification_number === product._id || item.product_id === product.id;
+  });
   var runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
-  return isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config);
+  return isHolderConfigRequired(_orderProduct === null || _orderProduct === void 0 || (_orderProduct$metadat = _orderProduct.metadata) === null || _orderProduct$metadat === void 0 ? void 0 : _orderProduct$metadat.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config) || isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config);
 }
 export function resolveIsFormSubject(tempOrder, product) {
   var _tempOrder$holder;
+  debugger;
   // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
   if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
   if (product) return productRequiresFormSubject(tempOrder, product);
@@ -1406,7 +1399,7 @@ export function isEmptyOrderProductDisplayValue(value) {
  */
 export function mergeOrderProductDisplayFields(previous, next) {
   var merged = _objectSpread({}, next);
-  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'variant_title', 'product_sku', 'payment_price'];
+  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'product_cover', 'variant_title', 'product_sku', 'payment_price'];
   displayFields.forEach(function (field) {
     if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
       merged[field] = previous[field];

package/dist/modules/Product/types.d.ts

@@ -9,6 +9,26 @@ export interface ProductCollection {
     /** 商品集合封面 */
     cover: string;
 }
+/**
+ * 商品 Data Variant 记录，结构与后端 data_variant 表对齐。
+ */
+export interface ProductDataVariant {
+    /** 变体记录 id */
+    id: number;
+    /** 店铺 id */
+    shop_id: number;
+    /** 所属模块，商品场景固定为 product */
+    module: string;
+    /** 模块数据 id，商品场景对应 product.id */
+    module_data_id: number;
+    /** 关联 data_variant_rule.id */
+    data_variant_rule_id: number;
+    /** 命中策略后覆盖到商品上的字段 */
+    data: Record<string, any>;
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 /**
  * 商品基本信息接口
  */
@@ -214,6 +234,8 @@ export interface ProductData {
     bundle_group_count: number;
     /** 选项组数量 */
     option_group_count: number;
+    /** 智能定价变体列表，/product/query with dataVariants 返回 */
+    data_variants?: ProductDataVariant[];
     /** 服务时长 */
     service_times?: any;
 }

package/dist/modules/ProductList/index.d.ts

@@ -26,7 +26,7 @@ export declare class ProductList extends BaseModule implements Module {
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
     getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/dist/modules/ProductList/index.js

@@ -152,6 +152,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           extension_type,
           _ref$status,
           status,
+          strategy_context,
           options,
           userPlugin,
           customer_id,
@@ -162,7 +163,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status;
+              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
               options = _args4.length > 1 ? _args4[1] : undefined;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
@@ -206,7 +207,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 is_eject: 1,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                extension_type: extension_type
+                extension_type: extension_type,
+                strategy_context: strategy_context
               }, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,

package/dist/modules/ProductList/types.d.ts

@@ -12,6 +12,8 @@ export interface ProductListLoadProductsParams {
     with_schedule?: number;
     extension_type?: string[];
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 export interface ProductListData {
     list: ProductData[];

package/dist/modules/Rules/index.d.ts

@@ -1,8 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -36,7 +35,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
-    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
@@ -46,12 +44,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }, options?: {
-        isSelected?: boolean;
-        discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
-        scan?: boolean;
-    }): DiscountResult;
+    }, options?: RulesCalcDiscountOptions): DiscountResult;
     /**
      * 检查优惠是否符合 PackageSubItemUsageRules 配置
      * @param discount 优惠券

package/dist/modules/Rules/index.js

@@ -241,17 +241,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function resolveDiscountListForManualOverride(discountList) {
       return this.excludeDiscountListByType(discountList, 'promotion');
     }
-  }, {
-    key: "isItemRewardProductDiscount",
-    value: function isItemRewardProductDiscount(product) {
-      var _product$_promotion;
-      var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
-      return (product === null || product === void 0 || (_product$_promotion = product._promotion) === null || _product$_promotion === void 0 ? void 0 : _product$_promotion.actionType) === 'ITEM_REWARD' && discountList.some(function (item) {
-        var _item$metadata, _item$metadata2;
-        return (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
-      });
-    }
-
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -346,6 +335,32 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }) && productList.find(function (n) {
         return !n.booking_id;
       });
+      var reapplyBookingDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter(function (uid) {
+        return uid !== undefined && uid !== null && uid !== '';
+      }).map(String));
+      var getOriginProductUid = function getOriginProductUid(originProduct) {
+        var _originProduct$metada, _originProduct$metada2;
+        var uid = (_originProduct$metada = originProduct === null || originProduct === void 0 || (_originProduct$metada2 = originProduct.metadata) === null || _originProduct$metada2 === void 0 ? void 0 : _originProduct$metada2.unique_identification_number) !== null && _originProduct$metada !== void 0 ? _originProduct$metada : originProduct === null || originProduct === void 0 ? void 0 : originProduct.unique_identification_number;
+        if (uid === undefined || uid === null || uid === '') return undefined;
+        return String(uid);
+      };
+      var shouldReapplyBookingDiscount = function shouldReapplyBookingDiscount(originProduct, selectedDiscount) {
+        if (!selectedDiscount) return false;
+        var uid = getOriginProductUid(originProduct);
+        if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
+        var discountType = selectedDiscount.tag || selectedDiscount.type;
+        return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+      };
+      var resolveReapplyEditModeDiscountPercent = function resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount) {
+        var _discount2;
+        if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount)) return undefined;
+        var discountType = (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.tag) || (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.type);
+        if (discountType !== 'discount_card' && discountType !== 'product_discount_card') {
+          return undefined;
+        }
+        var percent = Number((_discount2 = selectedDiscount.discount) === null || _discount2 === void 0 ? void 0 : _discount2.percent);
+        return Number.isFinite(percent) ? percent : undefined;
+      };
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -374,11 +389,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
-
-      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑
-      var filteredDiscountList = addModeDiscount.filter(function (discount) {
-        return !discount.isManualSelect;
-      });
       var hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options === null || options === void 0 ? void 0 : options.discountId) || Boolean(options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.length) || Boolean(options === null || options === void 0 ? void 0 : options.scan);
       if (!hasDiscountInput) {
         return {
@@ -386,6 +396,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           productList: productList
         };
       }
+      var canUseEditModeDiscountForReapply = function canUseEditModeDiscountForReapply(discount) {
+        var discountType = discount.tag || discount.type;
+        return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+      };
+
+      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑。
+      // Change time 重报价需要把已选编辑态折扣卡重新放入候选，再由目标 uid 限定作用范围。
+      var filteredDiscountList = [].concat(_toConsumableArray(addModeDiscount.filter(function (discount) {
+        return !discount.isManualSelect;
+      })), _toConsumableArray(editModeDiscount.filter(canUseEditModeDiscountForReapply)));
 
       // 🔥 扁平化商品列表：将 bundle 子商品展开为虚拟商品
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
@@ -709,9 +729,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             startDate: (_flatItem$parentProdu = flatItem.parentProduct) === null || _flatItem$parentProdu === void 0 ? void 0 : _flatItem$parentProdu.startDate
           };
         }
-        if (_this3.isItemRewardProductDiscount(product)) {
-          return false;
-        }
 
         // 编辑的商品使用了优惠券不可用
         var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
@@ -898,7 +915,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
-        var isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
           var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
@@ -924,7 +940,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -1069,10 +1085,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
-          if (_this3.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
+          var currentOriginUid = getOriginProductUid(originProduct);
+          var isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
+          if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
+            var uid = currentOriginUid;
+            if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
+            if (!discount.isSelected) return false;
+          }
+          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType) && !isReapplyEditModeDiscountForProduct) {
             var _discount$config2;
             // 如果策略检查后没有config，说明不可用
             if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config2 = discount.config) !== null && _discount$config2 !== void 0 && _discount$config2.isAvailable)) {
@@ -1150,7 +1172,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
-        var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
           var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
@@ -1162,8 +1183,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
-          isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
-          if (product.inPromotion && !isItemRewardProductDiscount) {
+          if (product.inPromotion) {
             isManualDiscount = false;
           }
         } else {
@@ -1273,17 +1293,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              }) || isItemRewardProductDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
                 var _product$total, _product$main_product;
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
                 main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
                 price: product.price,
-                main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
-              }, isItemRewardProductDiscount ? {
-                total: total
-              } : {}) : {
+                main_product_selling_price: product.price
+              } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
@@ -1304,7 +1322,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
+        var shouldReapplyBookingDiscountForProduct = shouldReapplyBookingDiscount(originProduct, selectedDiscount);
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct && !shouldReapplyBookingDiscountForProduct) {
           return;
         }
 
@@ -1345,7 +1364,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
+            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1383,11 +1402,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var productDiscountDifference = void 0;
             var discountedOptions = product.options;
             var optionDiscountAmount = 0;
+            var reapplyDiscountPercent = void 0;
             if (isOrderLevel && productAllocation) {
               // order_level：使用预计算的分摊金额
               amount = productAllocation.discountAmount;
               productDiscountDifference = productAllocation.difference;
               mainProductSellingPrice = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
+            } else if (resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
+              // Change time 重套编辑态折扣卡时，历史 par_value 不是运行时折扣口径，优先使用后端快照里的 percent。
+              var percent = resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount);
+              reapplyDiscountPercent = new Decimal(percent).toFixed(2);
+              mainProductSellingPrice = new Decimal(product.price || 0).mul(new Decimal(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+              amount = new Decimal(product.price).minus(mainProductSellingPrice).toNumber();
             } else {
               // item_level 或其他类型：使用原有逻辑
               mainProductSellingPrice = getDiscountAmount(_selectedDiscount, product.price, product.price);
@@ -1420,7 +1446,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id || originProduct.product_id,
-                percent: _selectedDiscount.par_value,
+                percent: (_reapplyDiscountPerce = reapplyDiscountPercent) !== null && _reapplyDiscountPerce !== void 0 ? _reapplyDiscountPerce : _selectedDiscount.par_value,
                 discount_product_id: _selectedDiscount.product_id
               },
               // 前端使用的num数量，为了计算优惠金额
@@ -1724,11 +1750,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   processedItems.forEach(function (item) {
                     // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                     var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata3;
+                      var _item$metadata;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用拆分后的 num
                       });
@@ -1747,11 +1773,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   if (item.processed) {
                     // 🔥 同样需要更新 discount_list 中的 num
                     var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata4;
+                      var _item$metadata2;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用当前的 num
                       });
@@ -1792,8 +1818,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 使用更新后的列表计算折扣金额
               var mainDiscountList = updatedMainDiscountList.filter(function (item) {
-                var _item$metadata5;
-                return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
+                var _item$metadata3;
+                return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
               });
               if (mainDiscountList && mainDiscountList.length > 0) {
                 var _Decimal$minus$toNumb, _mainProductData$orig;
@@ -1866,8 +1892,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 使用更新后的列表计算折扣金额
                 var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
-                  var _item$metadata6;
-                  return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
+                  var _item$metadata4;
+                  return !(item !== null && item !== void 0 && (_item$metadata4 = item.metadata) !== null && _item$metadata4 !== void 0 && _item$metadata4.custom_product_bundle_map_id);
                 });
                 if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
                   var _Decimal$minus$toNumb2, _mainProductData$orig2;