@pisell/pisellos 2.3.38 → 2.3.39

package/lib/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/lib/modules/ResourcePlanner/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ResourcePlanner/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

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

@@ -35,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[];

package/lib/modules/Rules/index.js

@@ -167,16 +167,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   resolveDiscountListForManualOverride(discountList) {
     return this.excludeDiscountListByType(discountList, "promotion");
   }
-  isItemRewardProductDiscount(product) {
-    var _a;
-    const discountList = Array.isArray(product == null ? void 0 : product.discount_list) ? product.discount_list : [];
-    return ((_a = product == null ? void 0 : product._promotion) == null ? void 0 : _a.actionType) === "ITEM_REWARD" && discountList.some(
-      (item) => {
-        var _a2, _b;
-        return (item == null ? void 0 : item.type) === "product" && ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
-      }
-    );
-  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -300,7 +290,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _id: product._id,
           parentId: product._id,
           quantity: product.quantity,
-          num: product.num
+          num: product.num,
+          booking_id: product.booking_id
         });
         if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
           product.bundle.forEach((bundleItem, bundleIndex) => {
@@ -312,7 +303,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundleIndex,
               // 虚拟商品属性
               price: Number(bundleItem.price || 0),
-              id: bundleItem.bundle_product_id ?? bundleItem._bundle_product_id ?? bundleItem.product_id,
+              id: bundleItem._bundle_product_id,
+              // 🔥 使用 _bundle_product_id
               _id: `${product._id}_bundle_${bundleIndex}`,
               parentId: product._id,
               num: bundleItem.num || 1,
@@ -321,7 +313,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               origin_total: new import_decimal.default(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 || []
             });
           });
@@ -509,9 +501,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           startDate: (_a2 = flatItem.parentProduct) == null ? void 0 : _a2.startDate
         };
       }
-      if (this.isItemRewardProductDiscount(product)) {
-        return false;
-      }
       const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.length) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.every((d) => d.id && ["good_pass", "discount_card", "product_discount_card"].includes(d.tag || d.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_e = (_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.discount_list) == null ? void 0 : _e.length) && ((_g = (_f = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _f.discount_list) == null ? void 0 : _g.every((d) => d.id)));
       if (!isAvailableProduct) {
         return false;
@@ -637,7 +626,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
         originProduct = flatItem.originProduct;
       }
-      const isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
       addModeDiscount.forEach((discount) => {
         var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
@@ -661,7 +649,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           ].includes(discount2.tag || discount2.type)
         ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) == null ? void 0 : _d.length) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.every((discount2) => discount2.id)));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
+        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
           (_h = discountApplicability.get(discount.id)) == null ? void 0 : _h.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -683,7 +671,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               discount_product_id: discount.product_id
             },
             metadata: {
-              num
+              num,
+              discount_rule_uncheck_flag: discount == null ? void 0 : discount.discount_rule_uncheck_flag
             }
           };
           applicableProducts.push(productData);
@@ -784,8 +773,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a3, _b2, _c2, _d2;
-        if (this.isItemRewardProductDiscount(product))
-          return false;
         const discountType = discount.tag || discount.type;
         const currentOriginUid = getOriginProductUid(originProduct);
         const isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
