@pisell/pisellos 2.2.198 → 2.2.199

package/dist/modules/Order/utils.js

@@ -43,13 +43,15 @@ export function composeLinePrice(params) {
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _ref, _item$original_price, _item$bundle_selling_, _ref2, _item$num;
+        var _ref, _item$num;
         var item = _step.value;
-        var rawPrice = useOriginalBundle ? (_ref = (_item$original_price = item === null || item === void 0 ? void 0 : item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item === null || item === void 0 ? void 0 : item.product_price) !== null && _ref !== void 0 ? _ref : item === null || item === void 0 ? void 0 : item.price : (_item$bundle_selling_ = item === null || item === void 0 ? void 0 : item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item === null || item === void 0 ? void 0 : item.price;
-        var price = new Decimal(Number(rawPrice) || 0);
-        var rawNum = (_ref2 = (_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : item === null || item === void 0 ? void 0 : item.quantity) !== null && _ref2 !== void 0 ? _ref2 : 1;
+        // markdown（减价）按带符号净额取减；markup/原价维持相加。
+        var signedUnit = getBundleSignedUnit(item, {
+          useOriginal: useOriginalBundle
+        });
+        var rawNum = (_ref = (_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : item === null || item === void 0 ? void 0 : item.quantity) !== null && _ref !== void 0 ? _ref : 1;
         var num = new Decimal(Number(rawNum) || 0);
-        total = total.plus(price.times(num));
+        total = total.plus(signedUnit.times(num));
       }
     } catch (err) {
       _iterator.e(err);
@@ -106,6 +108,55 @@ export function sumOptionUnitPrice(options) {
   return total;
 }
 
+/**
+ * 判定套餐子商品是否为 markdown（减价）类型。
+ * 与后端口径一致：price_type='markdown' 且 price_type_ext 非 'product_price'（原价子商品）。
+ */
+export function isMarkdownBundle(bundle) {
+  var _bundle$price_type_ex, _bundle$price_type;
+  if (!bundle || _typeof(bundle) !== 'object') return false;
+  var ext = (_bundle$price_type_ex = bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : bundle.custom_price_type_ext;
+  var type = (_bundle$price_type = bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : bundle.custom_price_type;
+  return type === 'markdown' && ext !== 'product_price';
+}
+
+/**
+ * 套餐子商品对「行价」的带符号单位贡献（与后端 markdown 口径对齐）。
+ *
+ * - markdown（减价）：净额 = |catalog 毛价| − Σ(option.add_price×num)，**取负**（行内减）。
+ *   catalog 毛价优先 `price`/`custom_price`（避免读已落净额的 `bundle_selling_price` 造成 option 二次扣减）；
+ *   仅当毛价缺失（历史/hydrate 仅剩净额）时退回 `bundle_selling_price`，且此时不再扣 option。
+ * - markup（加价）/原价子商品：维持 `+(bundle_selling_price ?? price)`，行为不变。
+ */
+export function getBundleSignedUnit(bundle, options) {
+  var _options$useOriginal, _ref8, _bundle$original_pric2, _bundle$bundle_sellin;
+  if (!bundle || _typeof(bundle) !== 'object') return new Decimal(0);
+  var useOriginal = (_options$useOriginal = options === null || options === void 0 ? void 0 : options.useOriginal) !== null && _options$useOriginal !== void 0 ? _options$useOriginal : false;
+  if (isMarkdownBundle(bundle)) {
+    var _ref2, _ref3, _ref4, _bundle$original_pric, _ref5, _ref6, _ref7, _bundle$custom_price;
+    var catalog = useOriginal ? (_ref2 = (_ref3 = (_ref4 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle.product_price) !== null && _ref4 !== void 0 ? _ref4 : bundle.custom_price) !== null && _ref3 !== void 0 ? _ref3 : bundle.base_price) !== null && _ref2 !== void 0 ? _ref2 : bundle.price : (_ref5 = (_ref6 = (_ref7 = (_bundle$custom_price = bundle.custom_price) !== null && _bundle$custom_price !== void 0 ? _bundle$custom_price : bundle.product_price) !== null && _ref7 !== void 0 ? _ref7 : bundle.original_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.base_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.price;
+    if (catalog !== undefined && catalog !== null && catalog !== '') {
+      var raw = new Decimal(Number(catalog) || 0);
+      // 负值表示价格已是「带符号净额」（如 cart/changePrice 产出的 -3.7），直接取用不再扣 option，
+      // 避免与下游 option 二次扣减；正值为毛价（H5 路径，如 5），净额 = price − Σoptions 后取负。
+      if (raw.lt(0)) return raw;
+      return raw.minus(sumOptionUnitPrice(bundle.option)).negated();
+    }
+    // 仅剩净额（无毛价）兜底：直接取负，不再扣 option
+    return new Decimal(Number(bundle.bundle_selling_price) || 0).abs().negated();
+  }
+  var rawPrice = useOriginal ? (_ref8 = (_bundle$original_pric2 = bundle.original_price) !== null && _bundle$original_pric2 !== void 0 ? _bundle$original_pric2 : bundle.product_price) !== null && _ref8 !== void 0 ? _ref8 : bundle.price : (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price;
+  return new Decimal(Number(rawPrice) || 0);
+}
+
+/**
+ * 套餐子商品 `bundle_selling_price` 的存储净额（正值幅度）。
+ * markdown 取净额绝对值（3.70）；markup/原价维持原值。
+ */
+export function getBundleSellingMagnitude(bundle) {
+  return getBundleSignedUnit(bundle).abs();
+}
+
 /**
  * OrderModule 默认 Rules 钩子工厂。
  *
@@ -118,7 +169,7 @@ export function sumOptionUnitPrice(options) {
  *   不含折扣。**权威源**。
  * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
  * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
- * - `payment_price`：出站 payload 中由 `selling_price` 派生以兼容后端（composite）。
+ * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
  * - `getProduct.price` / `getProduct.original_price` 回传 **source-level 主价**
@@ -263,8 +314,8 @@ export function createDefaultOrderRulesHooks() {
     return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
   var getBundleIdentity = function getBundleIdentity(bundle) {
-    var _ref3, _bundle$bundle_id, _ref4, _ref5, _bundle$bundle_produc, _ref6, _ref7, _bundle$bundle_varian, _ref8, _bundle$bundle_group_;
-    return [(_ref3 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref3 !== void 0 ? _ref3 : '', (_ref4 = (_ref5 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref5 !== void 0 ? _ref5 : bundle.product_id) !== null && _ref4 !== void 0 ? _ref4 : '', (_ref6 = (_ref7 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref7 !== void 0 ? _ref7 : bundle.product_variant_id) !== null && _ref6 !== void 0 ? _ref6 : 0, (_ref8 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref8 !== void 0 ? _ref8 : ''].join('|');
+    var _ref9, _bundle$bundle_id, _ref10, _ref11, _bundle$bundle_produc, _ref12, _ref13, _bundle$bundle_varian, _ref14, _bundle$bundle_group_;
+    return [(_ref9 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref9 !== void 0 ? _ref9 : '', (_ref10 = (_ref11 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref11 !== void 0 ? _ref11 : bundle.product_id) !== null && _ref10 !== void 0 ? _ref10 : '', (_ref12 = (_ref13 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref13 !== void 0 ? _ref13 : bundle.product_variant_id) !== null && _ref12 !== void 0 ? _ref12 : 0, (_ref14 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref14 !== void 0 ? _ref14 : ''].join('|');
   };
   var mergeRulesBundlePrices = function mergeRulesBundlePrices(currentBundle, rulesBundle) {
     if (!Array.isArray(rulesBundle)) return rulesBundle;
@@ -274,14 +325,14 @@ export function createDefaultOrderRulesHooks() {
       currentByIdentity.set(getBundleIdentity(bundle), bundle);
     });
     return rulesBundle.map(function (bundle) {
-      var _bundle$price_type_ex, _ref9, _ref10, _current$price, _ref11, _ref12, _ref13, _current$original_pri;
+      var _bundle$price_type_ex2, _ref15, _ref16, _current$price, _ref17, _ref18, _ref19, _current$original_pri;
       if (!bundle || _typeof(bundle) !== 'object') return bundle;
       var current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current) return bundle;
-      var isProductPriceBundle = ((_bundle$price_type_ex = bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : current.price_type_ext) === 'product_price';
+      var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
       if (!isProductPriceBundle) return bundle;
-      var sourcePrice = (_ref9 = (_ref10 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref10 !== void 0 ? _ref10 : current.original_price) !== null && _ref9 !== void 0 ? _ref9 : current.bundle_selling_price;
-      var originalPrice = (_ref11 = (_ref12 = (_ref13 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref13 !== void 0 ? _ref13 : current.price) !== null && _ref12 !== void 0 ? _ref12 : current.custom_price) !== null && _ref11 !== void 0 ? _ref11 : sourcePrice;
+      var sourcePrice = (_ref15 = (_ref16 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref16 !== void 0 ? _ref16 : current.original_price) !== null && _ref15 !== void 0 ? _ref15 : current.bundle_selling_price;
+      var originalPrice = (_ref17 = (_ref18 = (_ref19 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref19 !== void 0 ? _ref19 : current.price) !== null && _ref18 !== void 0 ? _ref18 : current.custom_price) !== null && _ref17 !== void 0 ? _ref17 : sourcePrice;
       return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundle), sourcePrice !== undefined ? {
         price: sourcePrice
       } : {}), originalPrice !== undefined ? {
@@ -345,10 +396,10 @@ export function createDefaultOrderRulesHooks() {
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref14, _values$quantity, _ref15, _metadataAny$source_p, _values$discount_list, _values$quantity2;
-      var nextNum = Number((_ref14 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref14 !== void 0 ? _ref14 : 1) || 1;
+      var _ref20, _values$quantity, _ref21, _metadataAny$source_p, _values$discount_list, _values$quantity2;
+      var nextNum = Number((_ref20 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref20 !== void 0 ? _ref20 : 1) || 1;
       var metadataAny = product.metadata || {};
-      var existedSource = (_ref15 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref15 !== void 0 ? _ref15 : '0';
+      var existedSource = (_ref21 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref21 !== void 0 ? _ref21 : '0';
       var nextOptions = getProductSkuOptions(product);
       var optionSum = sumOptionUnitPrice(nextOptions);
 
@@ -521,11 +572,16 @@ function toMoneyString(value) {
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(function (b) {
-    var _rawBundle$bundle_sel, _ref16, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref17, _rawBundle$price_type, _ref18, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
+    var _ref22, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref23, _rawBundle$price_type, _ref24, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
     var rawBundle = b && _typeof(b) === 'object' ? b : {};
     var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
-    var sellingPrice = toMoneyString((_rawBundle$bundle_sel = rawBundle.bundle_selling_price) !== null && _rawBundle$bundle_sel !== void 0 ? _rawBundle$bundle_sel : rawBundle.price);
-    var priceValue = (_ref16 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref16 !== void 0 ? _ref16 : rawBundle.bundle_selling_price;
+
+    // bundle_selling_price 出站存「正净额」：markdown 为 |price| − Σoptions（如 3.70），
+    // markup/原价维持原值；与后端口径一致（price 仍为毛价）。
+    var sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    // payment 价由整单折扣均摊层产出；缺省（无折扣）时与 selling 净额同义。
+    var paymentPrice = rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
+    var priceValue = (_ref22 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref22 !== void 0 ? _ref22 : rawBundle.bundle_selling_price;
     var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
     var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -538,9 +594,10 @@ function formatSubmitBundleItems(bundle) {
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
       extension_type: (_rawBundle$extension_2 = rawBundle.extension_type) !== null && _rawBundle$extension_2 !== void 0 ? _rawBundle$extension_2 : 'normal',
       price: priceValue,
-      price_type: (_ref17 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref17 !== void 0 ? _ref17 : '',
-      price_type_ext: (_ref18 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref18 !== void 0 ? _ref18 : '',
+      price_type: (_ref23 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref23 !== void 0 ? _ref23 : '',
+      price_type_ext: (_ref24 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref24 !== void 0 ? _ref24 : '',
       bundle_selling_price: sellingPrice,
+      bundle_payment_price: paymentPrice,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: (_rawBundle$bundle_gro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_group_id) !== null && _rawBundle$bundle_gro !== void 0 ? _rawBundle$bundle_gro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
       bundle_id: (_rawBundle$bundle_id = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_id) !== null && _rawBundle$bundle_id !== void 0 ? _rawBundle$bundle_id : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.id,
@@ -562,7 +619,7 @@ function formatSubmitBundleItems(bundle) {
  *   = `metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
  * - `original_price`：**行 composite 券前单价**
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
- * - `payment_price`：兼容后端的出站字段，直接从 `selling_price` 派生（composite）。
+ * - `payment_price`：兼容后端的出站字段，行 composite 已减整单折扣均摊（无折扣时与 `selling_price` 同义）。
  * - `metadata.source_product_price`：主商品/variant 基础价（不含 option、不含折扣），权威源。
  * - `metadata.main_product_original_price`：含 option、不含折扣。
  * - `metadata.main_product_selling_price`：含 option、含主商品折扣。
@@ -571,10 +628,10 @@ function formatSubmitBundleItems(bundle) {
  * 本函数不再改造价格字段形状，仅做字段/metadata 裁剪。
  */
 function normalizeSubmitProduct(product) {
-  var _rawMetadata$product_, _submitProduct$produc;
-  var _ref19 = product,
-    _runtimeUid = _ref19.unique_identification_number,
-    submitProduct = _objectWithoutProperties(_ref19, _excluded);
+  var _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
+  var _ref25 = product,
+    _runtimeUid = _ref25.unique_identification_number,
+    submitProduct = _objectWithoutProperties(_ref25, _excluded);
   var num = submitProduct.num,
     _productSurchargeFee = submitProduct.surcharge_fee,
     _deprecatedDiscountAmount = submitProduct.discount_amount,
@@ -590,7 +647,7 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
   }
-  var priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'parent_unique_identification_number', 'product_add_schedule_time'];
+  var priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'main_product_attached_bundle_selling_price', 'main_product_attached_bundle_payment_price', 'average_discount_amount_rate', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'parent_unique_identification_number', 'product_add_schedule_time'];
   for (var _i = 0, _priceMetaKeys = priceMetaKeys; _i < _priceMetaKeys.length; _i++) {
     var key = _priceMetaKeys[_i];
     if (rawMetadata[key] !== undefined) {
@@ -615,9 +672,9 @@ function normalizeSubmitProduct(product) {
     discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
-    // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
-    // 新语义下 selling_price 是 composite（含 option/bundle），payment_price 同语义。
-    payment_price: submitProduct.selling_price
+    // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
+    // 由整单折扣均摊层产出；缺省（无折扣）时与 selling_price 同义。
+    payment_price: (_submitProduct$paymen = submitProduct.payment_price) !== null && _submitProduct$paymen !== void 0 ? _submitProduct$paymen : submitProduct.selling_price
   });
 }
 var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type'];
@@ -738,7 +795,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _ref21, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _tempOrder$customer_i, _ref27, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -750,26 +807,26 @@ export function buildSubmitPayload(params) {
     enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
-  var _ref20 = tempOrder,
-    _extend = _ref20._extend,
-    _relationId = _ref20.relation_id,
-    _tableFormId = _ref20.table_form_id,
-    _resourceId = _ref20.resource_id,
-    _summary = _ref20.summary,
-    _lastOrderInfo = _ref20.lastOrderInfo,
-    _paidAmount = _ref20.paid_amount,
-    _shopId = _ref20.shop_id,
-    _shopNote = _ref20.shop_note,
-    _shopServiceType = _ref20.shop_service_type,
-    _startTime = _ref20.start_time,
-    _customer = _ref20.customer,
-    _discountList = _ref20.discount_list,
-    _rootTaxFee = _ref20.tax_fee,
-    _totalAmount = _ref20.total_amount,
-    _totalRefundAmount = _ref20.total_refund_amount,
-    _createDate = _ref20.create_date,
-    _holderId = _ref20.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref20, _excluded3);
+  var _ref26 = tempOrder,
+    _extend = _ref26._extend,
+    _relationId = _ref26.relation_id,
+    _tableFormId = _ref26.table_form_id,
+    _resourceId = _ref26.resource_id,
+    _summary = _ref26.summary,
+    _lastOrderInfo = _ref26.lastOrderInfo,
+    _paidAmount = _ref26.paid_amount,
+    _shopId = _ref26.shop_id,
+    _shopNote = _ref26.shop_note,
+    _shopServiceType = _ref26.shop_service_type,
+    _startTime = _ref26.start_time,
+    _customer = _ref26.customer,
+    _discountList = _ref26.discount_list,
+    _rootTaxFee = _ref26.tax_fee,
+    _totalAmount = _ref26.total_amount,
+    _totalRefundAmount = _ref26.total_refund_amount,
+    _createDate = _ref26.create_date,
+    _holderId = _ref26.holder_id,
+    tempOrderRest = _objectWithoutProperties(_ref26, _excluded3);
   var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
   if (!submitType) {
     var _tempOrder$bookings;
@@ -791,7 +848,7 @@ export function buildSubmitPayload(params) {
     type: submitType,
     business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref21 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref21 !== void 0 ? _ref21 : 'online_store',
+    order_sales_channel: (_ref27 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref27 !== void 0 ? _ref27 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -817,10 +874,10 @@ export function buildSubmitPayload(params) {
     // holder: tempOrder.holder || null,
     // summary,
     metadata: function () {
-      var _ref22 = tempOrder.metadata || {},
-        _collectPax = _ref22.collect_pax,
-        _tableOccupancyDuration = _ref22.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref22, _excluded4);
+      var _ref28 = tempOrder.metadata || {},
+        _collectPax = _ref28.collect_pax,
+        _tableOccupancyDuration = _ref28.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref28, _excluded4);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {

package/dist/modules/SalesSummary/utils.js

@@ -17,7 +17,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import Decimal from 'decimal.js';
 import { getSurcharge, getSurchargeAmount } from "../Summary/utils";
-import { getProductSkuOptions } from "../Order/utils";
+import { getBundleSellingMagnitude, getBundleSignedUnit, getProductSkuOptions, isMarkdownBundle } from "../Order/utils";
 function toDecimal(value) {
   return new Decimal(value || 0);
 }
@@ -57,10 +57,12 @@ function getBundleUnitPrice(product) {
   var useOriginal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var bundleItems = product.product_bundle || [];
   return bundleItems.reduce(function (sum, item) {
-    var _ref, _item$original_price, _item$bundle_selling_;
     var quantity = getSafeNum(item === null || item === void 0 ? void 0 : item.num);
-    var price = useOriginal ? toDecimal((_ref = (_item$original_price = item === null || item === void 0 ? void 0 : item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item === null || item === void 0 ? void 0 : item.product_price) !== null && _ref !== void 0 ? _ref : item === null || item === void 0 ? void 0 : item.price) : toDecimal((_item$bundle_selling_ = item === null || item === void 0 ? void 0 : item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item === null || item === void 0 ? void 0 : item.price);
-    return sum.plus(price.times(quantity));
+    // markdown（减价）按带符号净额取减；markup/原价维持相加。
+    var signedUnit = getBundleSignedUnit(item, {
+      useOriginal: useOriginal
+    });
+    return sum.plus(signedUnit.times(quantity));
   }, new Decimal(0));
 }
 
@@ -151,26 +153,26 @@ function getSurchargeConfigById(surchargeList) {
   return map;
 }
 function getMainSurchargeUnitAmount(product) {
-  var _ref2, _ref3, _record$metadata$main, _record$metadata, _record$metadata2;
+  var _ref, _ref2, _record$metadata$main, _record$metadata, _record$metadata2;
   var record = product;
-  return toDecimal((_ref2 = (_ref3 = (_record$metadata$main = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.main_product_attached_bundle_selling_price) !== null && _record$metadata$main !== void 0 ? _record$metadata$main : (_record$metadata2 = record.metadata) === null || _record$metadata2 === void 0 ? void 0 : _record$metadata2.main_product_selling_price) !== null && _ref3 !== void 0 ? _ref3 : record.selling_price) !== null && _ref2 !== void 0 ? _ref2 : 0);
+  return toDecimal((_ref = (_ref2 = (_record$metadata$main = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.main_product_attached_bundle_selling_price) !== null && _record$metadata$main !== void 0 ? _record$metadata$main : (_record$metadata2 = record.metadata) === null || _record$metadata2 === void 0 ? void 0 : _record$metadata2.main_product_selling_price) !== null && _ref2 !== void 0 ? _ref2 : record.selling_price) !== null && _ref !== void 0 ? _ref : 0);
 }
 function getBundleSurchargeUnitAmount(bundle) {
-  var _ref4, _ref5, _bundle$bundle_sellin;
-  return toDecimal((_ref4 = (_ref5 = (_bundle$bundle_sellin = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _ref5 !== void 0 ? _ref5 : bundle === null || bundle === void 0 ? void 0 : bundle.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
+  var _ref3, _ref4, _bundle$bundle_sellin;
+  return toDecimal((_ref3 = (_ref4 = (_bundle$bundle_sellin = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _ref4 !== void 0 ? _ref4 : bundle === null || bundle === void 0 ? void 0 : bundle.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
 }
 function getBundleProductId(bundle) {
-  var _ref6, _bundle$bundle_produc;
-  var id = (_ref6 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref6 !== void 0 ? _ref6 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id;
+  var _ref5, _bundle$bundle_produc;
+  var id = (_ref5 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref5 !== void 0 ? _ref5 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id;
   if (id === undefined || id === null || id === '') return null;
   var parsed = Number(id);
   if (!Number.isFinite(parsed)) return null;
   return parsed;
 }
 function getPersistedMainSurchargeFee(product) {
-  var _ref7, _product$surcharge_fe, _product$metadata7;
+  var _ref6, _product$surcharge_fe, _product$metadata7;
   if ((product === null || product === void 0 ? void 0 : product.order_detail_id) === undefined || (product === null || product === void 0 ? void 0 : product.order_detail_id) === null) return null;
-  var value = (_ref7 = (_product$surcharge_fe = product === null || product === void 0 ? void 0 : product.surcharge_fee) !== null && _product$surcharge_fe !== void 0 ? _product$surcharge_fe : product === null || product === void 0 ? void 0 : product.main_product_attached_bundle_surcharge_fee) !== null && _ref7 !== void 0 ? _ref7 : product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_attached_bundle_surcharge_fee;
+  var value = (_ref6 = (_product$surcharge_fe = product === null || product === void 0 ? void 0 : product.surcharge_fee) !== null && _product$surcharge_fe !== void 0 ? _product$surcharge_fe : product === null || product === void 0 ? void 0 : product.main_product_attached_bundle_surcharge_fee) !== null && _ref6 !== void 0 ? _ref6 : product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_attached_bundle_surcharge_fee;
   if (value === undefined || value === null || value === '') return null;
   return toDecimal(value);
 }
@@ -181,8 +183,8 @@ function getPersistedSourceSurchargeFee(sourceItem) {
   return toDecimal(value);
 }
 function getPersistedSurchargeRemainder(item, sourceItem) {
-  var _ref8, _sourceItem$metadata$, _sourceItem$metadata2, _item$metadata2;
-  var value = (_ref8 = (_sourceItem$metadata$ = sourceItem === null || sourceItem === void 0 || (_sourceItem$metadata2 = sourceItem.metadata) === null || _sourceItem$metadata2 === void 0 ? void 0 : _sourceItem$metadata2.surcharge_rounding_remainder) !== null && _sourceItem$metadata$ !== void 0 ? _sourceItem$metadata$ : item === null || item === void 0 ? void 0 : item.surcharge_rounding_remainder) !== null && _ref8 !== void 0 ? _ref8 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.surcharge_rounding_remainder;
+  var _ref7, _sourceItem$metadata$, _sourceItem$metadata2, _item$metadata2;
+  var value = (_ref7 = (_sourceItem$metadata$ = sourceItem === null || sourceItem === void 0 || (_sourceItem$metadata2 = sourceItem.metadata) === null || _sourceItem$metadata2 === void 0 ? void 0 : _sourceItem$metadata2.surcharge_rounding_remainder) !== null && _sourceItem$metadata$ !== void 0 ? _sourceItem$metadata$ : item === null || item === void 0 ? void 0 : item.surcharge_rounding_remainder) !== null && _ref7 !== void 0 ? _ref7 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.surcharge_rounding_remainder;
   if (value === undefined || value === null || value === '') return null;
   return toDecimal(value);
 }
@@ -683,16 +685,15 @@ function calculateSingleItemTax(params) {
 }
 
 /**
- * 获取主商品折扣后总价（含 option、含主商品折扣、含加价/减价 bundle）。
+ * 主商品 + 非原价(加价/减价)子商品的"折扣后"售价合计（含 option、含主商品折扣，未减整单折扣）。
  *
- * 新语义 v2 下：
- * - `metadata.main_product_selling_price` 已是"含 option、含折扣"的主价，直接读即可；
- * - 无需再 `minus(mainDiscountAmount)` 或 `plus(getOptionUnitPrice)`；
- * - 仅需叠加 `markup` / `markdown` 类 bundle（原价 bundle 已由 `calculateProductsTax` 独立处理）。
+ * 对齐后端 metadata.main_product_attached_bundle_selling_price：
+ * - `metadata.main_product_selling_price` 已是"含 option、含折扣"的主价；
+ * - 叠加 `markup` / `markdown` 类 bundle（原价 bundle 由 `calculateProductsTax` 独立处理）。
  */
-function getMainProductPaymentTotal(product) {
-  var _ref9, _product$metadata$mai, _product$metadata8, _product$metadata9;
-  var mainSelling = (_ref9 = (_product$metadata$mai = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.main_product_original_price) !== null && _ref9 !== void 0 ? _ref9 : 0;
+function getMainAttachedBundleSellingTotal(product) {
+  var _ref8, _product$metadata$mai, _product$metadata8, _product$metadata9;
+  var mainSelling = (_ref8 = (_product$metadata$mai = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.main_product_original_price) !== null && _ref8 !== void 0 ? _ref8 : 0;
   var total = toDecimal(mainSelling);
   var bundleItems = product.product_bundle || [];
   var _iterator15 = _createForOfIteratorHelper(bundleItems),
@@ -701,8 +702,9 @@ function getMainProductPaymentTotal(product) {
     for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
       var bundleItem = _step15.value;
       if (isBundleMarkupOrDiscount(bundleItem)) {
-        var _ref10, _bundleItem$bundle_se, _bundleItem$num;
-        var unit = toDecimal((_ref10 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+        var _bundleItem$num;
+        // markdown（减价）按带符号净额取减；markup 维持相加。
+        var unit = getBundleSignedUnit(bundleItem);
         var qty = getSafeNum((_bundleItem$num = bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem.quantity);
         total = total.plus(unit.times(qty));
       }
@@ -714,6 +716,22 @@ function getMainProductPaymentTotal(product) {
   }
   return Decimal.max(total, 0);
 }
+
+/**
+ * 获取主商品税费基数（含 option、含主商品折扣、含加价/减价 bundle、已减整单折扣均摊）。
+ *
+ * 对齐后端 handleMainProductTaxFee：税基使用 main_product_attached_bundle_payment_price。
+ * - 优先读取均摊层写入的 payment 价；
+ * - 兜底退化为 selling 合计（无整单折扣时两者相等）。
+ */
+function getMainProductPaymentTotal(product) {
+  var _product$metadata10;
+  var attachedPayment = (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.main_product_attached_bundle_payment_price;
+  if (attachedPayment !== undefined && attachedPayment !== null && attachedPayment !== '') {
+    return Decimal.max(toDecimal(attachedPayment), 0);
+  }
+  return getMainAttachedBundleSellingTotal(product);
+}
 function getExplicitTaxRemainder(item) {
   var _item$tax_fee_roundin, _item$metadata3;
   var value = (_item$tax_fee_roundin = item === null || item === void 0 ? void 0 : item.tax_fee_rounding_remainder) !== null && _item$tax_fee_roundin !== void 0 ? _item$tax_fee_roundin : item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.tax_fee_rounding_remainder;
@@ -726,9 +744,9 @@ function getPersistedTaxRemainder(item, parentProduct) {
   return getExplicitTaxRemainder(item);
 }
 function getPersistedMainTaxFee(product) {
-  var _ref11, _product$metadata$mai2, _product$metadata10;
+  var _ref9, _product$metadata$mai2, _product$metadata11;
   if ((product === null || product === void 0 ? void 0 : product.order_detail_id) === undefined || (product === null || product === void 0 ? void 0 : product.order_detail_id) === null) return null;
-  var value = (_ref11 = (_product$metadata$mai2 = product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.main_product_attached_bundle_tax_fee) !== null && _product$metadata$mai2 !== void 0 ? _product$metadata$mai2 : product === null || product === void 0 ? void 0 : product.main_product_attached_bundle_tax_fee) !== null && _ref11 !== void 0 ? _ref11 : product === null || product === void 0 ? void 0 : product.tax_fee;
+  var value = (_ref9 = (_product$metadata$mai2 = product === null || product === void 0 || (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.main_product_attached_bundle_tax_fee) !== null && _product$metadata$mai2 !== void 0 ? _product$metadata$mai2 : product === null || product === void 0 ? void 0 : product.main_product_attached_bundle_tax_fee) !== null && _ref9 !== void 0 ? _ref9 : product === null || product === void 0 ? void 0 : product.tax_fee;
   if (value === undefined || value === null || value === '') return null;
   return toDecimal(value);
 }
@@ -772,9 +790,9 @@ function resetTaxRemainderFields(products) {
   }
 }
 function getBundlePaymentPrice(bundle, product) {
-  var _ref12, _ref13, _bundle$bundle_sellin2, _metadata$average_dis, _metadata;
+  var _ref10, _ref11, _bundle$bundle_sellin2, _metadata$average_dis, _metadata;
   if ((bundle === null || bundle === void 0 ? void 0 : bundle.bundle_payment_price) !== undefined) return toDecimal(bundle.bundle_payment_price);
-  var basePrice = toDecimal((_ref12 = (_ref13 = (_bundle$bundle_sellin2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) !== null && _bundle$bundle_sellin2 !== void 0 ? _bundle$bundle_sellin2 : bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _ref13 !== void 0 ? _ref13 : bundle === null || bundle === void 0 ? void 0 : bundle.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
+  var basePrice = toDecimal((_ref10 = (_ref11 = (_bundle$bundle_sellin2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) !== null && _bundle$bundle_sellin2 !== void 0 ? _bundle$bundle_sellin2 : bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _ref11 !== void 0 ? _ref11 : bundle === null || bundle === void 0 ? void 0 : bundle.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
   if (!isBundleOriginalPrice(bundle)) return basePrice;
   var averageDiscountRate = toDecimal((_metadata$average_dis = (_metadata = product.metadata) === null || _metadata === void 0 ? void 0 : _metadata.average_discount_amount_rate) !== null && _metadata$average_dis !== void 0 ? _metadata$average_dis : 1);
   return toAmountFormat(bcMul(basePrice, averageDiscountRate, 6));
@@ -820,19 +838,19 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         _step18;
       try {
         for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var _bundleItem$num2, _ref14, _ref15, _bundleItem$original_, _ref16, _bundleItem$is_charge, _ref17, _bundleItem$is_charge2;
+          var _bundleItem$num2, _ref12, _ref13, _bundleItem$original_, _ref14, _bundleItem$is_charge, _ref15, _bundleItem$is_charge2;
           var bundleItem = _step18.value;
           if (!isBundleOriginalPrice(bundleItem)) continue;
           var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num2 = bundleItem.num) !== null && _bundleItem$num2 !== void 0 ? _bundleItem$num2 : bundleItem.quantity));
           var totalBundleQuantity = bundleQuantity.times(quantity);
           var bundlePrice = getBundlePaymentPrice(bundleItem, product);
-          var bundleOriginalPrice = toDecimal((_ref14 = (_ref15 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.price) !== null && _ref14 !== void 0 ? _ref14 : 0);
+          var bundleOriginalPrice = toDecimal((_ref12 = (_ref13 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref13 !== void 0 ? _ref13 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
           var bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
           var bundleTaxPrecise = calculateSingleItemTax({
             price: bundlePrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref16 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref16 !== void 0 ? _ref16 : 0
+            isChargeTax: (_ref14 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref14 !== void 0 ? _ref14 : 0
           });
           var bundleTaxRounded = toBackendTaxFee(bundleTaxPrecise);
           bundleItem.tax_fee = bundleTaxRounded.toNumber();
@@ -849,7 +867,7 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
             price: bundleOriginalPrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref17 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref17 !== void 0 ? _ref17 : 0
+            isChargeTax: (_ref15 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref15 !== void 0 ? _ref15 : 0
           });
           var bundleOrigTaxRounded = toAmountFormat(bundleOrigTaxPrecise);
           bundleItem.original_tax_fee = bundleOrigTaxRounded.toNumber();
@@ -920,46 +938,58 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
     originTax: totalOriginTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
   };
 }
-function applyShopDiscountToSurchargeBase(products, productAmount, shopDiscountAmount) {
-  if (productAmount.lte(0) || shopDiscountAmount.lte(0)) return function () {};
-  var effectiveDiscount = Decimal.min(productAmount, shopDiscountAmount);
-  if (effectiveDiscount.lte(0)) return function () {};
-  var snapshots = products.map(function (product) {
-    var _product$metadata11;
-    return {
-      product: product,
-      metadata: product.metadata,
-      attachedBundleSellingPrice: (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.main_product_attached_bundle_selling_price
-    };
-  });
+
+/**
+ * 整单折扣（shop_discount）按各行 selling 合计占比均摊到 payment 维度。
+ *
+ * 文档口径：
+ * - payment_price = selling_price − 整单折扣均摊；rate = payment/selling（全行同一 rate）；
+ * - 附加费不受整单折扣影响（基数仍用 selling，本函数写 main_product_attached_bundle_selling_price）；
+ * - 税费受整单折扣影响（基数用 payment，本函数写 main_product_attached_bundle_payment_price 与
+ *   原价子商品 bundle_payment_price）。
+ *
+ * 与后端一致：bundle_payment_price = bundle_selling_price × rate，
+ * main_product_attached_bundle_payment_price = main_product_attached_bundle_selling_price × rate。
+ */
+function allocateShopDiscountToPayment(products, productAmount, shopDiscountAmount) {
+  var effectiveDiscount = productAmount.lte(0) ? new Decimal(0) : Decimal.max(Decimal.min(productAmount, shopDiscountAmount), 0);
   var allocatedDiscount = new Decimal(0);
   products.forEach(function (product, index) {
     var quantity = new Decimal(getSafeNum(product.num));
-    var lineAmount = getUnitPaymentTotal(product).times(quantity);
-    var lineDiscount = index === products.length - 1 ? effectiveDiscount.minus(allocatedDiscount) : toAmountFormat(lineAmount.div(productAmount).times(effectiveDiscount));
+    var sellingUnit = getUnitPaymentTotal(product);
+    var lineSellingTotal = sellingUnit.times(quantity);
+    var lineDiscount = effectiveDiscount.lte(0) ? new Decimal(0) : index === products.length - 1 ? Decimal.max(effectiveDiscount.minus(allocatedDiscount), 0) : toAmountFormat(lineSellingTotal.div(productAmount).times(effectiveDiscount));
     allocatedDiscount = allocatedDiscount.plus(lineDiscount);
     var unitDiscount = quantity.lte(0) ? new Decimal(0) : lineDiscount.div(quantity);
-    var currentBase = getMainSurchargeUnitAmount(product);
-    var adjustedBase = Decimal.max(currentBase.minus(unitDiscount), 0);
+    var paymentUnit = Decimal.max(sellingUnit.minus(unitDiscount), 0);
+    var rate = sellingUnit.lte(0) ? new Decimal(1) : toBcScale(paymentUnit.div(sellingUnit), 6);
+    var mainSellingTotal = getMainAttachedBundleSellingTotal(product);
+    var mainPaymentTotal = toAmountFormat(bcMul(mainSellingTotal, rate, 6));
     product.metadata = _objectSpread(_objectSpread({}, product.metadata || {}), {}, {
-      main_product_attached_bundle_selling_price: adjustedBase.toFixed(2)
+      average_discount_amount_rate: rate.toString(),
+      main_product_attached_bundle_selling_price: mainSellingTotal.toFixed(2),
+      main_product_attached_bundle_payment_price: mainPaymentTotal.toFixed(2)
     });
-  });
-  return function () {
-    var _iterator19 = _createForOfIteratorHelper(snapshots),
+    var _iterator19 = _createForOfIteratorHelper(product.product_bundle || []),
       _step19;
     try {
       for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-        var snapshot = _step19.value;
-        if (!snapshot.metadata) {
-          delete snapshot.product.metadata;
+        var bundle = _step19.value;
+        // 原价子商品：bundle_payment_price = bundle_selling_price × rate
+        // markdown 子商品：以净额幅度 × rate（与后端一致，存正净额）
+        if (isBundleOriginalPrice(bundle)) {
+          var _ref16, _ref17, _bundle$bundle_sellin3;
+          var bundleSelling = toDecimal((_ref16 = (_ref17 = (_bundle$bundle_sellin3 = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin3 !== void 0 ? _bundle$bundle_sellin3 : bundle.bundle_sum_price) !== null && _ref17 !== void 0 ? _ref17 : bundle.price) !== null && _ref16 !== void 0 ? _ref16 : 0);
+          bundle.bundle_payment_price = toAmountFormat(bcMul(bundleSelling, rate, 6)).toFixed(2);
           continue;
         }
-        snapshot.product.metadata = _objectSpread(_objectSpread({}, snapshot.product.metadata), {}, {
-          main_product_attached_bundle_selling_price: snapshot.attachedBundleSellingPrice
-        });
-        if (snapshot.attachedBundleSellingPrice === undefined) {
-          delete snapshot.product.metadata.main_product_attached_bundle_selling_price;
+        if (isMarkdownBundle(bundle)) {
+          var _bundle$custom_price;
+          var magnitude = getBundleSellingMagnitude(bundle);
+          bundle.custom_price = (_bundle$custom_price = bundle.custom_price) !== null && _bundle$custom_price !== void 0 ? _bundle$custom_price : bundle.price;
+          bundle.price = magnitude.toFixed(2);
+          bundle.bundle_selling_price = magnitude.toFixed(2);
+          bundle.bundle_payment_price = toAmountFormat(bcMul(magnitude, rate, 6)).toFixed(2);
         }
       }
     } catch (err) {
@@ -967,7 +997,8 @@ function applyShopDiscountToSurchargeBase(products, productAmount, shopDiscountA
     } finally {
       _iterator19.f();
     }
-  };
+    product.payment_price = paymentUnit.toFixed(2);
+  });
 }
 export function createEmptySalesSummary() {
   return {
@@ -1021,7 +1052,11 @@ export function calculateSalesSummary(params) {
     var _getPersistedMainSurc;
     return (_getPersistedMainSurc = getPersistedMainSurchargeFee(product)) === null || _getPersistedMainSurc === void 0 ? void 0 : _getPersistedMainSurc.gt(0);
   });
-  var restoreSurchargeBase = hasPersistedSurchargeSnapshot ? function () {} : applyShopDiscountToSurchargeBase(summaryProducts, productAmount, shopDiscountAmount);
+  // 整单折扣均摊：附加费基数用 selling（不受折扣），税费基数用 payment（受折扣）。
+  // persisted 快照（已下单编辑）优先采信后端回传值，不重算均摊。
+  if (!hasPersistedSurchargeSnapshot) {
+    allocateShopDiscountToPayment(summaryProducts, productAmount, shopDiscountAmount);
+  }
   var surchargeServiceItems = buildSurchargeServiceItems(summaryProducts);
   getSurcharge({
     service: surchargeServiceItems,
@@ -1039,7 +1074,6 @@ export function calculateSalesSummary(params) {
     sourceItems: surchargeServiceItems,
     surchargeList: surchargeList
   });
-  restoreSurchargeBase();
   var surchargeAmount = new Decimal(getSurchargeAmount({
     bookingDetail: null,
     bookingId: undefined