@pisell/pisellos 2.2.174 → 2.2.175

package/lib/modules/Quotation/index.js

@@ -43,6 +43,8 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     const query = {};
     if (params == null ? void 0 : params.channel)
       query.channel = params.channel;
+    if (params == null ? void 0 : params.customer_id)
+      query.customer_id = String(params.customer_id);
     if ((params == null ? void 0 : params.channel) === "online_store") {
       query.channel = "online-store";
     }
@@ -51,7 +53,10 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       query,
       { useCache: false }
     );
-    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
+    const list = this.filterQuotationsByCustomer(
+      ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [],
+      params == null ? void 0 : params.customer_id
+    );
     list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
@@ -69,11 +74,9 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   getPriceForProduct(params) {
     const { productId, variantId, datetime, customer_id } = params;
     for (const quotation of this.store.list) {
-      const visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
-      if (!visible)
+      if (!this.isQuotationVisibleForCustomer(quotation, customer_id))
         continue;
-      const active = this.isQuotationActiveAt(quotation, datetime);
-      if (!active)
+      if (!this.isQuotationActiveAt(quotation, datetime))
         continue;
       const match = this.findProductData(quotation.product_data, productId, variantId);
       if (!match)
@@ -125,6 +128,9 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   setScheduleResolver(resolver) {
     this.scheduleResolver = resolver;
   }
+  filterQuotationsByCustomer(list, customerId) {
+    return list.filter((quotation) => this.isQuotationVisibleForCustomer(quotation, customerId));
+  }
   isQuotationVisibleForCustomer(quotation, customerId) {
     const customers = quotation.customer || [];
     if (customers.length === 0)
@@ -142,27 +148,18 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (!((_a = quotation.schedule) == null ? void 0 : _a.length))
       return false;
-    const scheduleItems = [];
-    quotation.schedule.forEach((s) => {
+    const scheduleItems = quotation.schedule.map((s) => {
       var _a2;
       const full = (_a2 = this.scheduleResolver) == null ? void 0 : _a2.call(this, s.id);
-      if (full) {
-        scheduleItems.push(full);
-        return;
-      }
-      if (this.scheduleResolver) {
-        return;
-      }
-      const fallbackSchedule = {
+      if (full)
+        return full;
+      return {
         ...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,10 +32,6 @@ 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,14 +159,6 @@ 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;
@@ -681,7 +673,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, _G;
+      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;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -904,7 +896,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   price: product.price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           } else {
@@ -926,14 +918,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            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"),
+            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -984,13 +976,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(((_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) {
+          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) {
             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 = !!((_y = selectedDiscount2.config) == null ? void 0 : _y.deductOptionPrice);
+          const isDeductOptionPrice = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
           let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
@@ -1008,7 +1000,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
           }
-          if (isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length)) {
+          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
             const optionResult = applyDiscountToOptions(
               product.options,
               selectedDiscount2
@@ -1016,7 +1008,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discountedOptions = optionResult.discountedOptions;
             optionDiscountAmount = optionResult.optionDiscountAmount;
           }
-          const optionsForLineTotal = isDeductOptionPrice && ((_A = product.options) == null ? void 0 : _A.length) ? discountedOptions : product.options;
+          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
           const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
           const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
           const mainProductDiscountAmount = amount;
@@ -1027,9 +1019,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_card_type,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
               fixed_amount: lineDiscountAmount,
-              discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -1111,7 +1103,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.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.origin_total,
@@ -1185,9 +1177,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: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_card_type,
+              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_F = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _F.discount_calculation_mode,
+              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1203,7 +1195,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) * (((_G = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _G.num) || 1)
+            _num: (product.num || 1) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);

package/lib/modules/SalesSummary/index.js

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

package/lib/modules/Schedule/index.js

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

package/lib/modules/index.d.ts

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

package/lib/modules/index.js

@@ -34,7 +34,6 @@ __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"),
@@ -54,6 +53,5 @@ __reExport(modules_exports, require("./BookingContext"), module.exports);
   ...require("./Schedule"),
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
-  ...require("./OpenData"),
-  ...require("./BookingContext")
+  ...require("./OpenData")
 });

package/lib/server/index.js

@@ -931,8 +931,6 @@ 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,13 +33,6 @@ __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)) {
@@ -140,27 +133,26 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      const orderPaymentCodes = getOrderPaymentCodes(order);
-      if (orderPaymentCodes.length === 0) {
+      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payments,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
+      const hasMatch = order.payment_methods.some((pm) => safeFilters.payment_methods.includes(pm));
       if (!hasMatch) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: orderPaymentCodes,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });

package/lib/server/modules/products/index.d.ts

@@ -21,7 +21,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeLoadedKey?;
+    private quotationBridgeCustomerId?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;

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

@@ -44,7 +44,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.formatters = [];
     // 是否已注册内置价格格式化器
     this.isPriceFormatterRegistered = false;
-    this.quotationBridgeLoadedKey = "";
     this.pendingSyncMessages = [];
   }
   async initialize(core, options) {
@@ -178,7 +177,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
    */
   async setupQuotationPriceBridge(params) {
-    var _a;
+    var _a, _b, _c;
     if (!this.core) {
       this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
       return;
@@ -191,25 +190,15 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
-      const scheduleCache = /* @__PURE__ */ new Map();
-      let hasLoadedScheduleList = false;
+      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, _b, _c, _d, _e, _f;
-        const scheduleId = String(id);
-        if (scheduleCache.has(scheduleId))
-          return scheduleCache.get(scheduleId);
-        if (!hasLoadedScheduleList) {
-          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
-          for (const schedule of scheduleList) {
-            scheduleCache.set(String(schedule.id), schedule);
-          }
-          hasLoadedScheduleList = true;
-        }
-        if (scheduleCache.has(scheduleId))
-          return scheduleCache.get(scheduleId);
-        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])) || [];
-        if (schedules[0])
-          scheduleCache.set(scheduleId, schedules[0]);
+        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])) || [];
         return schedules[0];
       });
     }
