@pisell/pisellos 2.3.51 → 2.3.53

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

@@ -321,6 +321,24 @@ export interface ReplaceTempOrderOptions {
     saveDraft?: boolean;
 }
 export type AddProductBookingInput = Record<string, any>;
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+export interface AddProductToOrderOptions {
+    insertAfterProductUid?: string;
+}
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+export interface RemoveProductsFromOrderOptions {
+    preserveDisplayPosition?: {
+        remainingProductUid: string;
+        anchorProductUid: string;
+    };
+}
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -396,7 +414,6 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
-        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -572,12 +589,6 @@ export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
-    /**
-     * Whether the checkout should be queued as the local `sync_sales` task.
-     * Defaults to true to preserve the WebPOS retry path. Set to false when
-     * the caller must wait for the cloud checkout response before proceeding.
-     */
-    checkoutSyncTaskEnabled?: boolean;
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
@@ -722,15 +733,15 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
-    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
+    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
-    removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
-    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
+    removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
     /**
@@ -740,8 +751,6 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
-    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
-    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

package/dist/modules/Order/types.js

@@ -63,6 +63,17 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 清空时整个 payload 为 null。
  */
 
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */

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

@@ -15,7 +15,6 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
-import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -178,15 +177,6 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
-export interface CartOrderHolder {
-    customer_id?: number;
-    form_id: number | string;
-    form_record: (number | string)[] | null;
-}
-/**
- * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
- */
-export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;

package/dist/modules/Order/utils.js

@@ -20,7 +20,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
-import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
 /**
@@ -745,41 +744,10 @@ export var mergeRelationForms = function mergeRelationForms(relationForms) {
     return item.form_record_ids.length > 0;
   }); // 过滤掉没有有效记录的表单
 };
-function getCustomerIdFromStorage(window) {
-  try {
-    var _window$getLocalStora;
-    var customer = JSON.parse((window === null || window === void 0 || (_window$getLocalStora = window.getLocalStorage) === null || _window$getLocalStora === void 0 ? void 0 : _window$getLocalStora.call(window, 'customer')) || '{}');
-    var customerId = Number(customer === null || customer === void 0 ? void 0 : customer.id);
-    return Number.isFinite(customerId) && customerId > 0 ? customerId : undefined;
-  } catch (_unused) {
-    return undefined;
-  }
-}
-
-/**
- * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
- */
-export function ensureCartItemOriginHolder(cartItem, window) {
-  var _cartItem$_origin, _cartItem$_productIni;
-  if (cartItem !== null && cartItem !== void 0 && (_cartItem$_origin = cartItem._origin) !== null && _cartItem$_origin !== void 0 && _cartItem$_origin.holder) {
-    return;
-  }
-  var holderConfig = getProductHolderConfig((_cartItem$_productIni = cartItem === null || cartItem === void 0 ? void 0 : cartItem._productInit) !== null && _cartItem$_productIni !== void 0 ? _cartItem$_productIni : cartItem === null || cartItem === void 0 ? void 0 : cartItem._productOrigin);
-  var formRecordId = cartItem === null || cartItem === void 0 ? void 0 : cartItem.holder_id;
-  if (!(holderConfig !== null && holderConfig !== void 0 && holderConfig.resource_id) || formRecordId == null) {
-    return;
-  }
-  cartItem._origin.holder = {
-    customer_id: getCustomerIdFromStorage(window),
-    form_id: holderConfig.resource_id,
-    form_record: [formRecordId]
-  };
-}
-;
 export var getAllDiscountList = function getAllDiscountList(cartItem) {
-  var _cartItem$_origin2, _cartItem$_origin3;
-  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.discount_list) || [];
-  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin3 = cartItem._origin) === null || _cartItem$_origin3 === void 0 || (_cartItem$_origin3 = _cartItem$_origin3.product) === null || _cartItem$_origin3 === void 0 ? void 0 : _cartItem$_origin3.product_bundle) || []).forEach(function (item) {
+  var _cartItem$_origin, _cartItem$_origin2;
+  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 || (_cartItem$_origin = _cartItem$_origin.product) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.discount_list) || [];
+  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.product_bundle) || []).forEach(function (item) {
     discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
     item.discount_list = undefined;
   });

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

@@ -193,7 +193,6 @@ export interface ProductData {
         status?: string;
         required?: number | string | boolean;
         resource_id?: number | string | null;
-        [key: string]: any;
     };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;

