@pisell/pisellos 2.2.263 → 2.2.264

package/dist/modules/Rules/index.js

@@ -241,6 +241,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function resolveDiscountListForManualOverride(discountList) {
       return this.excludeDiscountListByType(discountList, 'promotion');
     }
+  }, {
+    key: "isItemRewardProductDiscount",
+    value: function isItemRewardProductDiscount(product) {
+      var _product$_promotion;
+      var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
+      return (product === null || product === void 0 || (_product$_promotion = product._promotion) === null || _product$_promotion === void 0 ? void 0 : _product$_promotion.actionType) === 'ITEM_REWARD' && discountList.some(function (item) {
+        var _item$metadata, _item$metadata2;
+        return (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
+      });
+    }
+
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -335,32 +346,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }) && productList.find(function (n) {
         return !n.booking_id;
       });
-      var reapplyBookingDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter(function (uid) {
-        return uid !== undefined && uid !== null && uid !== '';
-      }).map(String));
-      var getOriginProductUid = function getOriginProductUid(originProduct) {
-        var _originProduct$metada, _originProduct$metada2;
-        var uid = (_originProduct$metada = originProduct === null || originProduct === void 0 || (_originProduct$metada2 = originProduct.metadata) === null || _originProduct$metada2 === void 0 ? void 0 : _originProduct$metada2.unique_identification_number) !== null && _originProduct$metada !== void 0 ? _originProduct$metada : originProduct === null || originProduct === void 0 ? void 0 : originProduct.unique_identification_number;
-        if (uid === undefined || uid === null || uid === '') return undefined;
-        return String(uid);
-      };
-      var shouldReapplyBookingDiscount = function shouldReapplyBookingDiscount(originProduct, selectedDiscount) {
-        if (!selectedDiscount) return false;
-        var uid = getOriginProductUid(originProduct);
-        if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
-        var discountType = selectedDiscount.tag || selectedDiscount.type;
-        return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
-      };
-      var resolveReapplyEditModeDiscountPercent = function resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount) {
-        var _discount2;
-        if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount)) return undefined;
-        var discountType = (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.tag) || (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.type);
-        if (discountType !== 'discount_card' && discountType !== 'product_discount_card') {
-          return undefined;
-        }
-        var percent = Number((_discount2 = selectedDiscount.discount) === null || _discount2 === void 0 ? void 0 : _discount2.percent);
-        return Number.isFinite(percent) ? percent : undefined;
-      };
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -389,6 +374,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
+
+      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑
+      var filteredDiscountList = addModeDiscount.filter(function (discount) {
+        return !discount.isManualSelect;
+      });
       var hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options === null || options === void 0 ? void 0 : options.discountId) || Boolean(options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.length) || Boolean(options === null || options === void 0 ? void 0 : options.scan);
       if (!hasDiscountInput) {
         return {
@@ -396,16 +386,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           productList: productList
         };
       }
-      var canUseEditModeDiscountForReapply = function canUseEditModeDiscountForReapply(discount) {
-        var discountType = discount.tag || discount.type;
-        return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
-      };
-
-      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑。
-      // Change time 重报价需要把已选编辑态折扣卡重新放入候选，再由目标 uid 限定作用范围。
-      var filteredDiscountList = [].concat(_toConsumableArray(addModeDiscount.filter(function (discount) {
-        return !discount.isManualSelect;
-      })), _toConsumableArray(editModeDiscount.filter(canUseEditModeDiscountForReapply)));
 
       // 🔥 扁平化商品列表：将 bundle 子商品展开为虚拟商品
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
@@ -729,6 +709,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             startDate: (_flatItem$parentProdu = flatItem.parentProduct) === null || _flatItem$parentProdu === void 0 ? void 0 : _flatItem$parentProdu.startDate
           };
         }
+        if (_this3.isItemRewardProductDiscount(product)) {
+          return false;
+        }
 
         // 编辑的商品使用了优惠券不可用
         var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
@@ -915,6 +898,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
+        var isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
           var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
@@ -940,7 +924,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -1085,16 +1069,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
+          if (_this3.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
-          var currentOriginUid = getOriginProductUid(originProduct);
-          var isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
-          if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
-            var uid = currentOriginUid;
-            if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
-            if (!discount.isSelected) return false;
-          }
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType) && !isReapplyEditModeDiscountForProduct) {
+          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
             var _discount$config2;
             // 如果策略检查后没有config，说明不可用
             if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config2 = discount.config) !== null && _discount$config2 !== void 0 && _discount$config2.isAvailable)) {
@@ -1172,6 +1150,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
+        var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
           var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
@@ -1183,7 +1162,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
-          if (product.inPromotion) {
+          isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
+          if (product.inPromotion && !isItemRewardProductDiscount) {
             isManualDiscount = false;
           }
         } else {
@@ -1293,15 +1273,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+              }) || isItemRewardProductDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
                 var _product$total, _product$main_product;
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
                 main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
                 price: product.price,
-                main_product_selling_price: product.price
-              } : {
+                main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
+              }, isItemRewardProductDiscount ? {
+                total: total
+              } : {}) : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
@@ -1322,8 +1304,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        var shouldReapplyBookingDiscountForProduct = shouldReapplyBookingDiscount(originProduct, selectedDiscount);
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct && !shouldReapplyBookingDiscountForProduct) {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
           return;
         }
 
