@pisell/pisellos 2.2.180 → 2.2.182

package/dist/modules/Quotation/index.js

@@ -78,22 +78,21 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               query = {};
               if (params !== null && params !== void 0 && params.channel) query.channel = params.channel;
-              if (params !== null && params !== void 0 && params.customer_id) query.customer_id = String(params.customer_id);
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              _context2.next = 6;
+              _context2.next = 5;
               return this.request.get('/quotation/available', query, {
                 useCache: false
               });
-            case 6:
+            case 5:
               res = _context2.sent;
-              list = this.filterQuotationsByCustomer((res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [], params === null || params === void 0 ? void 0 : params.customer_id);
+              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
                 return a.sort - b.sort;
               });
               this.store.list = list;
-            case 10:
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -130,8 +129,10 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var quotation = _step.value;
-          if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
-          if (!this.isQuotationActiveAt(quotation, datetime)) continue;
+          var visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
+          if (!visible) continue;
+          var active = this.isQuotationActiveAt(quotation, datetime);
+          if (!active) continue;
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match) continue;
           if (match.value === 0) continue;
@@ -218,14 +219,6 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
-  }, {
-    key: "filterQuotationsByCustomer",
-    value: function filterQuotationsByCustomer(list, customerId) {
-      var _this2 = this;
-      return list.filter(function (quotation) {
-        return _this2.isQuotationVisibleForCustomer(quotation, customerId);
-      });
-    }
   }, {
     key: "isQuotationVisibleForCustomer",
     value: function isQuotationVisibleForCustomer(quotation, customerId) {
@@ -246,18 +239,27 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this3 = this;
+        _this2 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
-      var scheduleItems = quotation.schedule.map(function (s) {
-        var _this3$scheduleResolv;
-        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
-        if (full) return full;
-        return _objectSpread(_objectSpread({}, s), {}, {
+      var scheduleItems = [];
+      quotation.schedule.forEach(function (s) {
+        var _this2$scheduleResolv;
+        var full = (_this2$scheduleResolv = _this2.scheduleResolver) === null || _this2$scheduleResolv === void 0 ? void 0 : _this2$scheduleResolv.call(_this2, s.id);
+        if (full) {
+          scheduleItems.push(full);
+          return;
+        }
+        if (_this2.scheduleResolver) {
+          return;
+        }
+        var fallbackSchedule = _objectSpread(_objectSpread({}, 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 getDateIsInSchedule(datetime, scheduleItems);
     }
   }, {

package/dist/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/dist/modules/Rules/index.js

@@ -222,6 +222,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return item.type === type || item.tag === type;
       });
     }
+
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+  }, {
+    key: "excludeDiscountListByType",
+    value: function excludeDiscountListByType(discountList, type) {
+      return (discountList || []).filter(function (item) {
+        return item.type !== type && item.tag !== type;
+      });
+    }
+
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+  }, {
+    key: "resolveDiscountListForManualOverride",
+    value: function resolveDiscountListForManualOverride(discountList) {
+      return this.excludeDiscountListByType(discountList, 'promotion');
+    }
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -760,7 +776,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       });
-      console.log('occupiedItems', occupiedItems, 'orderLevelDiscountApplicableItems', orderLevelDiscountApplicableItems);
 
       // 🔥 第三步：识别 order_level 折扣卡并预计算分摊（排除被其他专属折扣卡占用的商品）
       sortedDiscountList.forEach(function (discount) {
@@ -1208,7 +1223,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
               var _ref13, _product$_promotion$f, _product13, _product$origin_total;
@@ -1231,14 +1246,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8;
+            var _flatItem$bundleItem8, _flatItem$bundleItem9;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
+              discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this3.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -1847,7 +1862,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref14, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this3.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -1886,8 +1901,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   });
                 }
 
-                // 🔥 重新计算主商品的总价（包含bundle）
-                var newTotal = Number(mainProductData.price || 0);
+                // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
+                // 避免把主商品 discount_list 再扣一次。
+                var mainSellingPrice = (_ref14 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref14 !== void 0 ? _ref14 : 0;
+                var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
                 // 判断是否是手动折扣
@@ -1901,24 +1918,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   newTotal = (_mainProductData$tota = mainProductData.total) !== null && _mainProductData$tota !== void 0 ? _mainProductData$tota : newTotal;
                   newOriginTotal = (_mainProductData$orig3 = mainProductData.origin_total) !== null && _mainProductData$orig3 !== void 0 ? _mainProductData$orig3 : newOriginTotal;
                 } else {
-                  // 不是手动折扣时，才重新计算
-                  var _mainDiscountList = mainProductData.discount_list.filter(function (item) {
-                    var _item$metadata5;
-                    return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
-                  });
-
-                  // 如果主商品本身有折扣，需要重新计算主商品价格
-                  if (_mainDiscountList && _mainDiscountList.length > 0) {
-                    var _Decimal$minus$toNumb3, _mainProductData$orig4;
-                    var _allDiscountAmount2 = getDiscountListAmount(_mainDiscountList);
-                    newTotal = (_Decimal$minus$toNumb3 = new Decimal(mainProductData.price || 0).minus(_allDiscountAmount2).toNumber()) !== null && _Decimal$minus$toNumb3 !== void 0 ? _Decimal$minus$toNumb3 : newTotal;
-                    newOriginTotal = (_mainProductData$orig4 = mainProductData.origin_total) !== null && _mainProductData$orig4 !== void 0 ? _mainProductData$orig4 : newOriginTotal;
-                  }
-
-                  // 累加bundle的价格（只累加一次）
+                  // 累加 bundle 的折后价格（只累加一次）
                   if (newBundle.length > 0) {
                     newBundle.forEach(function (item) {
-                      newTotal += Number(item.price) * Number(item.num);
+                      var _item$bundle_selling_;
+                      var bundleSellingPrice = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price;
+                      newTotal += Number(bundleSellingPrice) * Number(item.num);
                     });
 
                     // 计算原始总价（不考虑折扣）
@@ -2020,7 +2025,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           appliedProductDetails: []
         });
       });
-      console.log(processedProductList, 'processedProductList');
       return {
         productList: processedProductList,
         discountList: [].concat(editModeDiscount, _toConsumableArray(updatedDiscountList))
@@ -2047,14 +2051,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref14 = packageScope || {},
-        scopeType = _ref14.type,
-        _ref14$exclude_bundle = _ref14.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref14$exclude_bundle === void 0 ? [] : _ref14$exclude_bundle,
-        _ref14$include_bundle = _ref14.include_bundle_product_ids,
-        include_bundle_product_ids = _ref14$include_bundle === void 0 ? [] : _ref14$include_bundle,
-        _ref14$filter = _ref14.filter,
-        filter = _ref14$filter === void 0 ? 0 : _ref14$filter;
+      var _ref15 = packageScope || {},
+        scopeType = _ref15.type,
+        _ref15$exclude_bundle = _ref15.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref15$exclude_bundle === void 0 ? [] : _ref15$exclude_bundle,
+        _ref15$include_bundle = _ref15.include_bundle_product_ids,
+        include_bundle_product_ids = _ref15$include_bundle === void 0 ? [] : _ref15$include_bundle,
+        _ref15$filter = _ref15.filter,
+        filter = _ref15$filter === void 0 ? 0 : _ref15$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
 
@@ -2069,10 +2073,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
-          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
+          var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
+          var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
           // 主商品id
           var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
           // original_price 对应：
@@ -2139,10 +2143,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem11, _flatItem$bundleItem12;
+          var _flatItem$bundleItem12, _flatItem$bundleItem13;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
+          var _priceType = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem13 = flatItem.bundleItem) === null || _flatItem$bundleItem13 === void 0 ? void 0 : _flatItem$bundleItem13.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"

package/dist/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/dist/modules/SalesSummary/index.js

@@ -27,7 +27,8 @@ export * from "./types";
 var salesSummaryDataKeys = {
   isPriceIncludeTax: 'is_price_include_tax',
   taxRate: 'tax_rate',
-  taxTitle: 'tax_title'
+  taxTitle: 'tax_title',
+  taxCountryCode: 'tax_country_code'
 };
 export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesSummaryModule, _BaseModule);