package/dist/modules/ProductList/index.js

@@ -157,10 +157,6 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           userPlugin,
           customer_id,
           _userPlugin$get,
-          channelMap,
-          rawApplicationCode,
-          mappedApplicationCode,
-          queryPayload,
           productsData,
           sortedList,
           _args4 = arguments;
@@ -189,16 +185,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 console.error(error);
               }
               // 如果没传schedule_date，则从
-              channelMap = {
-                online_store: 'online-store',
-                scan_to_order: 'online-store',
-                'scan-to-order': 'online-store',
-                scan_to_order_2: 'mobile_order',
-                scan_to_order_3: 'scantoorder3'
-              };
-              rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
-              mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+              _context4.next = 7;
+              return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
                 exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
@@ -206,35 +194,28 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 status: status,
                 num: 500,
                 skip: 1,
-                customer_id: customer_id
-              }, Array.isArray(category_ids) && category_ids.length ? {
-                category_ids: category_ids
-              } : {}), Array.isArray(product_ids) && product_ids.length ? {
-                ids: product_ids
-              } : {}), Array.isArray(collection) && collection.length ? {
-                collection: collection
-              } : {}), {}, {
-                front_end_cache_id: cacheId
-              }, Array.isArray(menu_list_ids) && menu_list_ids.length ? {
-                menu_list_ids: menu_list_ids
-              } : {}), {}, {
+                customer_id: customer_id,
+                category_ids: category_ids,
+                ids: product_ids,
+                collection: collection,
+                front_end_cache_id: cacheId,
+                menu_list_ids: menu_list_ids,
                 with_count: with_count,
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
-                application_code: mappedApplicationCode,
+                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
                 is_eject: 1,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                extension_type: extension_type
-              });
-              _context4.next = 11;
-              return this.request.post("/product/query", queryPayload, {
+                extension_type: extension_type,
+                strategy_context: strategy_context
+              }, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 11:
+            case 7:
               productsData = _context4.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
@@ -247,7 +228,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context4.abrupt("return", sortedList);
-            case 15:
+            case 11:
             case "end":
               return _context4.stop();
           }

package/dist/modules/Quotation/index.d.ts

@@ -21,7 +21,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Quotation/index.js

@@ -90,7 +90,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               res = _context2.sent;
               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 b.sort - a.sort;
+                return a.sort - b.sort;
               });
               this.store.list = list;
             case 9:
@@ -151,7 +151,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Rules/index.js

@@ -366,7 +366,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         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 resolveReapplyBookingDiscountPercent = function resolveReapplyBookingDiscountPercent(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);
@@ -438,8 +438,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id,
             parentId: product._id,
             quantity: product.quantity,
-            num: product.num,
-            booking_id: product.booking_id
+            num: product.num
           });
 
           // 2. 展开 bundle 子商品
@@ -454,6 +453,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundleIndex: bundleIndex,
                 // 虚拟商品属性
                 price: Number(bundleItem.price || 0),
+                // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+                // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+                // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
                 id: (_ref3 = (_bundleItem$bundle_pr = bundleItem.bundle_product_id) !== null && _bundleItem$bundle_pr !== void 0 ? _bundleItem$bundle_pr : bundleItem._bundle_product_id) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_id,
                 _id: "".concat(product._id, "_bundle_").concat(bundleIndex),
                 parentId: product._id,
@@ -463,7 +465,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 origin_total: new Decimal(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
                 original_price: bundleItem.original_price,
                 // 继承主商品属性
-                booking_id: bundleItem.booking_id,
+                booking_id: product.booking_id,
                 discount_list: bundleItem.discount_list || []
               });
             });
@@ -988,8 +990,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: discount.product_id
               },
               metadata: {
-                num: num,
-                discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
+                num: num
               }
             };
             applicableProducts.push(productData);
@@ -1095,11 +1096,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (isPersistedProduct && hasExistingWalletDiscount) {
           if (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
-          } else {
-            processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              processed: true
-            })]);
           }
+          // bundle 虚拟项没有携带完整的历史价格字段。这里不写入 processed map，
+          // 重组阶段会直接保留原始 bundleItem，避免把 bundle_selling_price
+          // 覆盖为未折扣的 price，导致已支付金额再次进入应付。
           return;
         }
 
@@ -1440,9 +1440,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               amount = productAllocation.discountAmount;
               productDiscountDifference = productAllocation.difference;
               mainProductSellingPrice = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
