@pisell/pisellos 2.2.278 → 2.2.280

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

@@ -0,0 +1,227 @@
+export type ResourcePlannerMode = 'appointment' | 'scan_order' | 'venue_grid';
+export type ResourcePlannerProductKind = 'normal' | 'duration' | 'session' | 'venue_slot';
+export type ResourcePlannerResourceType = 'single' | 'multiple' | 'capacity';
+export type ResourcePlannerStatus = 'available' | 'limited' | 'full' | 'conflict' | 'unavailable' | 'past';
+export interface ResourcePlannerTimeRange {
+    start_at: string;
+    end_at: string;
+}
+export interface ResourcePlannerEvent extends ResourcePlannerTimeRange {
+    resourceId?: number | string;
+    resource_id?: number | string;
+    pax?: number;
+    product_uid?: string;
+    source?: 'remote' | 'cart' | 'selection';
+    [key: string]: any;
+}
+export interface ResourcePlannerResourceRequirement {
+    formId?: number | string;
+    resourceIds?: Array<number | string>;
+    resourceType?: ResourcePlannerResourceType;
+    capacityRequired?: number;
+    required?: boolean;
+}
+export interface ResourcePlannerProduct {
+    id: number | string;
+    title?: string;
+    kind: ResourcePlannerProductKind;
+    durationMinutes?: number;
+    schedule?: ResourcePlannerTimeRange[];
+    resourceRequirements?: ResourcePlannerResourceRequirement[];
+    capacityRequired?: number;
+    quantity?: number;
+    price?: string | number | null;
+    raw?: Record<string, any>;
+}
+export interface ResourcePlannerResource {
+    id: number | string;
+    formId?: number | string;
+    name?: string;
+    resourceType: ResourcePlannerResourceType;
+    capacity: number;
+    times: Array<ResourcePlannerTimeRange & {
+        event_list?: ResourcePlannerEvent[];
+        [key: string]: any;
+    }>;
+    childResourceIds?: Array<number | string>;
+    raw?: Record<string, any>;
+}
+export interface ResourcePlannerContextInput {
+    products?: ResourcePlannerProduct[];
+    resources?: ResourcePlannerResource[];
+    externalEvents?: ResourcePlannerEvent[];
+    slotDurationMinutes?: number;
+    businessStartTime?: string;
+    businessEndTime?: string;
+}
+export interface ResourcePlannerQuery {
+    mode?: ResourcePlannerMode;
+    productIds?: Array<number | string>;
+    date?: string;
+    dateRange?: {
+        start: string;
+        end: string;
+    };
+    startTime?: string;
+    endTime?: string;
+    resourceIds?: Array<number | string>;
+    serviceObjectIds?: Array<number | string>;
+    holderIds?: Array<number | string>;
+    pax?: number;
+    slotDurationMinutes?: number;
+}
+export interface ResourcePlannerSelection {
+    productIds: Array<number | string>;
+    date?: string;
+    startTime?: string;
+    endTime?: string;
+    resourceIds: Array<number | string>;
+    assignments: ResourcePlannerAssignment[];
+    mode?: ResourcePlannerMode;
+}
+export interface ResourcePlannerSelectionPatch extends Partial<ResourcePlannerSelection> {
+    replaceAssignments?: boolean;
+}
+export interface ResourcePlannerDemandInterval {
+    id: string;
+    productId: number | string;
+    source: Extract<ResourcePlannerProductKind, 'duration' | 'session' | 'venue_slot'>;
+    date: string;
+    start_at: string;
+    end_at: string;
+    durationMinutes: number;
+    quantity: number;
+    capacityRequired: number;
+    resourceRequirements: ResourcePlannerResourceRequirement[];
+}
+export interface ResourcePlannerConflict {
+    type: 'outside_resource_time' | 'remote_event_overlap' | 'cart_overlap' | 'capacity_full' | 'missing_time' | 'missing_resource' | 'missing_assignment' | 'past';
+    message: string;
+    event?: ResourcePlannerEvent;
+    resourceId?: number | string;
+    productId?: number | string;
+}
+export interface ResourcePlannerAvailabilityCell {
+    key: string;
+    productId: number | string;
+    resourceId?: number | string;
+    date?: string;
+    start_at: string;
+    end_at: string;
+    startTime?: string;
+    endTime?: string;
+    durationMinutes?: number;
+    cellType: 'availability_range' | 'fixed_interval' | 'unavailable';
+    status: ResourcePlannerStatus;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+    reasonCodes: string[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerProductOption {
+    productId: number | string;
+    title?: string;
+    status: ResourcePlannerStatus;
+    reasonCodes: string[];
+}
+export interface ResourcePlannerResourceOption {
+    resourceId: number | string;
+    resourceName?: string;
+    resourceFormId?: number | string;
+    resourceType: ResourcePlannerResourceType;
+    status: ResourcePlannerStatus;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+    reasonCodes: string[];
+}
+export interface ResourcePlannerDateSummary {
+    date: string;
+    status: ResourcePlannerStatus;
+    availableCount: number;
+    totalCount: number;
+}
+export interface ResourcePlannerTimeSlot {
+    startTime: string;
+    endTime: string;
+    status: ResourcePlannerStatus;
+    resourceId: number | string;
+    productId?: number | string;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+    reasonCodes: string[];
+}
+export interface ResourcePlannerTimeGridRow {
+    resourceId: number | string;
+    resourceName?: string;
+    resourceFormId?: number | string;
+    slots: ResourcePlannerTimeSlot[];
+}
+export interface ResourcePlannerTimeGrid {
+    date?: string;
+    timeLabels: string[];
+    resources: ResourcePlannerTimeGridRow[];
+}
+export interface ResourcePlannerProjection {
+    query: ResourcePlannerQuery;
+    demandIntervals: ResourcePlannerDemandInterval[];
+    productOptions: ResourcePlannerProductOption[];
+    resourceOptions: ResourcePlannerResourceOption[];
+    dateSummary: ResourcePlannerDateSummary[];
+    timeGrid: ResourcePlannerTimeGrid;
+    cells: ResourcePlannerAvailabilityCell[];
+}
+export interface ResourcePlannerAssignment {
+    productId: number | string;
+    resourceId: number | string;
+    start_at: string;
+    end_at: string;
+    capacityRequired?: number;
+}
+export interface ResourcePlannerAssignableSlotResource {
+    resourceId: number | string;
+    resourceName?: string;
+    resourceFormId?: number | string;
+    resourceType?: ResourcePlannerResourceType;
+    capacityRequired?: number;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+}
+export interface ResourcePlannerAssignableSlot {
+    key: string;
+    productId: number | string;
+    date: string;
+    start_at: string;
+    end_at: string;
+    startTime: string;
+    endTime: string;
+    durationMinutes: number;
+    status: ResourcePlannerStatus;
+    resources: ResourcePlannerAssignableSlotResource[];
+    assignments: ResourcePlannerAssignment[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerAssignableSlotResult {
+    projection: ResourcePlannerProjection;
+    slots: ResourcePlannerAssignableSlot[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerAssignmentResult {
+    assignments: ResourcePlannerAssignment[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerValidationResult {
+    ok: boolean;
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerSnapshot {
+    context: Required<ResourcePlannerContextInput>;
+    selection: ResourcePlannerSelection;
+    projection: ResourcePlannerProjection | null;
+    version: number;
+}
+export interface ResourcePlannerState {
+    context: Required<ResourcePlannerContextInput>;
+    selection: ResourcePlannerSelection;
+    projection: ResourcePlannerProjection | null;
+    version: number;
+}

package/dist/modules/ResourcePlanner/types.js

@@ -0,0 +1 @@
+export {};

package/dist/modules/Rules/index.js

@@ -438,7 +438,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id,
             parentId: product._id,
             quantity: product.quantity,
-            num: product.num
+            num: product.num,
+            booking_id: product.booking_id
           });
 
           // 2. 展开 bundle 子商品
@@ -465,7 +466,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 origin_total: new Decimal(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
                 original_price: bundleItem.original_price,
                 // 继承主商品属性
-                booking_id: product.booking_id,
+                booking_id: bundleItem.booking_id,
                 discount_list: bundleItem.discount_list || []
               });
             });
@@ -990,7 +991,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: discount.product_id
               },
               metadata: {
-                num: num
+                num: num,
+                discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
               }
             };
             applicableProducts.push(productData);
@@ -1184,19 +1186,42 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 用户显式点击某张折扣卡时，本次选择优先于自动排序和扫码默认选择。
+        // 用户显式点击某张卡券时，本次选择优先于自动排序和扫码默认选择。
         // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
-        var explicitlySelectedDiscountCard = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
+        var explicitlySelectedDiscount = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
           var 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);
         }) : undefined;