@@ -221,7 +210,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async refreshQuotationPriceBridge(params) {
     if (!this.quotationPriceBridge)
       return;
-    const refreshKey = this.getQuotationBridgeScopeKey();
+    const customerId = params && "customer_id" in params ? params.customer_id : this.quotationBridgeCustomerId;
+    const refreshKey = this.getQuotationBridgeScopeKey(customerId);
     if (this.quotationBridgeRefreshPromise && this.quotationBridgeRefreshKey === refreshKey) {
       await this.quotationBridgeRefreshPromise;
       return;
@@ -231,9 +221,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
     this.quotationBridgeRefreshKey = refreshKey;
     this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
-      channel: this.quotationBridgeChannel
+      channel: this.quotationBridgeChannel,
+      customer_id: customerId
     }).then(() => {
-      this.quotationBridgeLoadedKey = refreshKey;
+      this.quotationBridgeCustomerId = customerId;
     }).finally(() => {
       this.quotationBridgeRefreshPromise = void 0;
       this.quotationBridgeRefreshKey = void 0;
@@ -252,12 +243,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (this.quotationBridgeRefreshPromise) {
       await this.quotationBridgeRefreshPromise;
     }
-    if (this.getQuotationBridgeScopeKey() !== this.quotationBridgeLoadedKey) {
+    if (this.getQuotationBridgeScopeKey(customerId) !== this.getQuotationBridgeScopeKey(this.quotationBridgeCustomerId)) {
       await this.refreshQuotationPriceBridge({ customer_id: customerId });
     }
   }
-  getQuotationBridgeScopeKey() {
-    return this.quotationBridgeChannel || "";
+  getQuotationBridgeScopeKey(customerId) {
+    return `${this.quotationBridgeChannel || ""}:${customerId ?? ""}`;
   }
   buildPriceDataFromQuotation(product, datetime, customerId) {
     var _a;
@@ -267,11 +258,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       customer_id: customerId
     });
     const productPrice = quotedPrice ?? product.price;
-    const productBasePrice = quotedPrice ?? product.base_price ?? product.price ?? 0;
     return {
       id: product.id,
       price: String(productPrice ?? 0),
-      base_price: String(productBasePrice),
+      base_price: String(product.base_price ?? product.price ?? 0),
       variant: this.buildVariantPriceData(product, datetime, customerId),
       bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
     };
@@ -288,7 +278,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         customer_id: customerId
       });
       const price = quotedPrice ?? variant.price ?? product.price ?? 0;
-      const basePrice = quotedPrice ?? variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
+      const basePrice = variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
       return {
         id: Number(variant.id),
         product_id: Number(variant.product_id ?? product.id),
@@ -313,7 +303,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           customer_id: customerId
         });
         const price = quotedPrice ?? item.price ?? 0;
-        const basePrice = quotedPrice ?? item.base_price ?? item.price ?? 0;
+        const basePrice = item.base_price ?? item.price ?? 0;
         return {
           id: Number(item.id),
           product_id: Number(item.product_id ?? product.id),

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

@@ -183,9 +183,8 @@ 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) || scheduleList.find((item) => String(item.id) === String(id));
+      const schedule = this.store.map.get(id);
       if (schedule) {
         result.push(schedule);
       }

package/lib/solution/BaseSales/index.d.ts

