@pisell/pisellos 2.2.181 → 2.2.182

package/lib/modules/Quotation/index.js

@@ -43,8 +43,6 @@ 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";
     }
@@ -53,10 +51,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       query,
       { useCache: false }
     );
-    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
-    );
+    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
     list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
@@ -74,9 +69,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)
@@ -128,9 +125,6 @@ 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)
@@ -148,18 +142,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;
@@ -507,7 +515,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       }
     });
-    console.log("occupiedItems", occupiedItems, "orderLevelDiscountApplicableItems", orderLevelDiscountApplicableItems);
     sortedDiscountList.forEach((discount) => {
       if (!(0, import_utils3.isOrderLevelFixedAmountDiscount)(discount)) {
         return;
@@ -673,7 +680,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 +903,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 +925,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 +983,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 +1007,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 +1015,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 +1026,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 +1110,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 +1184,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 +1202,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);
@@ -1509,25 +1516,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   }
                 });
               }
-              let newTotal = Number(mainProductData.price || 0);
+              const mainSellingPrice = mainProductData.main_product_selling_price ?? mainProductData.price ?? 0;
+              let newTotal = Number(mainSellingPrice || 0);
               let newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
               const isManualDiscount = typeof mainProductData.isManualDiscount === "boolean" ? mainProductData.isManualDiscount : mainProductData.total != mainProductData.origin_total && (!((_a = mainProductData.discount_list) == null ? void 0 : _a.length) || ((_c = (_b = mainProductData == null ? void 0 : mainProductData.discount_list) == null ? void 0 : _b.every) == null ? void 0 : _c.call(_b, (item) => item.type === "product")));
               if (isManualDiscount) {
                 newTotal = mainProductData.total ?? newTotal;
                 newOriginTotal = mainProductData.origin_total ?? newOriginTotal;
               } else {
-                const mainDiscountList = mainProductData.discount_list.filter((item) => {
-                  var _a2;
-                  return !((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-                });
-                if (mainDiscountList && mainDiscountList.length > 0) {
-                  const allDiscountAmount = (0, import_utils.getDiscountListAmount)(mainDiscountList);
-                  newTotal = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotal;
-                  newOriginTotal = mainProductData.origin_total ?? newOriginTotal;
-                }
                 if (newBundle.length > 0) {
                   newBundle.forEach((item) => {
-                    newTotal += Number(item.price) * Number(item.num);
+                    const bundleSellingPrice = item.bundle_selling_price ?? item.price;
+                    newTotal += Number(bundleSellingPrice) * Number(item.num);
                   });
                   newBundle.forEach((item) => {
                     var _a2, _b2, _c2;
@@ -1618,7 +1618,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         appliedProductDetails: []
       };
     });
-    console.log(processedProductList, "processedProductList");
     return {
       productList: processedProductList,
       discountList: [...editModeDiscount, ...updatedDiscountList]

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

@@ -53,6 +53,7 @@ type ProductDetail = {
     vouchersApplicable?: boolean;
     holder_id?: number;
     startDate?: any;
+    main_product_selling_price?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

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

@@ -236,6 +236,7 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       isChargeTax: product.is_charge_tax ?? 0
     });
     const mainTaxRounded = mainTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+    product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
     if (mainTaxPrecise.gt(0)) {
       lastTaxableItem = { type: "main", item: product };
     }
@@ -258,15 +259,16 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       const bundleQuantity = new import_decimal.default(getSafeNum(bundleItem.num ?? bundleItem.quantity));
       const bundlePrice = toDecimal(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
       const bundleOriginalPrice = toDecimal(bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? 0);
+      const bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
       const bundleTaxPrecise = calculateSingleItemTax({
-        price: bundlePrice,
+        price: bundlePrice.plus(bundleSurchargeFee),
         taxRate: rate,
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0
       });
       const bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
       const bundleOrigTaxPrecise = calculateSingleItemTax({
-        price: bundleOriginalPrice,
+        price: bundleOriginalPrice.plus(bundleSurchargeFee),
         taxRate: rate,
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0
@@ -332,7 +334,6 @@ function createEmptySalesSummary() {
   };
 }
 function calculateSalesSummary(params) {
-  var _a;
   const {
     products,
     isPriceIncludeTax,
@@ -379,7 +380,20 @@ function calculateSalesSummary(params) {
     ) || 0
   );
   for (let i = 0; i < products.length; i++) {
-    products[i].surcharge_fee = ((_a = surchargeServiceItems[i]) == null ? void 0 : _a.surcharge_fee) || 0;
+    const sourceItem = surchargeServiceItems[i] || {};
+    const product = products[i];
+    product.surcharge_fee = sourceItem.surcharge_fee || 0;
+    const relationSurchargeIds = Array.isArray(sourceItem.relation_surcharge_ids) ? sourceItem.relation_surcharge_ids : [];
+    const hasSurcharge = new import_decimal.default(product.surcharge_fee || 0).gt(0) || relationSurchargeIds.length > 0;
+    if (hasSurcharge) {
+      product.main_product_attached_bundle_surcharge_fee = toFixed2(product.surcharge_fee);
+    }
+    if (relationSurchargeIds.length > 0) {
+      product.relation_surcharge_ids = sourceItem.relation_surcharge_ids;
+    }
+    if (hasSurcharge && sourceItem.surcharge_rounding_remainder !== void 0) {
+      product.surcharge_rounding_remainder = sourceItem.surcharge_rounding_remainder;
+    }
   }
   const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
   let productTaxFee;
@@ -393,8 +407,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 +426,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/index.d.ts

@@ -18,6 +18,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private resourceIdIndex;
     private logger;
     private storage;
+    private orderSQLiteSaveQueue;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
@@ -130,6 +131,28 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
+    /**
+     * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+     *
+     * @example
+     * await this.runInOrderSQLiteSaveQueue(async () => {
+     *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+     *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+     * })
+     */
+    private runInOrderSQLiteSaveQueue;
+    /**
+     * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+     *
+     * @example
+     * await this.saveOrdersToSQLite(this.store.list)
+     */
     private saveOrdersToSQLite;
+    /**
+     * 清空订单模块的内存数据和本地 SQLite 订单表。
+     *
+     * @example
+     * await orderModule.clear()
+     */
     clear(): Promise<void>;
 }

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

@@ -50,6 +50,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.isIdlePhase = true;
     // Map<resource_id, OrderId[]> 资源到订单的倒排索引
     this.resourceIdIndex = /* @__PURE__ */ new Map();
+    this.orderSQLiteSaveQueue = Promise.resolve();
   }
   async initialize(core, options) {
     var _a, _b;
@@ -743,36 +744,67 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
+  /**
+   * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+   *
+   * @example
+   * await this.runInOrderSQLiteSaveQueue(async () => {
+   *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+   *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+   * })
+   */
+  async runInOrderSQLiteSaveQueue(task) {
+    const queuedTask = this.orderSQLiteSaveQueue.then(task, task);
+    this.orderSQLiteSaveQueue = queuedTask.then(() => void 0, () => void 0);
+    return queuedTask;
+  }
+  /**
+   * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+   *
+   * @example
+   * await this.saveOrdersToSQLite(this.store.list)
+   */
   async saveOrdersToSQLite(orderList) {
     if (!this.dbManager)
       return;
+    const orderListSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
     try {
-      this.logInfo("saveOrdersToSQLite-开始", {
-        count: orderList.length
-      });
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
-      this.logInfo("saveOrdersToSQLite-clear完成", {
-        count: orderList.length
-      });
-      if (orderList.length === 0)
-        return;
-      await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderList);
-      this.logInfo("saveOrdersToSQLite-bulkAdd完成", {
-        count: orderList.length
+      await this.runInOrderSQLiteSaveQueue(async () => {
+        this.logInfo("saveOrdersToSQLite-开始", {
+          count: orderListSnapshot.length
+        });
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
+        this.logInfo("saveOrdersToSQLite-clear完成", {
+          count: orderListSnapshot.length
+        });
+        if (orderListSnapshot.length === 0)
+          return;
+        await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
+        this.logInfo("saveOrdersToSQLite-bulkAdd完成", {
+          count: orderListSnapshot.length
+        });
       });
     } catch (error) {
       this.logError("保存订单到 SQLite 失败", {
         error: error instanceof Error ? error.message : String(error),
-        orderList: orderList.length
+        orderList: orderListSnapshot.length
       });
     }
   }
+  /**
+   * 清空订单模块的内存数据和本地 SQLite 订单表。
+   *
+   * @example
+   * await orderModule.clear()
+   */
   async clear() {
     this.store.list = [];
     this.store.map = /* @__PURE__ */ new Map();
     this.resourceIdIndex.clear();
     if (this.dbManager) {
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
+      await this.runInOrderSQLiteSaveQueue(async () => {
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
+      });
     }
     this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, "");
     this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, this.store.list);