@pisell/pisellos 2.2.262 → 2.2.264

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

@@ -198,7 +198,6 @@ export interface OrderProduct extends OrderProductIdentity {
     product_bundle: any[];
     booking_uid?: string;
     product_title?: OrderLocalizedText;
-    product_cover?: string;
     metadata: Record<string, any>;
     note?: string;
 }
@@ -309,7 +308,6 @@ export interface OrderState {
     lastOrderInfo?: Record<string, any>;
     syncState?: OrderSyncState;
     discountList: any[];
-    availableWalletIds?: number[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
@@ -342,19 +340,6 @@ export interface UpdateOrderProductParams {
      * });
      */
     allow_booking_reprice?: boolean;
-    /**
-     * Change time 重报价后，允许当前预约商品行重新应用已选编辑态折扣卡。
-     *
-     * @example
-     * await order.updateOrderProduct({
-     *   product_id: 1,
-     *   product_variant_id: 0,
-     *   updates: { discount_list: [] },
-     *   booking: { duration: 2 },
-     *   allow_booking_discount_reapply: true,
-     * });
-     */
-    allow_booking_discount_reapply?: boolean;
 }
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
@@ -776,7 +761,6 @@ export interface OrderModuleAPI {
         apply?: boolean;
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
-    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

package/lib/modules/Order/utils.d.ts

@@ -3,7 +3,6 @@ import type { CartItem } from "../Cart";
 import type { OrderProductDiscountItem, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
-import { createUuidV4 } from './utils/orderCollectionIdentity';
 export interface OrderProductsDepositProtocol {
     id: number;
     title: string;
@@ -68,8 +67,8 @@ export declare function sumOptionUnitPrice(options?: Array<{
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 商品折扣在进入定金计算前已体现在商品行价格字段中，
- * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
+ * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
+ * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
  */
 export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
     productsByUid?: Record<string, Record<string, any>>;
@@ -178,7 +177,7 @@ export declare const mergeRelationForms: (relationForms: {
     form_record_ids: number[];
 }[];
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
-export { createUuidV4 };
+export declare function createUuidV4(): string;
 export declare function isTempOrder(data: any): data is OrderTempOrder;
 export declare function formatDateTime(date: Date): string;
 export declare function normalizeBookingIsAll(booking: Record<string, any>): 0 | 1;

package/lib/modules/Order/utils.js

@@ -37,7 +37,7 @@ __export(utils_exports, {
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
-  createUuidV4: () => import_orderCollectionIdentity.createUuidV4,
+  createUuidV4: () => createUuidV4,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
   ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
@@ -86,7 +86,6 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../solution/ScanOrder/utils");
-var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var import_utils2 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
@@ -287,6 +286,9 @@ function calculateOrderProductsDeposit(products = [], options) {
     if (!(deposit == null ? void 0 : deposit.total) || Number(deposit.total) <= 0)
       continue;
     total = total.plus(deposit.total);
+    for (const discount of product.discount_list || []) {
+      total = total.minus((discount == null ? void 0 : discount.amount) || 0);
+    }
     for (const protocol of deposit.protocols || []) {
       if (!protocolMap.has(protocol.id))
         protocolMap.set(protocol.id, protocol);
@@ -444,7 +446,12 @@ function resolveEffectivePerUnitDiscount(product) {
     (sum, discount) => sum + Number((discount == null ? void 0 : discount.amount) || 0),
     0
   );
-  const hasPromoDiscountItem = discountList.some((item) => (item == null ? void 0 : item.type) === "promotion");
+  const hasPromoDiscountItem = discountList.some(
+    (item) => {
+      var _a, _b;
+      return (item == null ? void 0 : item.type) === "promotion" || (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
+    }
+  );
   if (hasPromoDiscountItem)
     return fromList;
   const metadata = (product == null ? void 0 : product.metadata) || {};
@@ -493,17 +500,13 @@ function createDefaultOrderRulesHooks() {
       const current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current)
         return bundle;
-      const bundleWithDisplayFields = {
-        ...bundle,
-        ...isEmptyOrderProductDisplayValue(bundle.cover) && !isEmptyOrderProductDisplayValue(current.cover) ? { cover: current.cover } : {}
-      };
       const isProductPriceBundle = (bundle.price_type_ext ?? current.price_type_ext) === "product_price";
       if (!isProductPriceBundle)
-        return bundleWithDisplayFields;
+        return bundle;
       const sourcePrice = current.price ?? current.custom_price ?? current.original_price ?? current.bundle_selling_price;
       const originalPrice = current.original_price ?? current.product_price ?? current.price ?? current.custom_price ?? sourcePrice;
       return {
-        ...bundleWithDisplayFields,
+        ...bundle,
         ...sourcePrice !== void 0 ? { price: sourcePrice } : {},
         ...originalPrice !== void 0 ? { original_price: originalPrice } : {},
         ...current.original_total !== void 0 ? { original_total: current.original_total } : {}
@@ -642,6 +645,14 @@ var getAllDiscountList = (cartItem) => {
   });
   return discountList;
 };
+function createUuidV4() {
+  const template = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx";
+  return template.replace(/[xy]/g, (char) => {
+    const randomValue = Math.floor(Math.random() * 16);
+    const value = char === "x" ? randomValue : randomValue & 3 | 8;
+    return value.toString(16);
+  });
+}
 function isTempOrder(data) {
   if (!data || typeof data !== "object")
     return false;
@@ -739,7 +750,6 @@ function formatSubmitBundleItems(bundle) {
       bundle_group_id: (rawBundle == null ? void 0 : rawBundle.bundle_group_id) ?? (rawBundle == null ? void 0 : rawBundle.group_id),
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
       bundle_product_id: (rawBundle == null ? void 0 : rawBundle.bundle_product_id) ?? (rawBundle == null ? void 0 : rawBundle._bundle_product_id),
-      cover: rawBundle.cover,
       metadata: {
         ...submitMetadata,
         ...hasSubmitBundleDiscounts && bundleMapId !== void 0 ? { custom_product_bundle_map_id: bundleMapId } : {},
@@ -798,9 +808,6 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.is_rule !== void 0) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
-  if (rawMetadata.holder_config !== void 0) {
-    cleanMetadata.holder_config = rawMetadata.holder_config;
-  }
   const productSku = {
     ...submitProduct.product_sku && typeof submitProduct.product_sku === "object" ? submitProduct.product_sku : {},
     option: formatSubmitOptionItems((_a = submitProduct.product_sku) == null ? void 0 : _a.option)
@@ -931,7 +938,7 @@ function buildSubmitPayload(params) {
     enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
-  const bookingUuid = (0, import_orderCollectionIdentity.createUuidV4)();
+  const bookingUuid = createUuidV4();
   const {
     _extend,
     relation_id: _relationId,
@@ -1079,7 +1086,7 @@ function formatV1Product(products) {
       note: String(product.note ?? ""),
       rowKey: product.product_id,
       session: null,
-      unique: (0, import_orderCollectionIdentity.createUuidV4)()
+      unique: createUuidV4()
     };
   });
 }
@@ -1157,16 +1164,11 @@ function isHolderConfigRequired(holderConfig) {
   return Number(holderConfig.required) === 1;
 }
 function productRequiresFormSubject(tempOrder, product) {
-  var _a, _b;
-  const _orderProduct = (_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.find((item) => {
-    return item.metadata.unique_identification_number === product._id || item.product_id === product.id;
-  });
   const runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
-  return isHolderConfigRequired((_b = _orderProduct == null ? void 0 : _orderProduct.metadata) == null ? void 0 : _b.holder_config) || isHolderConfigRequired(runtimeOrigin == null ? void 0 : runtimeOrigin.holder_config) || isHolderConfigRequired(product == null ? void 0 : product.holder_config);
+  return isHolderConfigRequired(product == null ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin == null ? void 0 : runtimeOrigin.holder_config);
 }
 function resolveIsFormSubject(tempOrder, product) {
   var _a;
-  debugger;
   if (((_a = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _a.type) === "form")
     return true;
   if (product)
@@ -1195,7 +1197,6 @@ function mergeOrderProductDisplayFields(previous, next) {
     "product_name",
     "product_cover",
     "cover",
-    "product_cover",
     "variant_title",
     "product_sku",
     "payment_price"

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

@@ -9,26 +9,6 @@ export interface ProductCollection {
     /** 商品集合封面 */
     cover: string;
 }
-/**
- * 商品 Data Variant 记录，结构与后端 data_variant 表对齐。
- */
-export interface ProductDataVariant {
-    /** 变体记录 id */
-    id: number;
-    /** 店铺 id */
-    shop_id: number;
-    /** 所属模块，商品场景固定为 product */
-    module: string;
-    /** 模块数据 id，商品场景对应 product.id */
-    module_data_id: number;
-    /** 关联 data_variant_rule.id */
-    data_variant_rule_id: number;
-    /** 命中策略后覆盖到商品上的字段 */
-    data: Record<string, any>;
-    created_at: string | null;
-    updated_at: string | null;
-    deleted_at: string | null;
-}
 /**
  * 商品基本信息接口
  */
@@ -234,8 +214,6 @@ export interface ProductData {
     bundle_group_count: number;
     /** 选项组数量 */
     option_group_count: number;
-    /** 智能定价变体列表，/product/query with dataVariants 返回 */
-    data_variants?: ProductDataVariant[];
     /** 服务时长 */
     service_times?: any;
 }

package/lib/modules/ProductList/index.d.ts

@@ -26,7 +26,7 @@ export declare class ProductList extends BaseModule implements Module {
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
     getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/lib/modules/ProductList/index.js

@@ -95,8 +95,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule,
     extension_type,
-    status = "published",
-    strategy_context
+    status = "published"
   } = {}, options) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
@@ -136,8 +135,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
         is_eject: 1,
         with_schedule,
         schedule_datetime,
-        extension_type,
-        strategy_context
+        extension_type
       },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }

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

@@ -12,8 +12,6 @@ export interface ProductListLoadProductsParams {
     with_schedule?: number;
     extension_type?: string[];
     status?: string;
-    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
-    strategy_context?: Record<string, any>;
 }
 export interface ProductListData {
     list: ProductData[];

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

@@ -1,7 +1,8 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -35,6 +36,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
+    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
@@ -44,7 +46,12 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }, options?: RulesCalcDiscountOptions): DiscountResult;
+    }, options?: {
+        isSelected?: boolean;
+        discountId?: number;
+        selectedList?: SetDiscountSelectedParams[];
+        scan?: boolean;
+    }): DiscountResult;
     /**
      * 检查优惠是否符合 PackageSubItemUsageRules 配置
      * @param discount 优惠券

package/lib/modules/Rules/index.js

@@ -167,6 +167,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   resolveDiscountListForManualOverride(discountList) {
     return this.excludeDiscountListByType(discountList, "promotion");
   }
+  isItemRewardProductDiscount(product) {
+    var _a;
+    const discountList = Array.isArray(product == null ? void 0 : product.discount_list) ? product.discount_list : [];
+    return ((_a = product == null ? void 0 : product._promotion) == null ? void 0 : _a.actionType) === "ITEM_REWARD" && discountList.some(
+      (item) => {
+        var _a2, _b;
+        return (item == null ? void 0 : item.type) === "product" && ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
+      }
+    );
+  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -209,36 +219,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     var _a;
     const resolveIsFormSubject = (product) => typeof isFormSubject === "function" ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
-    const reapplyBookingDiscountProductUids = new Set(
-      ((options == null ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter((uid) => uid !== void 0 && uid !== null && uid !== "").map(String)
-    );
-    const getOriginProductUid = (originProduct) => {
-      var _a2;
-      const uid = ((_a2 = originProduct == null ? void 0 : originProduct.metadata) == null ? void 0 : _a2.unique_identification_number) ?? (originProduct == null ? void 0 : originProduct.unique_identification_number);
-      if (uid === void 0 || uid === null || uid === "")
-        return void 0;
-      return String(uid);
-    };
-    const shouldReapplyBookingDiscount = (originProduct, selectedDiscount) => {
-      if (!selectedDiscount)
-        return false;
-      const uid = getOriginProductUid(originProduct);
-      if (!uid || !reapplyBookingDiscountProductUids.has(uid))
-        return false;
-      const discountType = selectedDiscount.tag || selectedDiscount.type;
-      return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
-    };
-    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
-      var _a2;
-      if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
-        return void 0;
-      const discountType = (selectedDiscount == null ? void 0 : selectedDiscount.tag) || (selectedDiscount == null ? void 0 : selectedDiscount.type);
-      if (discountType !== "discount_card" && discountType !== "product_discount_card") {
-        return void 0;
-      }
-      const percent = Number((_a2 = selectedDiscount.discount) == null ? void 0 : _a2.percent);
-      return Number.isFinite(percent) ? percent : void 0;
-    };
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -262,6 +242,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       });
     }
+    const filteredDiscountList = addModeDiscount.filter((discount) => {
+      return !discount.isManualSelect;
+    });
     const hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options == null ? void 0 : options.discountId) || Boolean((_a = options == null ? void 0 : options.selectedList) == null ? void 0 : _a.length) || Boolean(options == null ? void 0 : options.scan);
     if (!hasDiscountInput) {
       return {
@@ -269,14 +252,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    const canUseEditModeDiscountForReapply = (discount) => {
-      const discountType = discount.tag || discount.type;
-      return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
-    };
-    const filteredDiscountList = [
-      ...addModeDiscount.filter((discount) => !discount.isManualSelect),
-      ...editModeDiscount.filter(canUseEditModeDiscountForReapply)
-    ];
     const flattenProductsWithBundle = (productList2) => {
       const flattened = [];
       productList2.forEach((originProduct) => {
@@ -500,6 +475,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           startDate: (_a2 = flatItem.parentProduct) == null ? void 0 : _a2.startDate
         };
       }
+      if (this.isItemRewardProductDiscount(product)) {
+        return false;
+      }
       const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.length) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.every((d) => d.id && ["good_pass", "discount_card", "product_discount_card"].includes(d.tag || d.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_e = (_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.discount_list) == null ? void 0 : _e.length) && ((_g = (_f = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _f.discount_list) == null ? void 0 : _g.every((d) => d.id)));
       if (!isAvailableProduct) {
         return false;
@@ -625,6 +603,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
         originProduct = flatItem.originProduct;
       }
+      const isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
       addModeDiscount.forEach((discount) => {
         var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
@@ -648,7 +627,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           ].includes(discount2.tag || discount2.type)
         ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) == null ? void 0 : _d.length) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.every((discount2) => discount2.id)));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
+        if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
           (_h = discountApplicability.get(discount.id)) == null ? void 0 : _h.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -771,19 +750,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a3, _b2, _c2, _d2;
+        if (this.isItemRewardProductDiscount(product))
+          return false;
         const discountType = discount.tag || discount.type;
-        const currentOriginUid = getOriginProductUid(originProduct);
-        const isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
-        if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
-          const 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 (discount.config === void 0 || !((_a3 = discount == null ? void 0 : discount.config) == null ? void 0 : _a3.isAvailable)) {
             return false;
           }
@@ -845,6 +817,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       );
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
+      let isItemRewardProductDiscount = false;
       if (flatItem.type === "main") {
         isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : ((_g = product.discount_list) == null ? void 0 : _g.some((item) => item.type === "product")) || product.total != product.origin_total && (product.bundle || []).every(
           (item) => {
@@ -855,7 +828,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _i,
           (item) => item.type === "product"
         )));
-        if (product.inPromotion) {
+        isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
+        if (product.inPromotion && !isItemRewardProductDiscount) {
           isManualDiscount = false;
         }
       } else {
@@ -969,7 +943,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           } else {
             let total = product.inPromotion ? ((_w = product == null ? void 0 : product._promotion) == null ? void 0 : _w.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
             let main_product_selling_price = product.price;
-            if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+            if ((product.discount_list || []).some((item) => item.type === "promotion") || isItemRewardProductDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
               total = product.total ?? product.origin_total;
               main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
             }
@@ -977,7 +951,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
                   price: product.price,
-                  main_product_selling_price: product.price
+                  main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price,
+                  ...isItemRewardProductDiscount ? { total } : {}
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
@@ -999,8 +974,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return;
       }
-      const shouldReapplyBookingDiscountForProduct = shouldReapplyBookingDiscount(originProduct, selectedDiscount);
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct && !shouldReapplyBookingDiscountForProduct) {
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct) {
         return;
       }
       const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
@@ -1056,16 +1030,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let productDiscountDifference;
           let discountedOptions = product.options;
           let optionDiscountAmount = 0;
-          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
-          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
-            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
-            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
-            mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
-            amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
           } else {
             mainProductSellingPrice = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1100,7 +1068,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.price,
               product_id: originProduct.id || originProduct.product_id,
-              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
+              percent: selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             // 前端使用的num数量，为了计算优惠金额

package/lib/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/lib/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 事件触发