+        // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
+        var explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== 'good_pass' ? explicitlySelectedDiscount : undefined;
+
+        // 商品数量等变化会触发无 discountId 的重算。只要当前行已应用的折扣卡仍在
+        // applicableDiscounts 中，就应保留该行选择，避免被自动排序中力度更大的卡替换。
+        var appliedDiscountCardIds = new Set((product.discount_list || []).filter(function (item) {
+          return ['discount_card', 'product_discount_card'].includes((item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 ? void 0 : item.type));
+        }).map(function (item) {
+          var _ref12, _item$discount$resour, _item$discount;
+          return (_ref12 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref12 !== void 0 ? _ref12 : item === null || item === void 0 ? void 0 : item.id;
+        }).filter(function (id) {
+          return id !== undefined && id !== null;
+        }).map(String));
+        var appliedDiscountCard = options !== null && options !== void 0 && options.scan ? undefined : applicableDiscounts.find(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+        });
 
-        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
+        // 优先级：本次显式选择 > 当前行既有选择 > 扫码选择 > 自动排序第一项。
         var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
-        var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
-        var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
+        var selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
+        var selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
+        var prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === 'good_pass' ? [explicitlySelectedDiscount].concat(_toConsumableArray(applicableDiscounts.filter(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return discountType === 'good_pass' && String(discount.id) !== String(explicitlySelectedDiscount.id);
+        })), _toConsumableArray(applicableDiscounts.filter(function (discount) {
+          return (discount.tag || discount.type) !== 'good_pass';
+        }))) : applicableDiscounts;
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
@@ -1207,8 +1232,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
             return item.type === 'product';
           })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref12;
