@pisell/pisellos 2.3.56 → 2.3.58

package/dist/modules/Rules/index.js

@@ -1186,19 +1186,27 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 用户显式点击某张折扣卡时，本次选择优先于自动排序和扫码默认选择。
+        // 用户显式点击某张卡券时，本次选择优先于自动排序和扫码默认选择。
         // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
-        var explicitlySelectedDiscountCard = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
+        var explicitlySelectedDiscount = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
           var discountType = discount.tag || discount.type;
-          return String(discount.id) === String(options.discountId) && ['discount_card', 'product_discount_card'].includes(discountType);
+          return String(discount.id) === String(options.discountId) && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
         }) : undefined;
+        // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
+        var explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== 'good_pass' ? explicitlySelectedDiscount : undefined;
 
         // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
         var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
         var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
-        var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
+        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;
+          return discountType === 'good_pass' && String(discount.id) !== String(explicitlySelectedDiscount.id);
+        })), _toConsumableArray(applicableDiscounts.filter(function (discount) {
+          return (discount.tag || discount.type) !== 'good_pass';
+        }))) : applicableDiscounts;
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
@@ -1440,8 +1448,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           for (var i = 0; i < splitCount; i++) {
             var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
-            // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
-            var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
+            var _selectedDiscount = isNeedSplit ? prioritizedApplicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
             usedDiscounts.set(_selectedDiscount.id, true);
             // 🔥 更新 product_id 使用计数
@@ -1586,7 +1593,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 生成有折扣的商品（每张商品券对应 num: 1）
             for (var _i = 0; _i < discountNum; _i++) {
               var _selectedDiscount2$me;
-              var _selectedDiscount2 = applicableDiscounts[_i];
+              var _selectedDiscount2 = prioritizedApplicableDiscounts[_i];
               usedDiscounts.set(_selectedDiscount2.id, true);
               // 🔥 更新 product_id 使用计数
               if ((_selectedDiscount2.tag || _selectedDiscount2.type) === 'good_pass') {

package/dist/server/index.d.ts

@@ -164,6 +164,12 @@ declare class Server {
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
     refreshOrdersInBackground(): Promise<void>;
+    /**
+     * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
+     * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
+     * UI 可复用 order:onRemoteProductMembershipChanged 处理冲突。
+     */
+    checkRemoteOrderProductMembership(orderId: string | number): Promise<void>;
     /**
      * 清空所有server模块的IndexedDB缓存
      * @returns Promise<void>