@@ -1,8 +1,8 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder } from '../../modules/Order/types';
+import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -11,7 +11,6 @@ import { ProductList } from '../../modules/ProductList';
 import { PaymentModule } from '../../modules/Payment';
 import type { SalesSummaryModule } from '../../modules/SalesSummary';
 import type { ScheduleModule } from '../../modules/Schedule';
-import { QuotationModule } from '../../modules/Quotation';
 import type { ISalesDetail, ISalesDetailHeader, ISalesBooking, ISalesPayment, ISalesSurcharge } from './utils/parseSalesResponse';
 import { type TransformBaseProductToOrderProductParams } from './utils/transformBaseProductToOrderProduct';
 export interface BaseSalesState {
@@ -20,7 +19,6 @@ export interface BaseSalesState {
     payment?: PaymentModule;
     salesSummary?: SalesSummaryModule;
     schedule?: ScheduleModule;
-    quotation?: QuotationModule;
 }
 export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -28,7 +26,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
     private logger;
-    private appPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
     protected cacheId: string | undefined;
@@ -39,12 +36,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     window: WindowPlugin;
     request: RequestPlugin;
     protected currentSalesDetail: ISalesDetail | null;
-    protected discountConfigCacheKey: string | null;
-    protected hasManualDiscountSelection: boolean;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
-     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment / quotation。
+     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment。
      */
     protected getRegisteredModuleNames(): readonly string[];
     /**
@@ -60,10 +55,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     private logError;
     get payment(): PaymentModule | undefined;
-    private getCurrentOrderCustomerId;
-    private applyQuotationScheduleResolver;
-    private loadQuotationForPriceQuery;
-    protected getSubmitOrderSalesChannel(): string | undefined;
     /**
      * 工厂入口：根据子模块名实例化对应模块。
      * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），
@@ -76,8 +67,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * sessionStorage 损坏时静默忽略，按空状态注册。
      */
     protected readSessionCacheData(): Record<string, any>;
-    private getAppData;
-    private syncAppDataToTempOrder;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     /**
@@ -102,59 +91,27 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getPayments(): ISalesPayment[];
     /** 获取附加费用（运费/服务费/税费等）。 */
     getSurcharges(): ISalesSurcharge[];
-    getTempOrder(): OrderTempOrder | null;
-    replaceTempOrder(tempOrder: OrderTempOrder): Promise<OrderTempOrder>;
+    getTempOrder(): import("../../modules/Order/types").OrderTempOrder | null;
     getOrderIdentity(): import("../../modules/Order/types").OrderIdentitySnapshot | null;
     getOrderSnapshot(): import("../../modules/Order/types").OrderSnapshot | null;
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
     updateTempOrderNote(note: string): string;
-    updateTempOrderNote(note: string, sync: true): Promise<string>;
-    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
-    updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
-    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
-    setEnableTempOrderPersist(enabled: boolean): void;
-    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
-    isTempOrderPersistEnabled(): boolean;
     private ensureTempOrder;
-    addNewOrder(): Promise<OrderTempOrder>;
+    addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     saveDraft(): Promise<void>;
-    restoreOrder(): Promise<OrderTempOrder>;
-    /**
-     * 仅清空 tempOrder 购物车行（products / bookings / discount_list）。
-     * 同步清空内存中的 salesDetail 商品/预约视图，避免编辑态仍读到旧 bookings。
-     */
-    clearOrderCartLines(): Promise<OrderTempOrder>;
+    restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
     getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
-    private getHistoricalProductDiscountList;
-    private isPersistedOrderProduct;
-    private mergeHistoricalDiscountList;
-    private mergeCurrentDiscountSelectionState;
-    loadDiscountConfig(params?: {
-        customerId?: number;
-        action?: 'create' | 'edit';
-    }): Promise<{
-        productList: Record<string, any>[];
-        discountList: Discount[];
-    }>;
-    bestDiscount(cb?: (result: any) => void): Promise<{
-        productList: Record<string, any>[];
-        discountList: Discount[];
-    }>;
     getDiscountList(): Discount[];
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;
         isSelected: boolean;
     }): Promise<void>;
-    applyDiscountCalculationResult(result?: {
-        productList?: Record<string, any>[];
-        discountList?: Discount[];
-    }): Promise<void>;
     submitScanOrder<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
@@ -226,11 +183,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         submitBeforeSend?: boolean;
     }): Promise<T>;
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
-    calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    updateOrderProductQuantity(params: BaseSalesUpdateOrderProductQuantityParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    updateOrderBooking(params: UpdateOrderBookingParams): any[];
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     /**
      * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
      * 多行同 SKU 时必须传入与删除/更新一致的 unique_identification_number。