@pisell/pisellos 2.3.67 → 2.3.68

package/dist/modules/Rules/index.js

@@ -1195,11 +1195,26 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
         var explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== 'good_pass' ? explicitlySelectedDiscount : undefined;
 
-        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
+        // 商品数量等变化会触发无 discountId 的重算。只要当前行已应用的折扣卡仍在
+        // applicableDiscounts 中，就应保留该行选择，避免被自动排序中力度更大的卡替换。
+        var appliedDiscountCardIds = new Set((product.discount_list || []).filter(function (item) {
+          return ['discount_card', 'product_discount_card'].includes((item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 ? void 0 : item.type));
+        }).map(function (item) {
+          var _ref12, _item$discount$resour, _item$discount;
+          return (_ref12 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref12 !== void 0 ? _ref12 : item === null || item === void 0 ? void 0 : item.id;
+        }).filter(function (id) {
+          return id !== undefined && id !== null;
+        }).map(String));
+        var appliedDiscountCard = options !== null && options !== void 0 && options.scan ? undefined : applicableDiscounts.find(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+        });
+
+        // 优先级：本次显式选择 > 当前行既有选择 > 扫码选择 > 自动排序第一项。
         var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
-        var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
+        var selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
         var selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
         var prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === 'good_pass' ? [explicitlySelectedDiscount].concat(_toConsumableArray(applicableDiscounts.filter(function (discount) {
           var discountType = discount.tag || discount.type;
@@ -1217,8 +1232,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
             return item.type === 'product';
           })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref12;
-            return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
+            var _ref13;
+            return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
@@ -1234,8 +1249,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
               return item.type === 'product';
             })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref13;
-              return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
+              var _ref14;
+              return !((_ref14 = item.discount_list || []) !== null && _ref14 !== void 0 && _ref14.length);
             }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
@@ -1247,8 +1262,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis7;
           // 主商品：检查自己的 discount_list
           if (flatItem.type === 'main' && (_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
-            var _item$discount;
-            return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
+            var _item$discount2;
+            return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
           })) {
             isManualDiscount = false;
           }
@@ -1256,11 +1271,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (flatItem.type === 'bundle') {
             var _product$discount_lis8, _flatItem$parentProdu7;
             if ((_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
-              var _item$discount2;
-              return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
-            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
               var _item$discount3;
               return ((_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.resource_id) === options.discountId;
+            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
+              var _item$discount4;
+              return ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id) === options.discountId;
             })) {
               isManualDiscount = false;
             }
@@ -1272,8 +1287,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (flatItem.type === 'main' && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
             var _options$selectedList2;
             return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
-              var _item$discount4;
-              return n.discountId === ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id);
+              var _item$discount5;
+              return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
             });
           })) {
             isManualDiscount = false;
@@ -1284,14 +1299,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
               var _options$selectedList3;
               return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
-                var _item$discount5;
-                return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
+                var _item$discount6;
+                return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
               });
             }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
               var _options$selectedList4;
               return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
-                var _item$discount6;
-                return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
+                var _item$discount7;
+                return n.discountId === ((_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.resource_id);
               });
             })) {
               isManualDiscount = false;
@@ -1328,8 +1343,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref14, _product$_promotion$f, _product12, _product$origin_total;
-              var total = product.inPromotion ? (_ref14 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref15, _product$_promotion$f, _product12, _product$origin_total;
+              var total = product.inPromotion ? (_ref15 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref15 !== void 0 ? _ref15 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
@@ -2027,7 +2042,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref16, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref17, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this4.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -2042,9 +2057,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
-                        var _item$price, _ref15, _item$bundle_selling_;
+                        var _item$price, _ref16, _item$bundle_selling_;
                         var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
-                        var nextBundleSellingPrice = (_ref15 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.bundle_selling_price;
+                        var nextBundleSellingPrice = (_ref16 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref16 !== void 0 ? _ref16 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -2071,7 +2086,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref16 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref16 !== void 0 ? _ref16 : 0;
+                var mainSellingPrice = (_ref17 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref17 !== void 0 ? _ref17 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -2220,14 +2235,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref17 = packageScope || {},
-        scopeType = _ref17.type,
-        _ref17$exclude_bundle = _ref17.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref17$exclude_bundle === void 0 ? [] : _ref17$exclude_bundle,
-        _ref17$include_bundle = _ref17.include_bundle_product_ids,
-        include_bundle_product_ids = _ref17$include_bundle === void 0 ? [] : _ref17$include_bundle,
-        _ref17$filter = _ref17.filter,
-        filter = _ref17$filter === void 0 ? 0 : _ref17$filter;
+      var _ref18 = packageScope || {},
+        scopeType = _ref18.type,
+        _ref18$exclude_bundle = _ref18.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref18$exclude_bundle === void 0 ? [] : _ref18$exclude_bundle,
+        _ref18$include_bundle = _ref18.include_bundle_product_ids,
+        include_bundle_product_ids = _ref18$include_bundle === void 0 ? [] : _ref18$include_bundle,
+        _ref18$filter = _ref18.filter,
+        filter = _ref18$filter === void 0 ? 0 : _ref18$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
       var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;

package/dist/plugins/request.d.ts

@@ -68,7 +68,6 @@ export interface RequestOptions {
     useCache?: boolean;
     customToast?: () => void;
     cache?: CacheProps;
-    cacheUpdateChange?: (data: any) => void;
     osServer?: boolean;
     prefix?: boolean;
     callback?: (res: any) => void;

package/dist/server/index.d.ts

@@ -51,8 +51,6 @@ declare class Server {
     private productQueryScheduleTimers;
     /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
     private menuScheduleRefreshInFlight;
-    /** 启动阶段模块预加载任务；预渲染商品查询复用该任务，避免缓存尚未 ready 时误触发远端自愈。 */
-    private startupModulePreloadInFlight;
     private lastMenuScheduleRefreshAt;
     private readonly MENU_SCHEDULE_REFRESH_COOLDOWN_MS;
     private orderQuerySubscribers;
@@ -159,17 +157,13 @@ declare class Server {
      * 重新拉取全量 SSE 接口，更新本地数据后触发 onProductsSyncCompleted
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
-    refreshProductsInBackground(options?: {
-        trigger?: string;
-    }): Promise<void>;
+    refreshProductsInBackground(): Promise<void>;
     /**
      * 后台静默刷新订单数据
      * 重新拉取全量 SSE 接口，更新本地数据后触发 onOrdersSyncCompleted
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
-    refreshOrdersInBackground(options?: {
-        trigger?: string;
-    }): Promise<void>;
+    refreshOrdersInBackground(): Promise<void>;
     /**
      * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
      * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，