@pisell/pisellos 2.3.51 → 2.3.53

package/lib/modules/Order/utils.js

@@ -36,9 +36,8 @@ __export(utils_exports, {
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils3.createEmptySummary,
+  createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => import_orderCollectionIdentity.createUuidV4,
-  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
   ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
@@ -86,10 +85,9 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../Holder/utils");
-var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_utils = require("../../solution/ScanOrder/utils");
 var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
-var import_utils3 = require("../../solution/ScanOrder/utils");
+var import_utils2 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
@@ -548,7 +546,7 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils2.buildProductLineFingerprint)(
+        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
           getProductSkuOptions(product),
           product.product_bundle
         )}`,
@@ -640,34 +638,6 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
-function getCustomerIdFromStorage(window) {
-  var _a;
-  try {
-    const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
-    const customerId = Number(customer == null ? void 0 : customer.id);
-    return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function ensureCartItemOriginHolder(cartItem, window) {
-  var _a;
-  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
-    return;
-  }
-  const holderConfig = (0, import_utils.getProductHolderConfig)(
-    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
-  );
-  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
-  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
-    return;
-  }
-  cartItem._origin.holder = {
-    customer_id: getCustomerIdFromStorage(window),
-    form_id: holderConfig.resource_id,
-    form_record: [formRecordId]
-  };
-}
 var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
@@ -1033,7 +1003,7 @@ function buildSubmitPayload(params) {
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    summary: summary || tempOrder.summary || (0, import_utils2.createEmptySummary)(),
+    summary: summary || tempOrder.summary || (0, import_utils.createEmptySummary)(),
     metadata: (() => {
       const {
         collect_pax: _collectPax,
@@ -1282,7 +1252,6 @@ function indexOrderProductsByUid(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
-  ensureCartItemOriginHolder,
   ensureManualProductDiscountList,
   ensureProductSku,
   findManualProductDiscountItem,

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

@@ -193,7 +193,6 @@ export interface ProductData {
         status?: string;
         required?: number | string | boolean;
         resource_id?: number | string | null;
-        [key: string]: any;
     };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;

package/lib/modules/ProductList/index.js

@@ -106,48 +106,39 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
-    const channelMap = {
-      online_store: "online-store",
-      scan_to_order: "online-store",
-      "scan-to-order": "online-store",
-      scan_to_order_2: "mobile_order",
-      scan_to_order_3: "scantoorder3"
-    };
-    const rawApplicationCode = (_b = this.otherParams) == null ? void 0 : _b.channel;
-    const mappedApplicationCode = typeof rawApplicationCode === "string" ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-    const queryPayload = {
-      open_quotation: 1,
-      open_bundle: 0,
-      exclude_extension_type: [
-        "product_party",
-        "product_event",
-        "product_series_event",
-        "product_package_ticket",
-        "ticket",
-        "event_item"
-      ],
-      with: ["category", "collection", "resourceRelation"],
-      status,
-      num: 500,
-      skip: 1,
-      customer_id,
-      ...Array.isArray(category_ids) && category_ids.length ? { category_ids } : {},
-      ...Array.isArray(product_ids) && product_ids.length ? { ids: product_ids } : {},
-      ...Array.isArray(collection) && collection.length ? { collection } : {},
-      front_end_cache_id: cacheId,
-      ...Array.isArray(menu_list_ids) && menu_list_ids.length ? { menu_list_ids } : {},
-      with_count,
-      // client_schedule_ids: schedule_ids,
-      schedule_date,
-      application_code: mappedApplicationCode,
-      is_eject: 1,
-      with_schedule,
-      schedule_datetime,
-      extension_type
-    };
     const productsData = await this.request.post(
       `/product/query`,
-      queryPayload,
+      {
+        open_quotation: 1,
+        open_bundle: 0,
+        exclude_extension_type: [
+          "product_party",
+          "product_event",
+          "product_series_event",
+          "product_package_ticket",
+          "ticket",
+          "event_item"
+        ],
+        with: ["category", "collection", "resourceRelation"],
+        status,
+        num: 500,
+        skip: 1,
+        customer_id,
+        category_ids,
+        ids: product_ids,
+        collection,
+        front_end_cache_id: cacheId,
+        menu_list_ids,
+        with_count,
+        // client_schedule_ids: schedule_ids,
+        schedule_date,
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        is_eject: 1,
+        with_schedule,
+        schedule_datetime,
+        extension_type,
+        strategy_context
+      },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }
     );

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

@@ -21,7 +21,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/lib/modules/Quotation/index.js

@@ -52,7 +52,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       { useCache: false, osServer: true }
     );
     const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
-    list.sort((a, b) => b.sort - a.sort);
+    list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
   getQuotationList() {
@@ -96,7 +96,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
    * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
    * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
    *
-   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+   * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
    * First matching quotation whose schedule covers `datetime` and whose product_data contains
    * the requested productId wins.
    */

package/lib/modules/Rules/index.js

@@ -243,7 +243,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const discountType = selectedDiscount.tag || selectedDiscount.type;
       return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
     };
-    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
+    const resolveReapplyBookingDiscountPercent = (originProduct, selectedDiscount) => {
       var _a2;
       if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
         return void 0;
@@ -305,8 +305,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _id: product._id,
           parentId: product._id,
           quantity: product.quantity,
-          num: product.num,
-          booking_id: product.booking_id
+          num: product.num
         });
         if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
           product.bundle.forEach((bundleItem, bundleIndex) => {
@@ -318,6 +317,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundleIndex,
               // 虚拟商品属性
               price: Number(bundleItem.price || 0),
+              // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+              // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+              // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
               id: bundleItem.bundle_product_id ?? bundleItem._bundle_product_id ?? bundleItem.product_id,
               _id: `${product._id}_bundle_${bundleIndex}`,
               parentId: product._id,
@@ -327,7 +329,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: bundleItem.booking_id,
+              booking_id: product.booking_id,
               discount_list: bundleItem.discount_list || []
             });
           });
@@ -689,8 +691,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               discount_product_id: discount.product_id
             },
             metadata: {
-              num,
-              discount_rule_uncheck_flag: discount == null ? void 0 : discount.discount_rule_uncheck_flag
+              num
             }
           };
           applicableProducts.push(productData);
@@ -779,13 +780,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isPersistedProduct && hasExistingWalletDiscount) {
         if (flatItem.type === "main") {
           processedProductsMap.set(product._id, [originProduct]);
-        } else {
-          processedFlatItemsMap.set(flatItem._id, [
-            {
-              ...flatItem,
-              processed: true
-            }
-          ]);
         }
         return;
       }
@@ -1091,8 +1085,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
-          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
-            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2);
             reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
             mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
             amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
@@ -1138,7 +1132,6 @@ 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） */
@@ -1219,7 +1212,6 @@ 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,
@@ -1249,7 +1241,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               _id: `${flatItem._id}_split_rest`,
               num: normalNum,
               quantity: normalNum,
-              discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion"),
+              discount_list: [],
               processed: true
             });
           }
@@ -1267,10 +1259,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let targetProductTotal;
           let fixedAmountPerItem;
           let productDiscountDifference;
+          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             fixedAmountPerItem = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             targetProductTotal = Math.max(new import_decimal.default(productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(
+              originProduct,
+              selectedDiscount2
+            );
+            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
+            targetProductTotal = new import_decimal.default(productOriginTotal).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+            fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           } else {
             targetProductTotal = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1292,13 +1293,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
               product_id: product.id || product.product_id,
-              percent: selectedDiscount2.par_value,
+              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             metadata: {
               // 🔥 使用唯一的 _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 }
@@ -1313,7 +1313,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             ...flatItem,
             total: targetProductTotal,
             price: new import_decimal.default(productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-            discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion").concat([discountDetail]),
+            discount_list: [discountDetail],
             processed: true
           });
         }
@@ -1734,7 +1734,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
    * @returns 是否可用
    */
   checkPackageSubItemUsageRules(discount, flatItem) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     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) || []];
@@ -1746,7 +1746,6 @@ 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;
     }
@@ -1755,9 +1754,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return true;
       }
       if (isBundleItem) {
-        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 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 isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
         const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
         if (rules.length > 0) {
@@ -1769,11 +1768,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
           if (scopeType === "specific_packages" || scopeType === "products") {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
           if (isPriceValid && isScopeValid) {
             return true;
@@ -1789,26 +1788,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return false;
       }
       if (isBundleItem) {
-        const priceType = (_g = flatItem.bundleItem) == null ? void 0 : _g.price_type;
-        const priceTypeExt = (_h = flatItem.bundleItem) == null ? void 0 : _h.price_type_ext;
+        const priceType = (_f = flatItem.bundleItem) == null ? void 0 : _f.price_type;
+        const priceTypeExt = (_g = flatItem.bundleItem) == null ? void 0 : _g.price_type_ext;
         const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
         const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
         if (rules.length > 0) {
-          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 (scopeType === "specific_packages" || scopeType === "products") {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+          if (isOriginalPrice && rules.includes("original_price")) {
+            return true;
           }
-          if (isPriceValid && isScopeValid) {
+          if (isMarkupPrice && rules.includes("markup_price")) {
             return true;
           }
           return false;

package/lib/modules/SalesSummary/index.js

@@ -53,6 +53,9 @@ 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 插件支持");
     }
@@ -106,14 +109,12 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     }
   }
   getAppData(key) {
-    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);
+    var _a, _b, _c, _d, _e, _f;
+    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
     if (typeof getData === "function")
       return getData(key);
-    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");
+    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");
     return coreData == null ? void 0 : coreData[key];
   }
   getTaxConfig() {

package/lib/modules/SalesSummary/utils.js

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

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

@@ -11,12 +11,10 @@ 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,7 +60,6 @@ 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) || {};
@@ -102,25 +101,14 @@ 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 || {},
-        ...host ? { host } : {}
-      }
+      context: this.store.context || {}
     };
   }
   async addLog(params) {

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

@@ -112,29 +112,20 @@ async function flushQueue() {
 }
 var feishuLoggerProvider = {
   async send(payload) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     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;
-    const throttleMs = ((_f = (_e = payload.providerConfig) == null ? void 0 : _e.feishu) == null ? void 0 : _f.throttleMs) ?? DEFAULT_THROTTLE_MS;
+    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;
     if (throttleMs <= 0) {
       try {
         await postToFeishu(webhook, buildFeishuBody([payload.record]));

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

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

package/lib/modules/Schedule/index.js

@@ -95,12 +95,12 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
    *
    * @memberof ScheduleModule
    */
-  async loadAllSchedule(options = {}) {
+  async loadAllSchedule() {
     var _a;
     const scheduleList = await this.request.get(
       `/schedule`,
       { num: 999 },
-      { useCache: options.useCache ?? true }
+      { useCache: true }
     );
     this.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
   }
@@ -126,6 +126,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     custom_page_id,
     channel
   }) {
+    var _a, _b, _c;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -143,20 +144,17 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         channel
       }
     );
-    const responseData = res.data || {};
-    const dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
-    const otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
-    this.setAvailabilityScheduleDateList(dateList);
-    this.setOtherProductsIds(otherProductIds);
-    if (!dateList.length && !otherProductIds.length || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    this.setAvailabilityScheduleDateList(res.data.date_list);
+    this.setOtherProductsIds(res.data.other_product_ids || []);
+    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
-    if (otherProductIds.length) {
+    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
       dates.forEach((n) => {
         n.status = "available";
       });
     } else {
-      dateList.forEach((n) => {
+      res.data.date_list.forEach((n) => {
         const index = dates.findIndex((m) => m.date === n.date);
         if (index !== -1) {
           dates[index].status = "available";

package/lib/modules/Summary/utils.js

@@ -437,31 +437,11 @@ var getBundleItemIsDiscountPrice = (item) => {
 var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
-var getDiscountAmount = (discounts) => {
-  return (discounts || []).reduce((total, discount) => {
-    return total.add(new import_decimal.default(discount.amount || 0));
-  }, new import_decimal.default(0)).toNumber();
-};
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b;
   let total = new import_decimal.default(
     (item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0
   );
-  const hasMainProductPrice = (item == null ? void 0 : item.main_product_selling_price) != null || ((_c = item == null ? void 0 : item.metadata) == null ? void 0 : _c.main_product_selling_price) != null || ((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.main_product_original_price) != null;
-  if (!hasMainProductPrice) {
-    total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.main_product_selling_price) ?? item.price ?? 0);
-    const discount = ((_g = (_f = item == null ? void 0 : item._origin) == null ? void 0 : _f.product) == null ? void 0 : _g.discount_list) || ((_j = (_i = (_h = item == null ? void 0 : item._originData) == null ? void 0 : _h.product) == null ? void 0 : _i.discount_list) == null ? void 0 : _j.filter((item2) => {
-      var _a2;
-      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-    })) || [];
-    const mainProductDiscountAmount = getDiscountAmount(discount);
-    total = total.minus(mainProductDiscountAmount);
-    if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
-      total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
-        return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
-      }, new import_decimal.default(0)));
-    }
-  }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);