-            return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
+            var _ref13;
+            return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
@@ -1224,8 +1249,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
               return item.type === 'product';
             })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref13;
-              return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
+              var _ref14;
+              return !((_ref14 = item.discount_list || []) !== null && _ref14 !== void 0 && _ref14.length);
             }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
@@ -1237,8 +1262,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis7;
           // 主商品：检查自己的 discount_list
           if (flatItem.type === 'main' && (_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
-            var _item$discount;
-            return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
+            var _item$discount2;
+            return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
           })) {
             isManualDiscount = false;
           }
@@ -1246,11 +1271,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (flatItem.type === 'bundle') {
             var _product$discount_lis8, _flatItem$parentProdu7;
             if ((_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
-              var _item$discount2;
-              return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
-            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
               var _item$discount3;
               return ((_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.resource_id) === options.discountId;
+            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
+              var _item$discount4;
+              return ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id) === options.discountId;
             })) {
               isManualDiscount = false;
             }
@@ -1262,8 +1287,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (flatItem.type === 'main' && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
             var _options$selectedList2;
             return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
-              var _item$discount4;
-              return n.discountId === ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id);
+              var _item$discount5;
+              return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
             });
           })) {
             isManualDiscount = false;
@@ -1274,14 +1299,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
               var _options$selectedList3;
               return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
-                var _item$discount5;
-                return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
+                var _item$discount6;
+                return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
               });
             }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
               var _options$selectedList4;
               return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