@@ -855,17 +842,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const explicitlySelectedDiscountCard = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
-        const discountType = discount.tag || discount.type;
-        return String(discount.id) === String(options.discountId) && ["discount_card", "product_discount_card"].includes(discountType);
-      }) : void 0;
-      const scannedSelectedDiscountCard = applicableDiscounts.find(
+      const selectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
-      const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
-      let isItemRewardProductDiscount = false;
       if (flatItem.type === "main") {
         isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : ((_g = product.discount_list) == null ? void 0 : _g.some((item) => item.type === "product")) || product.total != product.origin_total && (product.bundle || []).every(
           (item) => {
@@ -876,8 +857,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _i,
           (item) => item.type === "product"
         )));
-        isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
-        if (product.inPromotion && !isItemRewardProductDiscount) {
+        if (product.inPromotion) {
           isManualDiscount = false;
         }
       } else {
@@ -991,16 +971,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           } else {
             let total = product.inPromotion ? ((_w = product == null ? void 0 : product._promotion) == null ? void 0 : _w.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
             let main_product_selling_price = product.price;
-            if ((product.discount_list || []).some((item) => item.type === "promotion") || isItemRewardProductDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+            if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
               total = product.total ?? product.origin_total;
               main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
             }
             processedProductsMap.set(product._id, [
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
-                  price: product.price,
-                  main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price,
-                  ...isItemRewardProductDiscount ? { total } : {}
+                  price: product.price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
@@ -1131,6 +1109,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
             metadata: {
               num: 1,
+              discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
               // 🔥 order_level 分摊差值
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference },
               /** 仅主商品上的优惠金额（不含 option） */
@@ -1211,6 +1190,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               metadata: {
                 // 🔥 使用拆分后的唯一 _id
                 custom_product_bundle_map_id: uniqueId,
+                discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
                 num: 1
               },
               _num: 1,
@@ -1240,7 +1220,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               _id: `${flatItem._id}_split_rest`,
               num: normalNum,
               quantity: normalNum,
-              discount_list: [],
+              discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion"),
               processed: true
             });
           }
@@ -1289,6 +1269,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             metadata: {
               // 🔥 使用唯一的 _id
               custom_product_bundle_map_id: uniqueId,
+              discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
               num: product.num || 1,
               // 🔥 order_level 分摊差值
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
@@ -1303,7 +1284,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             ...flatItem,
             total: targetProductTotal,
             price: new import_decimal.default(productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-            discount_list: [discountDetail],
+            discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion").concat([discountDetail]),
             processed: true
           });
         }
@@ -1724,7 +1705,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
    * @returns 是否可用
    */
   checkPackageSubItemUsageRules(discount, flatItem) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const limitedData = discount.limited_relation_product_data;
     const usageRules = limitedData == null ? void 0 : limitedData.package_sub_item_usage_rules;
     const rules = ["original_price", ...(usageRules == null ? void 0 : usageRules.rules) || []];
@@ -1736,6 +1717,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const { type: scopeType, exclude_bundle_product_ids = [], include_bundle_product_ids = [], filter = 0 } = packageScope || {};
     const isMainProduct = flatItem.type === "main";
     const isBundleItem = flatItem.type === "bundle";
+    const bundleMainProductId = (_a = flatItem.product) == null ? void 0 : _a.product_id;
     if (isMainProduct) {
       return true;
     }
@@ -1744,9 +1726,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return true;
       }
       if (isBundleItem) {
-        const priceType = (_a = flatItem.bundleItem) == null ? void 0 : _a.price_type;
-        const priceTypeExt = (_b = flatItem.bundleItem) == null ? void 0 : _b.price_type_ext;
-        const mainProductId = ((_d = (_c = flatItem == null ? void 0 : flatItem.originProduct) == null ? void 0 : _c._productOrigin) == null ? void 0 : _d.id) || ((_e = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _e.id) || 0;
+        const priceType = (_b = flatItem.bundleItem) == null ? void 0 : _b.price_type;
+        const priceTypeExt = (_c = flatItem.bundleItem) == null ? void 0 : _c.price_type_ext;
+        const mainProductId = ((_e = (_d = flatItem == null ? void 0 : flatItem.originProduct) == null ? void 0 : _d._productOrigin) == null ? void 0 : _e.id) || ((_f = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _f.id) || 0;
         const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
         const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
         if (rules.length > 0) {
@@ -1758,11 +1740,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
             }
           }
           if (scopeType === "specific_packages" || scopeType === "products") {
-            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
           }
           if (isPriceValid && isScopeValid) {
             return true;
@@ -1778,15 +1760,26 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return false;
       }
       if (isBundleItem) {
-        const priceType = (_f = flatItem.bundleItem) == null ? void 0 : _f.price_type;
-        const priceTypeExt = (_g = flatItem.bundleItem) == null ? void 0 : _g.price_type_ext;
+        const priceType = (_g = flatItem.bundleItem) == null ? void 0 : _g.price_type;
+        const priceTypeExt = (_h = flatItem.bundleItem) == null ? void 0 : _h.price_type_ext;
         const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
         const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
         if (rules.length > 0) {
-          if (isOriginalPrice && rules.includes("original_price")) {
-            return true;
+          const _isOriginalPrice = isOriginalPrice && rules.includes("original_price");
+          const _isMarkupPrice = isMarkupPrice && rules.includes("markup_price");
+          const isPriceValid = _isOriginalPrice || _isMarkupPrice;
+          let isScopeValid = false;
+          if (scopeType === "all_packages" || scopeType === "product_all") {
+            if (!filter) {
+              isScopeValid = true;
+            } else {
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+            }
           }
-          if (isMarkupPrice && rules.includes("markup_price")) {
+          if (scopeType === "specific_packages" || scopeType === "products") {
+            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+          }
+          if (isPriceValid && isScopeValid) {
             return true;
           }
           return false;

package/lib/modules/SalesSummary/index.js

@@ -53,9 +53,6 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
     this.surchargeListModuleName = ((_c = this.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
-    if (!this.appPlugin) {
-      throw new Error("SalesSummaryModule 需要 app 插件支持");
-    }
     if (!this.request) {
       throw new Error("SalesSummaryModule 需要 request 插件支持");
     }
@@ -109,12 +106,14 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     }
   }
   getAppData(key) {
-    var _a, _b, _c, _d, _e, _f;
-    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
     if (typeof getData === "function")
       return getData(key);
-    const app = this.appPlugin.getApp();
-    const coreData = (_f = (_d = (_c = app == null ? void 0 : app.models) == null ? void 0 : _c.getStore) == null ? void 0 : (_e = _d.call(_c)).getDataByModel) == null ? void 0 : _f.call(_e, "core", "core");
+    const app = (_d = (_c = this.appPlugin) == null ? void 0 : _c.getApp) == null ? void 0 : _d.call(_c);
+    if (!app)
+      return void 0;
+    const coreData = (_h = (_f = (_e = app == null ? void 0 : app.models) == null ? void 0 : _e.getStore) == null ? void 0 : (_g = _f.call(_e)).getDataByModel) == null ? void 0 : _h.call(_g, "core", "core");
     return coreData == null ? void 0 : coreData[key];
   }
   getTaxConfig() {

package/lib/modules/ScanOrderLogger/index.d.ts

@@ -11,10 +11,12 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
+    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }

package/lib/modules/ScanOrderLogger/index.js

@@ -60,6 +60,7 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options.store;
+    this.window = core.getPlugin("window") || void 0;
     const provider = ((_a = options.otherParams) == null ? void 0 : _a.provider) || "feishu";
     const providerConfig = ((_b = options.otherParams) == null ? void 0 : _b.providerConfig) || {};
     const context = ((_c = options.otherParams) == null ? void 0 : _c.context) || {};
@@ -101,14 +102,25 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
       }
     };
   }
+  getCurrentHost() {
+    var _a, _b;
+    const host = (_b = (_a = this.window) == null ? void 0 : _a.location) == null ? void 0 : _b.host;
+    if (typeof host === "string" && host.length > 0)
+      return host;
+    return void 0;
+  }
   buildRecord(params) {
+    const host = this.getCurrentHost();
     return {
       level: params.level || "info",
       title: params.title,
       timestamp: params.timestamp || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
       payload: params.payload || {},
       extra: params.extra || {},
-      context: this.store.context || {}
+      context: {
+        ...this.store.context || {},
+        ...host ? { host } : {}
+      }
     };
   }
   async addLog(params) {

package/lib/modules/ScanOrderLogger/providers/feishu.js

@@ -112,20 +112,29 @@ async function flushQueue() {
 }
 var feishuLoggerProvider = {
   async send(payload) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     cachedProviderConfig = payload.providerConfig;
     const webhook = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.feishu) == null ? void 0 : _b.webhook;
+    const errorHook = (_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.errorHook;
+    if (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
+      return;
+    }
+    if (payload.record.level === "error" && isWebhookUsable(errorHook)) {
+      try {
+        await postToFeishu(errorHook, buildFeishuBody([payload.record]));
+      } catch (error) {
+        console.warn("[ScanOrderLogger] Feishu errorHook 上报失败", error);
+      }
+      return;
+    }
     if (!webhook) {
       console.warn("[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报");
       return;
     }
     if (!isWebhookUsable(webhook))
       return;
-    if (typeof fetch !== "function") {
-      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
-      return;
-    }
-    const throttleMs = ((_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.throttleMs) ?? DEFAULT_THROTTLE_MS;
+    const throttleMs = ((_f = (_e = payload.providerConfig) == null ? void 0 : _e.feishu) == null ? void 0 : _f.throttleMs) ?? DEFAULT_THROTTLE_MS;
     if (throttleMs <= 0) {
       try {
         await postToFeishu(webhook, buildFeishuBody([payload.record]));

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

@@ -2,6 +2,7 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    errorHook?: string;
     /**
      * 节流窗口毫秒数，默认 3000ms
      * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送

package/lib/modules/Schedule/index.d.ts

@@ -24,7 +24,9 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      *
      * @memberof ScheduleModule
      */
-    loadAllSchedule(): Promise<void>;
+    loadAllSchedule(options?: {
+        useCache?: boolean;
+    }): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
     private syncScheduleMap;
     getScheduleList(): ScheduleItem[];