@@ -135,7 +136,8 @@ export var SalesSummaryModule = /*#__PURE__*/function (_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)
       };
     }
   }, {

package/dist/modules/SalesSummary/utils.js

@@ -280,6 +280,7 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         isChargeTax: (_product$is_charge_ta2 = product.is_charge_tax) !== null && _product$is_charge_ta2 !== void 0 ? _product$is_charge_ta2 : 0
       });
       var mainTaxRounded = mainTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+      product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
       if (mainTaxPrecise.gt(0)) {
         lastTaxableItem = {
           type: 'main',
@@ -313,15 +314,16 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
           var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num2 = bundleItem.num) !== null && _bundleItem$num2 !== void 0 ? _bundleItem$num2 : bundleItem.quantity));
           var bundlePrice = toDecimal((_ref4 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
           var bundleOriginalPrice = toDecimal((_ref5 = (_ref6 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
           var bundleTaxPrecise = calculateSingleItemTax({
-            price: bundlePrice,
+            price: bundlePrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
             isChargeTax: (_ref7 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
           });
           var bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           var bundleOrigTaxPrecise = calculateSingleItemTax({
-            price: bundleOriginalPrice,
+            price: bundleOriginalPrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
             isChargeTax: (_ref8 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref8 !== void 0 ? _ref8 : 0
@@ -444,8 +446,20 @@ export function calculateSalesSummary(params) {
     isEdit: false
   }) || 0);
   for (var i = 0; i < products.length; i++) {
-    var _surchargeServiceItem;
-    products[i].surcharge_fee = ((_surchargeServiceItem = surchargeServiceItems[i]) === null || _surchargeServiceItem === void 0 ? void 0 : _surchargeServiceItem.surcharge_fee) || 0;
+    var sourceItem = surchargeServiceItems[i] || {};
+    var product = products[i];
+    product.surcharge_fee = sourceItem.surcharge_fee || 0;
+    var relationSurchargeIds = Array.isArray(sourceItem.relation_surcharge_ids) ? sourceItem.relation_surcharge_ids : [];
+    var hasSurcharge = new Decimal(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 !== undefined) {
+      product.surcharge_rounding_remainder = sourceItem.surcharge_rounding_remainder;
+    }
   }
   var hasTaxRate = taxRate !== undefined && taxRate !== null && taxRate > 0;
   var productTaxFee;
@@ -458,8 +472,8 @@ export function calculateSalesSummary(params) {
     }, new Decimal(0));
   }
   var shopDiscountAmount = Decimal.max(new Decimal(Number(shopDiscount) || 0), 0);
-  var expectAmount = Decimal.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
-  var totalAmount = isPriceIncludeTax === 1 ? expectAmount : expectAmount.plus(productTaxFee);
+  var preTaxExpectAmount = Decimal.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
+  var totalAmount = isPriceIncludeTax === 1 ? preTaxExpectAmount : preTaxExpectAmount.plus(productTaxFee);
   var deposit = calculateProductsDeposit(products);
   return {
     product_quantity: productQuantity,
@@ -475,7 +489,7 @@ export function calculateSalesSummary(params) {
     discount_amount: toFixed2(Decimal.max(productOriginalAmount.minus(productAmount), 0).plus(shopDiscountAmount)),
     deposit_amount: deposit ? deposit.total : '0.00',
     deposit: deposit,
-    expect_amount: toFixed2(expectAmount),
+    expect_amount: toFixed2(totalAmount),
     total_amount: toFixed2(totalAmount),
     total_refund_amount: '0.00',
     customer_paid_amount: '0.00',

package/dist/modules/Schedule/index.js

@@ -205,9 +205,13 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      return this.store.scheduleList.filter(function (n) {
-        return ids.includes(n.id);
+      var idSet = new Set(ids.map(function (id) {
+        return String(id);
+      }));
+      var list = this.store.scheduleList.filter(function (n) {
+        return idSet.has(String(n.id));
       });
+      return list;
     }
   }, {
     key: "setAvailabilityScheduleDateList",

package/dist/modules/index.d.ts

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

package/dist/modules/index.js

@@ -15,4 +15,5 @@ export * from "./SalesSummary";
 export * from "./Schedule";
 export * from "./Quotation";
 export * from "./ScanOrderLogger";
-export * from "./OpenData";
+export * from "./OpenData";
+export * from "./BookingContext";

package/dist/server/index.js

@@ -168,16 +168,17 @@ var Server = /*#__PURE__*/function () {
      */
     _defineProperty(this, "handleProductQuery", /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-        var url, method, data, config, menu_list_ids, schedule_datetime, schedule_date, customer_id, _ref3, callback, subscriberId;
+        var url, method, data, config, menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, _ref3, callback, subscriberId;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               url = _ref.url, method = _ref.method, data = _ref.data, config = _ref.config;
               console.log('[Server] handleProductQuery:', url, method, data, config);
-              menu_list_ids = data.menu_list_ids, schedule_datetime = data.schedule_datetime, schedule_date = data.schedule_date, customer_id = data.customer_id;
+              menu_list_ids = data.menu_list_ids, schedule_datetime = data.schedule_datetime, schedule_date = data.schedule_date, customer_id = data.customer_id, ids = data.ids;
               _ref3 = config || {}, callback = _ref3.callback, subscriberId = _ref3.subscriberId;
               _this.logInfo('handleProductQuery: 开始处理商品查询请求', {
                 menu_list_ids: menu_list_ids,
+                ids: ids,
                 schedule_datetime: schedule_datetime,
                 schedule_date: schedule_date,
                 customer_id: customer_id
@@ -189,6 +190,7 @@ var Server = /*#__PURE__*/function () {
                   callback: callback,
                   context: {
                     menu_list_ids: menu_list_ids,
+                    ids: ids,
                     schedule_date: schedule_date,
                     schedule_datetime: schedule_datetime,
                     customer_id: customer_id
@@ -201,6 +203,7 @@ var Server = /*#__PURE__*/function () {
               }
               return _context.abrupt("return", _this.computeProductQueryResult({
                 menu_list_ids: menu_list_ids,
+                ids: ids,
                 schedule_date: schedule_date,
                 schedule_datetime: schedule_datetime,
                 customer_id: customer_id
@@ -1608,26 +1611,30 @@ var Server = /*#__PURE__*/function () {
             case 6:
               _context18.prev = 6;
               _context18.next = 9;
+              return this.schedule.loadAllSchedule();
+            case 9:
+              this.products.clearPriceCache();
+              _context18.next = 12;
               return this.products.setupQuotationPriceBridge({
                 scheduleModule: this.schedule,
                 channel: (_this$core$context = this.core.context) === null || _this$core$context === void 0 ? void 0 : _this$core$context.channel
               });
-            case 9:
+            case 12:
               this.logInfo('Products 报价单价格桥接初始化完成');
-              _context18.next = 16;
+              _context18.next = 19;
               break;
-            case 12:
-              _context18.prev = 12;
+            case 15:
+              _context18.prev = 15;
               _context18.t0 = _context18["catch"](6);
               errorMessage = _context18.t0 instanceof Error ? _context18.t0.message : String(_context18.t0);
               this.logError('Products 报价单价格桥接初始化失败', {
                 error: errorMessage
               });
-            case 16:
+            case 19:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[6, 12]]);
+        }, _callee18, this, [[6, 15]]);
       }));
       function setupProductsQuotationPriceBridge() {
         return _setupProductsQuotationPriceBridge.apply(this, arguments);
@@ -3303,14 +3310,20 @@ var Server = /*#__PURE__*/function () {
       var _computeProductQueryResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(context, options) {
         var _menu_list_ids$length3,
           _this6 = this;
-        var tTotal, menu_list_ids, schedule_date, schedule_datetime, customer_id, product_id, _published$find, pid, _tPrice, allProductsWithPrice, published, item, activeMenuList, tMenu, menuList, tFilter, productScope, scopedProductIds, tPrice, filteredProducts, tStatus, beforeStatusCount, tSort;
+        var tTotal, menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, product_id, queryIds, uniqueIds, _tPrice, productsWithPrice, _filteredProducts, _published$find, pid, _tPrice2, allProductsWithPrice, published, item, activeMenuList, tMenu, menuList, tFilter, productScope, scopedProductIds, tPrice, filteredProducts, tStatus, beforeStatusCount, tSort;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               tTotal = performance.now();
-              menu_list_ids = context.menu_list_ids, schedule_date = context.schedule_date, schedule_datetime = context.schedule_datetime, customer_id = context.customer_id, product_id = context.product_id;
+              menu_list_ids = context.menu_list_ids, ids = context.ids, schedule_date = context.schedule_date, schedule_datetime = context.schedule_datetime, customer_id = context.customer_id, product_id = context.product_id;
+              queryIds = Array.isArray(ids) ? ids.map(function (id) {
+                return Number(id);
+              }).filter(function (id) {
+                return Number.isFinite(id);
+              }) : [];
               this.logInfo('computeProductQueryResult 开始', {
                 menuListIdsCount: (_menu_list_ids$length3 = menu_list_ids === null || menu_list_ids === void 0 ? void 0 : menu_list_ids.length) !== null && _menu_list_ids$length3 !== void 0 ? _menu_list_ids$length3 : 0,
+                ids: queryIds,
                 schedule_datetime: schedule_datetime,
                 schedule_date: schedule_date,
                 customer_id: customer_id,
@@ -3318,7 +3331,7 @@ var Server = /*#__PURE__*/function () {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
               if (this.products) {
-                _context29.next = 6;
+                _context29.next = 7;
                 break;
               }
               this.logError('computeProductQueryResult: Products 模块未注册');
@@ -3329,22 +3342,67 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 6:
-              if (!(product_id != null && Number.isFinite(Number(product_id)))) {
+            case 7:
+              if (!(queryIds.length > 0)) {
                 _context29.next = 18;
                 break;
               }
-              pid = Number(product_id);
+              uniqueIds = Array.from(new Set(queryIds));
               _tPrice = performance.now();
-              _context29.next = 11;
+              _context29.next = 12;
+              return this.products.getProductsWithPrice(schedule_date, {
+                scheduleModule: this.getSchedule(),
+                schedule_datetime: schedule_datetime,
+                customer_id: customer_id
+              }, {
+                changedIds: options === null || options === void 0 ? void 0 : options.changedIds,
+                productIds: uniqueIds
+              });
+            case 12:
+              productsWithPrice = _context29.sent;
+              perfMark('computeQuery.getProductsWithPrice(ids)', performance.now() - _tPrice, {
+                count: productsWithPrice.length,
+                ids: uniqueIds
+              });
+              _filteredProducts = productsWithPrice.filter(function (p) {
+                return uniqueIds.includes(Number(p === null || p === void 0 ? void 0 : p.id));
+              }).filter(function (p) {
+                return ((p === null || p === void 0 ? void 0 : p.status) || 'published') === 'published';
+              });
+              perfMark('computeProductQueryResult', performance.now() - tTotal, {
+                mode: 'ids',
+                ids: uniqueIds,
+                count: _filteredProducts.length
+              });
+              this.logInfo('computeProductQueryResult 完成（ids）', {
+                ids: uniqueIds,
+                count: _filteredProducts.length
+              });
+              return _context29.abrupt("return", {
+                code: 200,
+                data: {
+                  list: _filteredProducts,
+                  count: _filteredProducts.length
+                },
+                message: '',
+                status: true
+              });
+            case 18:
+              if (!(product_id != null && Number.isFinite(Number(product_id)))) {
+                _context29.next = 30;
+                break;
+              }
+              pid = Number(product_id);
+              _tPrice2 = performance.now();
+              _context29.next = 23;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule()
               }, {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
-            case 11:
+            case 23:
               allProductsWithPrice = _context29.sent;
-              perfMark('computeQuery.getProductsWithPrice(single)', performance.now() - _tPrice, {
+              perfMark('computeQuery.getProductsWithPrice(single)', performance.now() - _tPrice2, {
                 count: allProductsWithPrice.length,
                 productId: pid
               });
@@ -3369,9 +3427,9 @@ var Server = /*#__PURE__*/function () {
                 message: item ? '' : '商品不存在或未发布',
                 status: true
               });
-            case 18:
+            case 30:
               if (this.menu) {
-                _context29.next = 21;
+                _context29.next = 33;
                 break;
               }
               this.logError('computeProductQueryResult: Menu 模块未注册');
@@ -3382,9 +3440,9 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 21:
+            case 33:
               if (this.schedule) {
-                _context29.next = 24;
+                _context29.next = 36;
                 break;
               }
               this.logError('computeProductQueryResult: Schedule 模块未注册');
@@ -3395,7 +3453,7 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 24:
+            case 36:
               activeMenuList = [];
               if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
                 tMenu = performance.now();
@@ -3419,10 +3477,10 @@ var Server = /*#__PURE__*/function () {
               });
               tPrice = performance.now();
               if (!(scopedProductIds.length > 0)) {
-                _context29.next = 37;
+                _context29.next = 49;
                 break;
               }
-              _context29.next = 34;
+              _context29.next = 46;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule(),
                 schedule_datetime: schedule_datetime,
@@ -3431,13 +3489,13 @@ var Server = /*#__PURE__*/function () {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds,
                 productIds: productScope.isAllProducts ? undefined : scopedProductIds
               });
-            case 34:
+            case 46:
               _context29.t0 = _context29.sent;
-              _context29.next = 38;
+              _context29.next = 50;
               break;
-            case 37:
+            case 49:
               _context29.t0 = [];
-            case 38:
+            case 50:
               filteredProducts = _context29.t0;
               perfMark('computeQuery.getProductsWithPrice', performance.now() - tPrice, {
                 count: filteredProducts.length,
@@ -3480,7 +3538,7 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 status: true
               });
-            case 50:
+            case 62:
             case "end":
               return _context29.stop();
           }