-            } else if (resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
+            } else if (resolveReapplyBookingDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
               // Change time 重套编辑态折扣卡时，历史 par_value 不是运行时折扣口径，优先使用后端快照里的 percent。
-              var percent = resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount);
+              var percent = resolveReapplyBookingDiscountPercent(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();
@@ -1485,8 +1485,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _num: isGoodPass ? 1 : product.num,
               config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: _objectSpread(_objectSpread({
-                num: 1,
-                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
+                num: 1
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
               }), {}, {
@@ -1573,7 +1572,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
-                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1,
@@ -1605,12 +1603,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: "".concat(flatItem._id, "_split_rest"),
                 num: normalNum,
                 quantity: normalNum,
-                discount_list: _this4.filterDiscountListByType(flatItem.discount_list, 'promotion'),
+                discount_list: [],
                 processed: true
               }));
             }
           } else {
-            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu9;
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _reapplyDiscountPerce2, _flatItem$parentProdu9;
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
@@ -1628,11 +1626,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var targetProductTotal;
             var fixedAmountPerItem;
             var _productDiscountDifference;
+            var _reapplyDiscountPercent;
             if (_isOrderLevel && _productAllocation) {
               // order_level：使用预计算的单价折扣金额（已经是单价，无需再除以数量）
               fixedAmountPerItem = _productAllocation.discountAmount;
               _productDiscountDifference = _productAllocation.difference;
               targetProductTotal = Math.max(new Decimal(_productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+            } else if (resolveReapplyBookingDiscountPercent(originProduct, _selectedDiscount3) !== undefined) {
+              // hydrate 后 par_value 可能是余额/原值（例如 3500），百分比口径以
+              // 后端折扣快照 discount.percent 为准，与主商品重套逻辑保持一致。
+              var _percent = resolveReapplyBookingDiscountPercent(originProduct, _selectedDiscount3);
+              _reapplyDiscountPercent = new Decimal(_percent).toFixed(2);
+              targetProductTotal = new Decimal(_productOriginTotal).mul(new Decimal(100).minus(_percent)).div(100).toDecimalPlaces(2).toNumber();
+              fixedAmountPerItem = new Decimal(_productOriginTotal).minus(targetProductTotal).toNumber();
             } else {
               // item_level 或其他类型：使用原有逻辑
               targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
@@ -1653,13 +1659,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
                 product_id: product.id || product.product_id,
-                percent: _selectedDiscount3.par_value,
+                percent: (_reapplyDiscountPerce2 = _reapplyDiscountPercent) !== null && _reapplyDiscountPerce2 !== void 0 ? _reapplyDiscountPerce2 : _selectedDiscount3.par_value,
                 discount_product_id: _selectedDiscount3.product_id
               },
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
-                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
@@ -1675,7 +1680,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-              discount_list: _this4.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
+              discount_list: [_discountDetail2],
               processed: true
             }));
           }
@@ -2150,7 +2155,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkPackageSubItemUsageRules",
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
-      var _flatItem$product;
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
       var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
