@pisell/pisellos 2.2.272 → 2.2.274

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

@@ -40,11 +40,11 @@ export declare enum RoundingRule {
     /** 标准舍入（中点向上） */
     Standard = "standard_rounding",
     /** 标准舍入（中点向下） */
-    StandardDown = "standard_down",
+    StandardDown = "standard_rounding_midpoint_down",
     /** 总是向上舍入 */
-    AlwaysUp = "always_up",
+    AlwaysUp = "round_up",
     /** 总是向下舍入 */
-    AlwaysDown = "always_down"
+    AlwaysDown = "round_down"
 }
 /**
  * 舍入结果
@@ -87,30 +87,12 @@ export interface PaymentMethod {
     /** 其他配置信息 */
     [key: string]: any;
 }
-/** 支付项扩展元数据 */
-export interface PaymentItemMetadata {
-    /** 钱箱 ID */
-    shop_wallet_pass_id?: string;
-    /** 三方支付交易流水号 */
-    unique_payment_number?: string;
-    /** 刷卡机设备快照；PaymentModule 不解析内部字段 */
-    card_reader_snapshot?: Record<string, unknown>;
-    /** rounding 规则 */
-    rounding_rule?: any;
-    /** 实付金额（现金支付时的实际给出金额） */
-    actual_paid_amount?: number;
-    /** 找零金额（现金支付时的找零金额） */
-    change_given_amount?: number;
-    [key: string]: unknown;
-}
 /**
  * 支付项
  */
 export interface PaymentItem {
     /** 当前支付项的唯一 ID */
     uuid: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -128,7 +110,18 @@ export interface PaymentItem {
     /** Wallet Pass 本次使用值 */
     wallet_pass_use_value?: string | number | null;
     /** 拓展参数字段 */
-    metadata?: PaymentItemMetadata;
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rouding规则 */
+        rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
+    };
     /** rouding金额 */
     rounding_amount?: string;
     /** 三方支付手续费 */
@@ -235,10 +228,6 @@ export interface UpdateOrderParams {
  * 支付项输入类型（允许 amount 为数字）
  */
 export interface PaymentItemInput {
-    /** 调用方已有的支付项运行态 UUID；存在时复用为 payment_number 的唯一号段 */
-    uuid?: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string | number;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -267,7 +256,18 @@ export interface PaymentItemInput {
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
     /** 扩展参数字段 */
-    metadata?: PaymentItemMetadata;
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rounding规则 */
+        rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
+    };
     /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
@@ -302,8 +302,6 @@ export interface PaymentUpdateFields {
     voucher_id?: string;
     /** 该支付项是否已经同步给后端服务器（只有网络请求成功后才为true） */
     isSynced?: boolean;
-    /** 支付项扩展元数据；更新时与原 metadata 浅合并 */
-    metadata?: PaymentItemMetadata;
     /** 同步错误信息（业务错误时记录错误信息，用于区分"未同步"和"同步失败"） */
     syncError?: {
         error: string;

package/dist/modules/Payment/types.js

@@ -40,9 +40,9 @@ export var TaskRunStatus = /*#__PURE__*/function (TaskRunStatus) {
  */
 export var RoundingRule = /*#__PURE__*/function (RoundingRule) {
   RoundingRule["Standard"] = "standard_rounding";
-  RoundingRule["StandardDown"] = "standard_down";
-  RoundingRule["AlwaysUp"] = "always_up";
-  RoundingRule["AlwaysDown"] = "always_down";
+  RoundingRule["StandardDown"] = "standard_rounding_midpoint_down";
+  RoundingRule["AlwaysUp"] = "round_up";
+  RoundingRule["AlwaysDown"] = "round_down";
   return RoundingRule;
 }({});
 
@@ -65,8 +65,6 @@ export var RoundingInterval = /*#__PURE__*/function (RoundingInterval) {
  * 支付方式信息
  */
 
-/** 支付项扩展元数据 */
-
 /**
  * 支付项
  */

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

@@ -35,7 +35,6 @@ 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[];

package/dist/modules/Rules/index.js

@@ -241,17 +241,6 @@ 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",
@@ -362,7 +351,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);
@@ -440,7 +429,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 2. 展开 bundle 子商品
           if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
             product.bundle.forEach(function (bundleItem, bundleIndex) {
-              var _ref3, _bundleItem$bundle_pr;
+              var _ref3, _bundleItem$_bundle_p;
               flattened.push({
                 type: 'bundle',
                 originProduct: originProduct,
@@ -449,7 +438,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundleIndex: bundleIndex,
                 // 虚拟商品属性
                 price: Number(bundleItem.price || 0),
-                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,
+                // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+                // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+                // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
+                id: (_ref3 = (_bundleItem$_bundle_p = bundleItem._bundle_product_id) !== null && _bundleItem$_bundle_p !== void 0 ? _bundleItem$_bundle_p : bundleItem.bundle_product_id) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_id,
                 _id: "".concat(product._id, "_bundle_").concat(bundleIndex),
                 parentId: product._id,
                 num: bundleItem.num || 1,
@@ -740,9 +732,6 @@ 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) {
@@ -929,7 +918,6 @@ 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;
@@ -955,7 +943,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && 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);
@@ -1089,18 +1077,16 @@ 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;
         }
 
         // 找到适用于此商品的所有优惠券，仅考虑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);
@@ -1178,23 +1164,16 @@ 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 discountType = discount.tag || discount.type;
-          return String(discount.id) === String(options.discountId) && ['discount_card', 'product_discount_card'].includes(discountType);
-        }) : undefined;
-
-        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
-        var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
+        // 选择第一个适用的优惠券（已经按过期时间排序）
+        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
+        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
+        var selectedDiscountCard = 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 isManualDiscount = false;
-        var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
           var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
@@ -1206,8 +1185,7 @@ 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';
           })));
-          isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
-          if (product.inPromotion && !isItemRewardProductDiscount) {
+          if (product.inPromotion) {
             isManualDiscount = false;
           }
         } else {
@@ -1317,17 +1295,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              }) || isItemRewardProductDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+              }) || 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 ? _objectSpread({
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
                 price: product.price,
-                main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
-              }, isItemRewardProductDiscount ? {
-                total: total
-              } : {}) : {
+                main_product_selling_price: product.price
+              } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
@@ -1434,9 +1410,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();
@@ -1602,7 +1578,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } 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);
@@ -1620,11 +1596,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);
@@ -1645,7 +1629,7 @@ 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({
@@ -1776,11 +1760,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$metadata3;
+                      var _item$metadata;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用拆分后的 num
                       });