@@ -1364,7 +1345,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 _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1402,18 +1383,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var productDiscountDifference = void 0;
             var discountedOptions = product.options;
             var optionDiscountAmount = 0;
-            var reapplyDiscountPercent = void 0;
             if (isOrderLevel && productAllocation) {
               // order_level：使用预计算的分摊金额
               amount = productAllocation.discountAmount;
               productDiscountDifference = productAllocation.difference;
               mainProductSellingPrice = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
-            } else if (resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
-              // Change time 重套编辑态折扣卡时，历史 par_value 不是运行时折扣口径，优先使用后端快照里的 percent。
-              var percent = resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount);
-              reapplyDiscountPercent = new Decimal(percent).toFixed(2);
-              mainProductSellingPrice = new Decimal(product.price || 0).mul(new Decimal(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
-              amount = new Decimal(product.price).minus(mainProductSellingPrice).toNumber();
             } else {
               // item_level 或其他类型：使用原有逻辑
               mainProductSellingPrice = getDiscountAmount(_selectedDiscount, product.price, product.price);
@@ -1446,7 +1420,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id || originProduct.product_id,
-                percent: (_reapplyDiscountPerce = reapplyDiscountPercent) !== null && _reapplyDiscountPerce !== void 0 ? _reapplyDiscountPerce : _selectedDiscount.par_value,
+                percent: _selectedDiscount.par_value,
                 discount_product_id: _selectedDiscount.product_id
               },
               // 前端使用的num数量，为了计算优惠金额
@@ -1750,11 +1724,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   processedItems.forEach(function (item) {
                     // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                     var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata;
+                      var _item$metadata3;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用拆分后的 num
                       });
@@ -1773,11 +1747,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   if (item.processed) {
                     // 🔥 同样需要更新 discount_list 中的 num
                     var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata2;
+                      var _item$metadata4;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用当前的 num
                       });
@@ -1818,8 +1792,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 使用更新后的列表计算折扣金额
               var mainDiscountList = updatedMainDiscountList.filter(function (item) {
-                var _item$metadata3;
-                return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
+                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$toNumb, _mainProductData$orig;
@@ -1892,8 +1866,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 使用更新后的列表计算折扣金额
                 var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
-                  var _item$metadata4;
-                  return !(item !== null && item !== void 0 && (_item$metadata4 = item.metadata) !== null && _item$metadata4 !== void 0 && _item$metadata4.custom_product_bundle_map_id);
+                  var _item$metadata6;
+                  return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
                 });
                 if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
                   var _Decimal$minus$toNumb2, _mainProductData$orig2;

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

@@ -1,5 +1,4 @@
 import { Discount } from '../Discount/types';
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare enum UnavailableReason {
     TimeLimit = "time_limit",
     ProductNotApplicable = "product_not_applicable",
@@ -24,14 +23,6 @@ export interface DiscountResult {
     discountList: any[];
 }
 export type RulesFormSubject = boolean | ((product: any) => boolean);
-export interface RulesCalcDiscountOptions {
-    isSelected?: boolean;
-    discountId?: number;
-    selectedList?: SetDiscountSelectedParams[];
-    scan?: boolean;
-    /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
-    reapplyBookingDiscountProductUids?: string[];
-}
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -43,7 +34,7 @@ export interface RulesModuleAPI {
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }, options?: RulesCalcDiscountOptions) => DiscountResult;
+    }) => DiscountResult;
 }
 type ProductDetail = {
     isClient?: boolean;

package/dist/server/index.d.ts

@@ -47,8 +47,6 @@ declare class Server {
     private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
-    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
-    private productQueryScheduleTimers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -212,48 +210,6 @@ declare class Server {
      * 根据 subscriberId 移除商品查询订阅者
      */
     removeProductQuerySubscriber(subscriberId?: string): void;
-    /**
-     * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
-     */
-    private buildProductQueryResultPayload;
-    /**
-     * 是否启用商品 query 订阅的 schedule 时间点定时重算。
-     * strategy_context.enable_schedule_reload === false 时关闭。
-     */
-    private shouldScheduleProductQueryReload;
-    /**
-     * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
-     */
-    private clearSubscriberScheduleTimers;
-    /**
-     * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
-     */
-    private removeScheduleTimerRef;
-    /**
-     * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
-     */
-    private computeScheduleTimePointDelayMs;
-    /**
-     * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
-     */
-    private refreshSubscriberScheduleAtExecution;
-    /**
-     * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
-     * 必须先 clearSubscriberScheduleTimers，再调用本方法。
-     */
-    private scheduleSubscriberTimePointReloads;
-    /**
-     * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
-     */
-    private onScheduleTimePointTimerFire;
-    /**
-     * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
-     */
-    private recomputeAndNotifySubscriber;
-    /**
-     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
-     */
-    private syncProductQueryScheduleTimers;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -489,11 +445,6 @@ declare class Server {
     private sumPaidOrderPayments;
     private toAmountNumber;
     private buildSmallTicketProductMap;
-    private collectSalesDetailProductIds;
-    private buildSalesDetailProductSnapshotMap;
-    private withProductCatalogSnapshots;
-    private withBundleCatalogSnapshots;
-    private withSalesDetailProductSnapshots;
     private withPendingSyncProductTitles;
     private buildProductTitleSnapshot;
     private getProductTitleSnapshotCurrentLocale;
@@ -614,12 +565,6 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
-    /**
-     * 构建商品格式化上下文。
-     *
-     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
-     */
-    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发