-                var _item$discount6;
-                return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
+                var _item$discount7;
+                return n.discountId === ((_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.resource_id);
               });
             })) {
               isManualDiscount = false;
@@ -1318,8 +1343,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref14, _product$_promotion$f, _product12, _product$origin_total;
-              var total = product.inPromotion ? (_ref14 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref15, _product$_promotion$f, _product12, _product$origin_total;
+              var total = product.inPromotion ? (_ref15 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref15 !== void 0 ? _ref15 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
@@ -1380,7 +1405,44 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (flatItem.type === 'main') {
           // 主商品：保持原有逻辑
           if (splitCount < totalQuantity && isNeedSplit) {
-            var _product$origin_total2;
+            var _product$origin_total2, _product$main_product2;
+            var remainingQuantity = totalQuantity - splitCount;
+            var applicableNonGoodPassById = new Map(applicableDiscounts.filter(function (discount) {
+              return (discount.tag || discount.type) !== 'good_pass';
+            }).map(function (discount) {
+              return [String(discount.id), discount];
+            }));
+            var remainderDiscountList = (product.discount_list || []).filter(function (discount) {
+              var _discount$discount$re, _discount$discount5;
+              var discountType = discount.tag || discount.type;
+              if (discountType === 'promotion') return true;
+              if (discountType === 'good_pass') return false;
+              var resourceId = (_discount$discount$re = (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.resource_id) !== null && _discount$discount$re !== void 0 ? _discount$discount$re : discount.id;
+              return resourceId !== undefined && resourceId !== null && applicableNonGoodPassById.has(String(resourceId));
+            }).map(function (discount) {
+              var _discount$discount$re2, _discount$discount6;
+              if ((discount.tag || discount.type) === 'promotion') return discount;
+              var resourceId = (_discount$discount$re2 = (_discount$discount6 = discount.discount) === null || _discount$discount6 === void 0 ? void 0 : _discount$discount6.resource_id) !== null && _discount$discount$re2 !== void 0 ? _discount$discount$re2 : discount.id;
+              var matchedDiscount = applicableNonGoodPassById.get(String(resourceId));
+              if (matchedDiscount) {
+                // 实际场景：3 件折扣卡商品中拆出 1 件改用商品券后，
+                // 剩余 2 件仍在使用原折扣卡；必须同步登记折扣卡的使用状态，
+                // 否则 updatedDiscountList 会把它改成未选中并清空 savedAmount。
+                usedDiscounts.set(matchedDiscount.id, true);
+                var appliedProducts = appliedDiscountProducts.get(matchedDiscount.id) || [];
+                appliedProducts.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  _num: remainingQuantity
+                }));
+                appliedDiscountProducts.set(matchedDiscount.id, appliedProducts);
+              }
+              return _objectSpread(_objectSpread({}, discount), {}, {
+                // _num 是 Rules 运行态的行数量；Order 写回 tempOrder 时会裁剪该字段。
+                _num: remainingQuantity
+              });
+            });
+            var hasRetainedWalletDiscount = remainderDiscountList.some(function (discount) {
+              return !['promotion', 'good_pass'].includes(discount.tag || discount.type);
+            });
             var _total = (_product$origin_total2 = product.origin_total) !== null && _product$origin_total2 !== void 0 ? _product$origin_total2 : product.total;
             if ((product.discount_list || []).some(function (item) {
               return item.type === 'promotion';
@@ -1388,17 +1450,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var _product$total2;
               _total = (_product$total2 = product.total) !== null && _product$total2 !== void 0 ? _product$total2 : product.origin_total;
             }
-            arr.push(_this4.hooks.setProduct(originProduct, {
-              discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion'),
-              quantity: totalQuantity - splitCount,
+            arr.push(_this4.hooks.setProduct(originProduct, _objectSpread({
+              // 商品券只替换被拆出的 splitCount 件。余量行原本仍有效的折扣卡
+              // 不能随 good_pass 拆分一起清除；已取消或已失效的折扣不会进入此列表。
+              discount_list: remainderDiscountList,
+              quantity: remainingQuantity,
               _id: product._id.split('___')[0],
               total: _total
-            }));
+            }, hasRetainedWalletDiscount ? {
+              main_product_selling_price: (_product$main_product2 = product.main_product_selling_price) !== null && _product$main_product2 !== void 0 ? _product$main_product2 : product.price
+            } : {})));
           }
           for (var i = 0; i < splitCount; i++) {
             var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
-            // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
-            var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
+            var _selectedDiscount = isNeedSplit ? prioritizedApplicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
             usedDiscounts.set(_selectedDiscount.id, true);
             // 🔥 更新 product_id 使用计数
@@ -1485,7 +1550,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _num: isGoodPass ? 1 : product.num,
               config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: _objectSpread(_objectSpread({
-                num: 1
+                num: 1,
+                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
               }), {}, {
@@ -1542,7 +1608,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 生成有折扣的商品（每张商品券对应 num: 1）
             for (var _i = 0; _i < discountNum; _i++) {
               var _selectedDiscount2$me;
-              var _selectedDiscount2 = applicableDiscounts[_i];
+              var _selectedDiscount2 = prioritizedApplicableDiscounts[_i];
               usedDiscounts.set(_selectedDiscount2.id, true);
               // 🔥 更新 product_id 使用计数
               if ((_selectedDiscount2.tag || _selectedDiscount2.type) === 'good_pass') {
@@ -1572,6 +1638,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
+                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1,
@@ -1603,7 +1670,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: "".concat(flatItem._id, "_split_rest"),
                 num: normalNum,
                 quantity: normalNum,
-                discount_list: [],
+                discount_list: _this4.filterDiscountListByType(flatItem.discount_list, 'promotion'),
                 processed: true
               }));
             }
@@ -1665,6 +1732,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
+                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
@@ -1680,7 +1748,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-              discount_list: [_discountDetail2],
+              discount_list: _this4.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
               processed: true
             }));
           }
@@ -1974,7 +2042,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref16, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref17, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this4.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -1989,9 +2057,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
-                        var _item$price, _ref15, _item$bundle_selling_;
+                        var _item$price, _ref16, _item$bundle_selling_;
                         var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
-                        var nextBundleSellingPrice = (_ref15 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.bundle_selling_price;
+                        var nextBundleSellingPrice = (_ref16 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref16 !== void 0 ? _ref16 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -2018,7 +2086,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref16 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref16 !== void 0 ? _ref16 : 0;
+                var mainSellingPrice = (_ref17 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref17 !== void 0 ? _ref17 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -2155,6 +2223,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkPackageSubItemUsageRules",
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
+      var _flatItem$product;
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
       var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
@@ -2166,16 +2235,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref17 = packageScope || {},
-        scopeType = _ref17.type,
-        _ref17$exclude_bundle = _ref17.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref17$exclude_bundle === void 0 ? [] : _ref17$exclude_bundle,
-        _ref17$include_bundle = _ref17.include_bundle_product_ids,
-        include_bundle_product_ids = _ref17$include_bundle === void 0 ? [] : _ref17$include_bundle,
-        _ref17$filter = _ref17.filter,
-        filter = _ref17$filter === void 0 ? 0 : _ref17$filter;
+      var _ref18 = packageScope || {},
+        scopeType = _ref18.type,
+        _ref18$exclude_bundle = _ref18.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref18$exclude_bundle === void 0 ? [] : _ref18$exclude_bundle,
+        _ref18$include_bundle = _ref18.include_bundle_product_ids,
+        include_bundle_product_ids = _ref18$include_bundle === void 0 ? [] : _ref18$include_bundle,
+        _ref18$filter = _ref18.filter,
+        filter = _ref18$filter === void 0 ? 0 : _ref18$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
+      var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2218,13 +2288,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2274,16 +2344,43 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 检查 rules
           if (rules.length > 0) {
-            // 检查原价
-            if (_isOriginalPrice2 && rules.includes('original_price')) {
-              return true;
+            var _isOriginalPrice3 = _isOriginalPrice2 && rules.includes('original_price');
+            var _isMarkupPrice3 = _isMarkupPrice2 && rules.includes('markup_price');
+            // 价格是否符合规则：原价或加价
+            var _isPriceValid = _isOriginalPrice3 || _isMarkupPrice3;
+            // 套餐适用范围校验
+            var _isScopeValid = false;
+
+            // 排除套餐判断, product_all值兼容旧数据
+            if (scopeType === 'all_packages' || scopeType === 'product_all') {
+              // 所有套餐可用
+              if (!filter) {
+                _isScopeValid = true;
+              } else {
+                _isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              }
             }
 
-            // 检查加价
-            if (_isMarkupPrice2 && rules.includes('markup_price')) {
+            // 包含套餐判断, products值兼容旧数据
+            if (scopeType === 'specific_packages' || scopeType === 'products') {
+              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            }
+
+            // 价格和套餐适用范围都符合，则可用
+            if (_isPriceValid && _isScopeValid) {
               return true;
             }
 
+            // 检查原价
+            // if (isOriginalPrice && rules.includes('original_price')) {
+            //   return true;
+            // }
+
+            // 检查加价
+            // if (isMarkupPrice && rules.includes('markup_price')) {
+            //   return true;
+            // }
+
             // 如果都不匹配，则不可用
             return false;
           }