@@ -1799,11 +1783,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   if (item.processed) {
                     // 🔥 同样需要更新 discount_list 中的 num
                     var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata4;
+                      var _item$metadata2;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用当前的 num
                       });
@@ -1844,8 +1828,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 使用更新后的列表计算折扣金额
               var mainDiscountList = updatedMainDiscountList.filter(function (item) {
-                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);
+                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);
               });
               if (mainDiscountList && mainDiscountList.length > 0) {
                 var _Decimal$minus$toNumb, _mainProductData$orig;
@@ -1918,8 +1902,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 使用更新后的列表计算折扣金额
                 var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
-                  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);
+                  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);
                 });
                 if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
                   var _Decimal$minus$toNumb2, _mainProductData$orig2;

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/server/index.d.ts

@@ -57,7 +57,6 @@ declare class Server {
     private readonly BOOKING_REMOTE_CACHE_MAX_ENTRIES;
     private salesSearchSubscribers;
     private deviceTaskActionsRegistered;
-    private localPaymentUpdateQueues;
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
@@ -121,8 +120,6 @@ declare class Server {
     private handleSyncSalesTask;
     private runCheckoutSync;
     private omitCheckoutSyncMode;
-    private buildRemoteCheckoutData;
-    private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
@@ -456,18 +453,6 @@ declare class Server {
      */
     private handleUpdateLocalOrder;
     private handleOrderSalesCheckout;
-    private handleOrderSalesDraft;
-    private createLocalPaymentOperationId;
-    private buildLocalPaymentOrderLogContext;
-    private isValidLocalPaymentDecimal;
-    private getInvalidLocalPaymentSurchargeFields;
-    private buildLocalPaymentSurchargeUpdate;
-    private handleGetLocalPayment;
-    private handleUpdateLocalPayment;
-    private runLocalPaymentUpdateInQueue;
-    private processLocalPaymentUpdate;
-    private processSuccessfulLocalPayment;
-    private sanitizeLocalRecoveryOrder;
     private handleOrderCheckout;
     private getDeviceTaskPlugin;
     private getIdGeneratorPlugin;
@@ -495,7 +480,6 @@ declare class Server {
     private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
-    private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
     private shouldBuildSmallTicketData;