@pisell/pisellos 2.2.175 → 2.2.176

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/SalesSummary/utils.js

@@ -393,8 +393,8 @@ function calculateSalesSummary(params) {
     );
   }
   const shopDiscountAmount = import_decimal.default.max(new import_decimal.default(Number(shopDiscount) || 0), 0);
-  const expectAmount = import_decimal.default.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
-  const totalAmount = isPriceIncludeTax === 1 ? expectAmount : expectAmount.plus(productTaxFee);
+  const preTaxExpectAmount = import_decimal.default.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
+  const totalAmount = isPriceIncludeTax === 1 ? preTaxExpectAmount : preTaxExpectAmount.plus(productTaxFee);
   const deposit = calculateProductsDeposit(products);
   return {
     product_quantity: productQuantity,
@@ -412,7 +412,7 @@ function calculateSalesSummary(params) {
     ),
     deposit_amount: deposit ? deposit.total : "0.00",
     deposit,
-    expect_amount: toFixed2(expectAmount),
+    expect_amount: toFixed2(totalAmount),
     total_amount: toFixed2(totalAmount),
     total_refund_amount: "0.00",
     customer_paid_amount: "0.00",

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

@@ -149,10 +149,11 @@ var Server = class {
      */
     this.handleProductQuery = async ({ url, method, data, config }) => {
       console.log("[Server] handleProductQuery:", url, method, data, config);
-      const { menu_list_ids, schedule_datetime, schedule_date, customer_id } = data;
+      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids } = data;
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
+        ids,
         schedule_datetime,
         schedule_date,
         customer_id
@@ -160,14 +161,14 @@ var Server = class {
       if (subscriberId && typeof callback === "function") {
         this.productQuerySubscribers.set(subscriberId, {
           callback,
-          context: { menu_list_ids, schedule_date, schedule_datetime, customer_id }
+          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id }
         });
         this.logInfo("handleProductQuery: 已注册订阅者", {
           subscriberId,
           totalSubscribers: this.productQuerySubscribers.size
         });
       }
-      return this.computeProductQueryResult({ menu_list_ids, schedule_date, schedule_datetime, customer_id });
+      return this.computeProductQueryResult({ menu_list_ids, ids, schedule_date, schedule_datetime, customer_id });
     };
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
@@ -931,6 +932,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
@@ -2049,9 +2052,11 @@ var Server = class {
    */
   async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
-    const { menu_list_ids, schedule_date, schedule_datetime, customer_id, product_id } = context;
+    const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, product_id } = context;
+    const queryIds = Array.isArray(ids) ? ids.map((id) => Number(id)).filter((id) => Number.isFinite(id)) : [];
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
+      ids: queryIds,
       schedule_datetime,
       schedule_date,
       customer_id,
@@ -2062,6 +2067,38 @@ var Server = class {
       this.logError("computeProductQueryResult: Products 模块未注册");
       return { message: "Products 模块未注册", data: { list: [], count: 0 } };
     }
+    if (queryIds.length > 0) {
+      const uniqueIds = Array.from(new Set(queryIds));
+      const tPrice2 = performance.now();
+      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule(),
+        schedule_datetime,
+        customer_id
+      }, {
+        changedIds: options == null ? void 0 : options.changedIds,
+        productIds: uniqueIds
+      });
+      (0, import_product.perfMark)("computeQuery.getProductsWithPrice(ids)", performance.now() - tPrice2, {
+        count: productsWithPrice.length,
+        ids: uniqueIds
+      });
+      const filteredProducts2 = productsWithPrice.filter((p) => uniqueIds.includes(Number(p == null ? void 0 : p.id))).filter((p) => ((p == null ? void 0 : p.status) || "published") === "published");
+      (0, import_product.perfMark)("computeProductQueryResult", performance.now() - tTotal, {
+        mode: "ids",
+        ids: uniqueIds,
+        count: filteredProducts2.length
+      });
+      this.logInfo("computeProductQueryResult 完成（ids）", {
+        ids: uniqueIds,
+        count: filteredProducts2.length
+      });
+      return {
+        code: 200,
+        data: { list: filteredProducts2, count: filteredProducts2.length },
+        message: "",
+        status: true
+      };
+    }
     if (product_id != null && Number.isFinite(Number(product_id))) {
       const pid = Number(product_id);
       const tPrice2 = performance.now();

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.d.ts

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

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

@@ -44,6 +44,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.formatters = [];
     // 是否已注册内置价格格式化器
     this.isPriceFormatterRegistered = false;
+    this.quotationBridgeLoadedKey = "";
     this.pendingSyncMessages = [];
   }
   async initialize(core, options) {
@@ -177,7 +178,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 +191,25 @@ 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])
-      );
+      const scheduleCache = /* @__PURE__ */ new Map();
+      let hasLoadedScheduleList = false;
       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);
+        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]);
         return schedules[0];
       });
     }
@@ -210,8 +221,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async refreshQuotationPriceBridge(params) {
     if (!this.quotationPriceBridge)
       return;
-    const customerId = params && "customer_id" in params ? params.customer_id : this.quotationBridgeCustomerId;
-    const refreshKey = this.getQuotationBridgeScopeKey(customerId);
+    const refreshKey = this.getQuotationBridgeScopeKey();
     if (this.quotationBridgeRefreshPromise && this.quotationBridgeRefreshKey === refreshKey) {
       await this.quotationBridgeRefreshPromise;
       return;
@@ -221,10 +231,9 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
     this.quotationBridgeRefreshKey = refreshKey;
     this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
-      channel: this.quotationBridgeChannel,
-      customer_id: customerId
+      channel: this.quotationBridgeChannel
     }).then(() => {
-      this.quotationBridgeCustomerId = customerId;
+      this.quotationBridgeLoadedKey = refreshKey;
     }).finally(() => {
       this.quotationBridgeRefreshPromise = void 0;
       this.quotationBridgeRefreshKey = void 0;
@@ -243,12 +252,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (this.quotationBridgeRefreshPromise) {
       await this.quotationBridgeRefreshPromise;
     }
-    if (this.getQuotationBridgeScopeKey(customerId) !== this.getQuotationBridgeScopeKey(this.quotationBridgeCustomerId)) {
+    if (this.getQuotationBridgeScopeKey() !== this.quotationBridgeLoadedKey) {
       await this.refreshQuotationPriceBridge({ customer_id: customerId });
     }
   }
-  getQuotationBridgeScopeKey(customerId) {
-    return `${this.quotationBridgeChannel || ""}:${customerId ?? ""}`;
+  getQuotationBridgeScopeKey() {
+    return this.quotationBridgeChannel || "";
   }
   buildPriceDataFromQuotation(product, datetime, customerId) {
     var _a;
@@ -258,10 +267,11 @@ 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(product.base_price ?? product.price ?? 0),
+      base_price: String(productBasePrice),
       variant: this.buildVariantPriceData(product, datetime, customerId),
       bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
     };
@@ -278,7 +288,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         customer_id: customerId
       });
       const price = quotedPrice ?? variant.price ?? product.price ?? 0;
-      const basePrice = variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
+      const basePrice = quotedPrice ?? variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
       return {
         id: Number(variant.id),
         product_id: Number(variant.product_id ?? product.id),
@@ -303,7 +313,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           customer_id: customerId
         });
         const price = quotedPrice ?? item.price ?? 0;
-        const basePrice = item.base_price ?? item.price ?? 0;
+        const basePrice = quotedPrice ?? 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,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);
       }