@pisell/pisellos 2.2.171 → 2.2.172

package/lib/modules/Order/utils.js

@@ -29,12 +29,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Order/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  buildManualProductDiscountItem: () => import_manualProductDiscount.buildManualProductDiscountItem,
   buildSubmitPayload: () => buildSubmitPayload,
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
+  ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
+  findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
@@ -42,19 +45,31 @@ __export(utils_exports, {
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
+  mergeManualProductDiscountIntoList: () => import_manualProductDiscount.mergeManualProductDiscountIntoList,
   mergeRelationForms: () => mergeRelationForms,
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
+  normalizeOrderProductDiscountList: () => normalizeOrderProductDiscountList,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal: () => import_manualProductDiscount.resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources: () => import_manualProductDiscount.resolveManualDiscountReasonFromSources,
+  resolveManualOverrideLineOriginalPrice: () => resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag: () => resolveRulesManualDiscountFlag,
+  resolveSafeProductNum: () => import_manualProductDiscount.resolveSafeProductNum,
   resolveSubmitCollectPax: () => resolveSubmitCollectPax,
-  sumOptionUnitPrice: () => sumOptionUnitPrice
+  shouldBuildManualProductDiscount: () => import_manualProductDiscount.shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems: () => import_manualProductDiscount.stripManualProductDiscountItems,
+  sumOptionUnitPrice: () => sumOptionUnitPrice,
+  syncManualProductDiscountProductNum: () => import_manualProductDiscount.syncManualProductDiscountProductNum
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = 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;
   let total = new import_decimal.default(Number(mainPrice) || 0);
@@ -80,6 +95,78 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata)
+    return void 0;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  const priceOverride = metadata.price_override;
+  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "") {
+    return true;
+  }
+  return void 0;
+}
+function normalizeOrderProductDiscountAmount(amount) {
+  if (amount === void 0 || amount === null)
+    return void 0;
+  return String(amount);
+}
+function normalizeOrderProductDiscountList(discountList) {
+  if (!Array.isArray(discountList))
+    return [];
+  return discountList.filter((item) => !!item && typeof item === "object").map((item) => {
+    const normalized = {
+      discount_id: Number.isFinite(Number(item.discount_id)) ? Number(item.discount_id) : 0
+    };
+    if (item.order_discount_id === null) {
+      normalized.order_discount_id = null;
+    } else if (item.order_discount_id !== void 0) {
+      const orderDiscountId = Number(item.order_discount_id);
+      if (Number.isFinite(orderDiscountId)) {
+        normalized.order_discount_id = orderDiscountId;
+      }
+    }
+    if (item.type !== void 0)
+      normalized.type = item.type;
+    const amount = normalizeOrderProductDiscountAmount(item.amount);
+    if (amount !== void 0)
+      normalized.amount = amount;
+    if (item.discount && typeof item.discount === "object") {
+      normalized.discount = { ...item.discount };
+    }
+    if (item.metadata === null) {
+      normalized.metadata = null;
+    } else if (item.metadata && typeof item.metadata === "object") {
+      normalized.metadata = { ...item.metadata };
+    }
+    return normalized;
+  });
+}
+function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  var _a, _b;
+  const metadata = params.metadata || {};
+  const priceOverride = metadata.price_override;
+  if (priceOverride === void 0 || priceOverride === null || priceOverride === "") {
+    return fallbackCompositeOriginal;
+  }
+  const refTotal = (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.origin_total;
+  if (refTotal !== void 0 && refTotal !== null && refTotal !== "") {
+    const parsed = Number(refTotal);
+    if (Number.isFinite(parsed)) {
+      return new import_decimal.default(parsed).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  const lineOriginal = params.lineOriginalPrice;
+  if (lineOriginal !== void 0 && lineOriginal !== null && lineOriginal !== "") {
+    const parsedLine = Number(lineOriginal);
+    const parsedFallback = Number(fallbackCompositeOriginal);
+    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
+      return new import_decimal.default(parsedLine).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  return fallbackCompositeOriginal;
+}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -87,7 +174,7 @@ function createDefaultOrderRulesHooks() {
   };
   return {
     getProduct: (product) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e;
       const metadataAny = product.metadata || {};
       const optionSum = sumOptionUnitPrice(product.product_option_item);
       let sourcePrice;
@@ -135,9 +222,11 @@ function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_b = product.metadata) == null ? void 0 : _b.booking_id) || null,
         isClient: false,
-        isManualDiscount: ((_c = product.metadata) == null ? void 0 : _c.is_manual_discount) || false,
-        holder_id: (_d = product.metadata) == null ? void 0 : _d.holder_id,
-        startDate: ((_e = product.metadata) == null ? void 0 : _e.start_date) || ((_f = product.metadata) == null ? void 0 : _f.startDate)
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
+        holder_id: (_c = product.metadata) == null ? void 0 : _c.holder_id,
+        startDate: ((_d = product.metadata) == null ? void 0 : _d.start_date) || ((_e = product.metadata) == null ? void 0 : _e.startDate)
       };
     },
     setProduct: (product, values) => {
@@ -160,10 +249,14 @@ function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      const finalOriginalPrice = resolveManualOverrideLineOriginalPrice(
+        { num: nextNum, metadata: metadataAny, lineOriginalPrice: product.original_price },
+        composedOriginalPrice
+      );
       return {
         ...product,
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
@@ -321,6 +414,11 @@ function normalizeSubmitProduct(product) {
     num,
     product_option_item: productOptionItem,
     surcharge_fee: _productSurchargeFee,
+    discount_amount: _deprecatedDiscountAmount,
+    discount_type: _deprecatedDiscountType,
+    discountway: _deprecatedDiscountway,
+    product_discount_reason: _deprecatedProductDiscountReason,
+    discount_per: _deprecatedDiscountPer,
     ...productRest
   } = submitProduct;
   const rawMetadata = submitProduct.metadata || {};
@@ -365,7 +463,7 @@ function normalizeSubmitProduct(product) {
     ...bookingUid ? { booking_uid: bookingUid } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: submitProduct.discount_list || [],
+    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
@@ -425,22 +523,23 @@ function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: "",
-    order_number: "",
-    shop_order_number: "",
-    shop_full_order_number: "",
-    type: "appointment_booking",
-    business_code: "appointment_booking",
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
+    type: "",
+    business_code: void 0,
     platform: "h5",
     sales_channel: "my_pisel",
     order_sales_channel: "online_store",
     status: "normal",
     payment_status: "payment_processing",
     shipping_status: "unfulfilled",
-    customer_id: null,
+    customer_id: 0,
     customer_name: "",
     country_calling_code: "",
     phone: "",
     email: "",
+    customer: null,
     is_price_include_tax: 1,
     tax_title: "",
     tax_country_code: "",
@@ -459,7 +558,6 @@ function createDefaultTempOrder(params) {
     bookings: [],
     payments: [],
     surcharges: [],
-    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -471,6 +569,7 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
+  var _a;
   const {
     tempOrder,
     cacheId,
@@ -496,7 +595,7 @@ function buildSubmitPayload(params) {
     shop_service_type: _shopServiceType,
     start_time: _startTime,
     customer: _customer,
-    shop_full_order_number: _shopFullOrderNumber,
+    discount_list: _discountList,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
@@ -504,12 +603,24 @@ function buildSubmitPayload(params) {
     holder_id: _holderId,
     ...tempOrderRest
   } = tempOrder;
+  let submitType = type ?? tempOrder.type;
+  if (!submitType) {
+    if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
+      submitType = "appointment_booking";
+    } else {
+      submitType = "virtual";
+    }
+  }
   const payload = {
     ...tempOrderRest,
+    customer_id: tempOrder.customer_id ?? 0,
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
-    type: type ?? tempOrder.type ?? "table-order",
-    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
+    type: submitType,
+    business_code: businessCode ?? tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || "my_pisel",
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
@@ -524,12 +635,11 @@ function buildSubmitPayload(params) {
     note: tempOrder.note || "",
     delivery_type: tempOrder.delivery_type || "nil",
     schedule_date: scheduleDate,
-    created_at: tempOrder.created_at || formatDateTime(now),
+    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(
-      (booking) => Number(booking.parent_id ?? 0) !== 0
+      (booking) => Number(booking.parent_id) !== 0
     ).map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
-    // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
@@ -612,12 +722,15 @@ function formatV1Product(products) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  buildManualProductDiscountItem,
   buildSubmitPayload,
   composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  ensureManualProductDiscountList,
+  findManualProductDiscountItem,
   formatDateTime,
   formatV1Product,
   generateDuration,
@@ -625,11 +738,22 @@ function formatV1Product(products) {
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,
+  mergeManualProductDiscountIntoList,
   mergeRelationForms,
   normalizeBookingIsAll,
   normalizeBookingSubType,
+  normalizeOrderProductDiscountList,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources,
+  resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag,
+  resolveSafeProductNum,
   resolveSubmitCollectPax,
-  sumOptionUnitPrice
+  shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems,
+  sumOptionUnitPrice,
+  syncManualProductDiscountProductNum
 });

package/lib/modules/Quotation/index.js

@@ -74,9 +74,11 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   getPriceForProduct(params) {
     const { productId, variantId, datetime, customer_id } = params;
     for (const quotation of this.store.list) {
-      if (!this.isQuotationVisibleForCustomer(quotation, customer_id))
+      const visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
+      if (!visible)
         continue;
-      if (!this.isQuotationActiveAt(quotation, datetime))
+      const active = this.isQuotationActiveAt(quotation, datetime);
+      if (!active)
         continue;
       const match = this.findProductData(quotation.product_data, productId, variantId);
       if (!match)
@@ -148,18 +150,27 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (!((_a = quotation.schedule) == null ? void 0 : _a.length))
       return false;
-    const scheduleItems = quotation.schedule.map((s) => {
+    const scheduleItems = [];
+    quotation.schedule.forEach((s) => {
       var _a2;
       const full = (_a2 = this.scheduleResolver) == null ? void 0 : _a2.call(this, s.id);
-      if (full)
-        return full;
-      return {
+      if (full) {
+        scheduleItems.push(full);
+        return;
+      }
+      if (this.scheduleResolver) {
+        return;
+      }
+      const fallbackSchedule = {
         ...s,
         repeat_type: s.repeat_type || "none",
         repeat_rule: s.repeat_rule || null,
         time_slot: s.time_slot || []
       };
+      scheduleItems.push(fallbackSchedule);
     });
+    if (!scheduleItems.length)
+      return false;
     return (0, import_getDateIsInSchedule.getDateIsInSchedule)(datetime, scheduleItems);
   }
   findProductData(productData, productId, variantId) {

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

@@ -32,6 +32,10 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -159,6 +159,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   filterDiscountListByType(discountList, type) {
     return (discountList || []).filter((item) => item.type === type || item.tag === type);
   }
+  /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+  excludeDiscountListByType(discountList, type) {
+    return (discountList || []).filter((item) => item.type !== type && item.tag !== type);
+  }
+  /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+  resolveDiscountListForManualOverride(discountList) {
+    return this.excludeDiscountListByType(discountList, "promotion");
+  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -673,7 +681,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }, 0);
     };
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -896,7 +904,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   price: product.price,
                   options: restoredOptions
                 },
-                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           } else {
@@ -918,14 +926,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price,
                   options: restoredOptions
                 },
-                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
+            discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || []) : this.filterDiscountListByType(((_w = flatItem.bundleItem) == null ? void 0 : _w.discount_list) || [], "promotion"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -976,13 +984,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           if (this.filterDiscountListByType(product.discount_list, "promotion").length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_w = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _w.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_x = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _x.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
-          const isDeductOptionPrice = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
+          const isDeductOptionPrice = !!((_y = selectedDiscount2.config) == null ? void 0 : _y.deductOptionPrice);
           let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
@@ -1000,7 +1008,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
           }
-          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
+          if (isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length)) {
             const optionResult = applyDiscountToOptions(
               product.options,
               selectedDiscount2
@@ -1008,7 +1016,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discountedOptions = optionResult.discountedOptions;
             optionDiscountAmount = optionResult.optionDiscountAmount;
           }
-          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
+          const optionsForLineTotal = isDeductOptionPrice && ((_A = product.options) == null ? void 0 : _A.length) ? discountedOptions : product.options;
           const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
           const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
           const mainProductDiscountAmount = amount;
@@ -1019,9 +1027,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
+              discount_card_type: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_card_type,
               fixed_amount: lineDiscountAmount,
-              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
+              discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -1103,7 +1111,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
+                discount_calculation_mode: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1177,9 +1185,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
+              discount_card_type: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
+              discount_calculation_mode: (_F = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _F.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1195,7 +1203,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
-            _num: (product.num || 1) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
+            _num: (product.num || 1) * (((_G = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _G.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);

package/lib/modules/SalesSummary/index.js

@@ -30,7 +30,8 @@ __reExport(SalesSummary_exports, require("./types"), module.exports);
 var salesSummaryDataKeys = {
   isPriceIncludeTax: "is_price_include_tax",
   taxRate: "tax_rate",
-  taxTitle: "tax_title"
+  taxTitle: "tax_title",
+  taxCountryCode: "tax_country_code"
 };
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -84,7 +85,8 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     return {
       isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
       taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
-      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
+      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
+      taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
     };
   }
   async getSummary(params) {

package/lib/modules/Schedule/index.js

@@ -135,7 +135,9 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
-    return this.store.scheduleList.filter((n) => ids.includes(n.id));
+    const idSet = new Set(ids.map((id) => String(id)));
+    const list = this.store.scheduleList.filter((n) => idSet.has(String(n.id)));
+    return list;
   }
   setAvailabilityScheduleDateList(list) {
     this.store.availabilityDateList = list;

package/lib/modules/index.d.ts

@@ -16,3 +16,4 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './BookingContext';

package/lib/modules/index.js

@@ -34,6 +34,7 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
 __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
 __reExport(modules_exports, require("./OpenData"), module.exports);
+__reExport(modules_exports, require("./BookingContext"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -53,5 +54,6 @@ __reExport(modules_exports, require("./OpenData"), module.exports);
   ...require("./Schedule"),
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
-  ...require("./OpenData")
+  ...require("./OpenData"),
+  ...require("./BookingContext")
 });

package/lib/server/index.js

@@ -931,6 +931,8 @@ var Server = class {
       return;
     }
     try {
+      await this.schedule.loadAllSchedule();
+      this.products.clearPriceCache();
       await this.products.setupQuotationPriceBridge({
         scheduleModule: this.schedule,
         channel: (_a = this.core.context) == null ? void 0 : _a.channel

package/lib/server/modules/order/utils/filterOrders.js

@@ -33,6 +33,13 @@ __export(filterOrders_exports, {
 });
 module.exports = __toCommonJS(filterOrders_exports);
 var import_dayjs = __toESM(require("dayjs"));
+function getOrderPaymentCodes(order) {
+  const payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map((item) => item == null ? void 0 : item.code).filter((code) => typeof code === "string" && code.length > 0);
+}
 function filterOrders(orders, filters) {
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
@@ -133,26 +140,27 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      const orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = order.payment_methods.some((pm) => safeFilters.payment_methods.includes(pm));
+      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
       if (!hasMatch) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

package/lib/server/modules/products/index.js

@@ -177,7 +177,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
    */
   async setupQuotationPriceBridge(params) {
-    var _a, _b, _c;
+    var _a;
     if (!this.core) {
       this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
       return;
@@ -190,15 +190,14 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
-      const scheduleList = ((_c = (_b = params.scheduleModule).getScheduleList) == null ? void 0 : _c.call(_b)) || [];
-      const scheduleMap = new Map(
-        scheduleList.map((schedule) => [schedule.id, schedule])
-      );
       this.quotationPriceBridge.setScheduleResolver((id) => {
-        var _a2, _b2;
-        if (scheduleMap.has(id))
-          return scheduleMap.get(id);
-        const schedules = ((_b2 = (_a2 = params.scheduleModule).getScheduleByIds) == null ? void 0 : _b2.call(_a2, [id])) || [];
+        var _a2, _b, _c, _d, _e, _f;
+        const scheduleId = String(id);
+        const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+        const schedule = scheduleList.find((item) => String(item.id) === scheduleId);
+        if (schedule)
+          return schedule;
+        const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
         return schedules[0];
       });
     }

package/lib/server/modules/schedule/index.js

@@ -183,8 +183,9 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
       return [];
     }
     const result = [];
+    const scheduleList = this.store.scheduleList || [];
     for (const id of ids) {
-      const schedule = this.store.map.get(id);
+      const schedule = this.store.map.get(id) || scheduleList.find((item) => String(item.id) === String(id));
       if (schedule) {
         result.push(schedule);
       }