@@ -2172,7 +2176,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         filter = _ref17$filter === void 0 ? 0 : _ref17$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;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2215,13 +2218,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2271,42 +2274,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 检查 rules
           if (rules.length > 0) {
-            var _isOriginalPrice3 = _isOriginalPrice2 && rules.includes('original_price');
-            var _isMarkupPrice3 = _isMarkupPrice2 && rules.includes('markup_price');
-            // 价格是否符合规则：原价或加价
-            var _isPriceValid = _isOriginalPrice3 || _isMarkupPrice3;
-            // 套餐适用范围校验
-            var _isScopeValid = false;
-
-            // 排除套餐判断, product_all值兼容旧数据
-            if (scopeType === 'all_packages' || scopeType === 'product_all') {
-              // 所有套餐可用
-              if (!filter) {
-                _isScopeValid = true;
-              } else {
-                _isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
-              }
-            }
-
-            // 包含套餐判断, products值兼容旧数据
-            if (scopeType === 'specific_packages' || scopeType === 'products') {
-              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
-            }
-
-            // 价格和套餐适用范围都符合，则可用
-            if (_isPriceValid && _isScopeValid) {
+            // 检查原价
+            if (_isOriginalPrice2 && rules.includes('original_price')) {
               return true;
             }
 
-            // 检查原价
-            // if (isOriginalPrice && rules.includes('original_price')) {
-            //   return true;
-            // }
-
             // 检查加价
-            // if (isMarkupPrice && rules.includes('markup_price')) {
-            //   return true;
-            // }
+            if (_isMarkupPrice2 && rules.includes('markup_price')) {
+              return true;
+            }
 
             // 如果都不匹配，则不可用
             return false;

package/dist/modules/SalesSummary/index.js

@@ -64,19 +64,21 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               this.store.surchargeList = ((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.surchargeList) || [];
               this.store.summary = ((_options$initialState2 = options.initialState) === null || _options$initialState2 === void 0 ? void 0 : _options$initialState2.summary) || createEmptySalesSummary();
               this.surchargeListModuleName = ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.surchargeListModuleName) || 'surchargeList';
-
-              // if (!this.appPlugin) {
-              //   throw new Error('SalesSummaryModule 需要 app 插件支持');
-              // }
-              if (this.request) {
+              if (this.appPlugin) {
                 _context.next = 10;
                 break;
               }
-              throw new Error('SalesSummaryModule 需要 request 插件支持');
+              throw new Error('SalesSummaryModule 需要 app 插件支持');
             case 10:
-              _context.next = 12;
-              return this.getSurchargeList();
+              if (this.request) {
+                _context.next = 12;
+                break;
+              }
+              throw new Error('SalesSummaryModule 需要 request 插件支持');
             case 12:
+              _context.next = 14;
+              return this.getSurchargeList();
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -190,11 +192,10 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAppData",
     value: function getAppData(key) {
-      var _this$appPlugin, _this$appPlugin$getDa, _this$appPlugin2, _this$appPlugin2$getA, _app$models, _app$models$getStore, _app$models$getStore$, _app$models$getStore$2;
-      var getData = (_this$appPlugin = this.appPlugin) === null || _this$appPlugin === void 0 || (_this$appPlugin$getDa = _this$appPlugin.getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
+      var _this$appPlugin$getDa, _this$appPlugin, _app$models, _app$models$getStore, _app$models$getStore$, _app$models$getStore$2;
+      var getData = (_this$appPlugin$getDa = (_this$appPlugin = this.appPlugin).getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
       if (typeof getData === 'function') return getData(key);
-      var app = (_this$appPlugin2 = this.appPlugin) === null || _this$appPlugin2 === void 0 || (_this$appPlugin2$getA = _this$appPlugin2.getApp) === null || _this$appPlugin2$getA === void 0 ? void 0 : _this$appPlugin2$getA.call(_this$appPlugin2);
-      if (!app) return undefined;
+      var app = this.appPlugin.getApp();
       var coreData = app === null || app === void 0 || (_app$models = app.models) === null || _app$models === void 0 || (_app$models$getStore = _app$models.getStore) === null || _app$models$getStore === void 0 || (_app$models$getStore$ = (_app$models$getStore$2 = _app$models$getStore.call(_app$models)).getDataByModel) === null || _app$models$getStore$ === void 0 ? void 0 : _app$models$getStore$.call(_app$models$getStore$2, 'core', 'core');
       return coreData === null || coreData === void 0 ? void 0 : coreData[key];
     }

package/dist/modules/SalesSummary/utils.js

@@ -87,7 +87,13 @@ function getUnitOriginalTotal(product) {
 function isGeneratedVoucherProduct(product) {
   var record = product;
   var metadata = (record === null || record === void 0 ? void 0 : record.metadata) || {};
-  return (record === null || record === void 0 ? void 0 : record.extension_type) === 'product_voucher' || metadata.parent_order_detail_id !== undefined || metadata.gift_card_type !== undefined;
+  var isGeneratedChild = metadata.parent_order_detail_id !== undefined || metadata.gift_card_type !== undefined;
+  if (isGeneratedChild) return true;
+
+  // `product_voucher` 既可能是当前购物车生成的零价子券，也可能是独立售卖的
+  // gift card。已有 order_detail_id 且没有 parent 标记的是后者，必须继续计价。
+  var isPersisted = (record === null || record === void 0 ? void 0 : record.order_detail_id) !== undefined && (record === null || record === void 0 ? void 0 : record.order_detail_id) !== null;
+  return (record === null || record === void 0 ? void 0 : record.extension_type) === 'product_voucher' && !isPersisted;
 }
 function buildSurchargeServiceItems(products) {
   return products.map(function (product) {

package/dist/modules/ScanOrderLogger/index.d.ts

@@ -11,12 +11,10 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
-    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
-    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }