@pisell/pisellos 2.2.198 → 2.2.200

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -61,10 +61,14 @@ function mapOrderBundleToOtherBundle(bundle) {
     var selling = (_ref3 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref3 !== void 0 ? _ref3 : catalogOriginal;
     var _omitBundleSelling = item.bundle_selling_price,
       rest = _objectWithoutProperties(item, _excluded);
-    return _objectSpread(_objectSpread({}, rest), {}, {
+    var isMarkupOrMarkdown = (item.price_type === 'markdown' || item.price_type === 'markup') && (item.price_type_ext === '' || item.price_type_ext === undefined || item.price_type_ext === null);
+    if (isMarkupOrMarkdown) delete rest.original_total;
+    return _objectSpread(_objectSpread(_objectSpread({}, rest), {}, {
       price: selling,
-      original_price: catalogOriginal,
-      original_total: (_item$original_total = item.original_total) !== null && _item$original_total !== void 0 ? _item$original_total : catalogOriginal,
+      original_price: catalogOriginal
+    }, isMarkupOrMarkdown ? {} : {
+      original_total: (_item$original_total = item.original_total) !== null && _item$original_total !== void 0 ? _item$original_total : catalogOriginal
+    }), {}, {
       num: (_ref4 = (_item$num = item.num) !== null && _item$num !== void 0 ? _item$num : item.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1,
       quantity: (_ref5 = (_item$quantity = item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : item.num) !== null && _ref5 !== void 0 ? _ref5 : 1
     });

package/dist/modules/Cart/utils/cartProduct.js

@@ -14,6 +14,7 @@ import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 import { calcDiscountListDifference } from "../../Summary/utils";
+import { getBundleSellingMagnitude } from "../../Order/utils";
 
 /** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
 var toDiscountPayload = function toDiscountPayload(discountItem) {
@@ -374,6 +375,7 @@ export var formatBundle = function formatBundle(bundle) {
 export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
   if (!(bundle !== null && bundle !== void 0 && bundle.length)) return [];
   return bundle.map(function (d) {
+    var _d$price, _d$price_type, _d$price_type_ext;
     var getBundleValueByKey = function getBundleValueByKey(key) {
       var _d$originBundleItem;
       return (d === null || d === void 0 ? void 0 : d[key]) || (d === null || d === void 0 || (_d$originBundleItem = d.originBundleItem) === null || _d$originBundleItem === void 0 ? void 0 : _d$originBundleItem[key]);
@@ -382,6 +384,14 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       var _cur$metadata2;
       return pre + ((cur === null || cur === void 0 || (_cur$metadata2 = cur.metadata) === null || _cur$metadata2 === void 0 ? void 0 : _cur$metadata2.product_discount_difference) || 0);
     }, 0);
+    var normalizedBundle = _objectSpread(_objectSpread({}, d), {}, {
+      // 计算 markdown 净额时只传真实毛价；若仅有 bundle_selling_price，则由 helper 当历史净额兜底。
+      price: (_d$price = d === null || d === void 0 ? void 0 : d.price) !== null && _d$price !== void 0 ? _d$price : d === null || d === void 0 ? void 0 : d.custom_price,
+      bundle_selling_price: d === null || d === void 0 ? void 0 : d.bundle_selling_price,
+      price_type: (_d$price_type = d === null || d === void 0 ? void 0 : d.price_type) !== null && _d$price_type !== void 0 ? _d$price_type : d === null || d === void 0 ? void 0 : d.custom_price_type,
+      price_type_ext: (_d$price_type_ext = d === null || d === void 0 ? void 0 : d.price_type_ext) !== null && _d$price_type_ext !== void 0 ? _d$price_type_ext : d === null || d === void 0 ? void 0 : d.custom_price_type_ext,
+      option: getBundleValueByKey('option')
+    });
     return {
       bundle_group_id: getBundleValueByKey('group_id'),
       bundle_id: d.id,
@@ -392,7 +402,7 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       extension_type: getBundleValueByKey('extension_type'),
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
-      "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
+      "bundle_selling_price": getBundleSellingMagnitude(normalizedBundle).toFixed(2),
       "custom_price": d === null || d === void 0 ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,

package/dist/modules/Cart/utils/changePrice.js

@@ -10,7 +10,7 @@ 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; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import Decimal from "decimal.js";
+import { getBundleSellingMagnitude } from "../../Order/utils";
 export function updateAllCartItemPrice(_x, _x2, _x3, _x4, _x5) {
   return _updateAllCartItemPrice.apply(this, arguments);
 }
@@ -54,18 +54,18 @@ function _updateAllCartItemPrice() {
                       var targetBundleItem = targetBundle.bundle_item.find(function (m) {
                         return m.id === n.id;
                       });
-                      if (targetBundleItem.price_type === 'markdown') {
-                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
-                      }
-                      // 如果有选择 option，还需要加上 option 的价格
-                      if (n.option) {
-                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).add(n.option.reduce(function (pre, cur) {
-                          return pre + new Decimal(cur.price || 0).mul(cur.num || 1).toNumber();
-                        }, 0)).toNumber();
-                      }
                       if (targetBundleItem) {
-                        return _objectSpread(_objectSpread({}, n), {}, {
+                        var normalizedBundle = _objectSpread(_objectSpread({}, n), {}, {
                           price: targetBundleItem.price,
+                          custom_price: targetBundleItem.price,
+                          price_type: targetBundleItem.price_type,
+                          price_type_ext: targetBundleItem.price_type_ext
+                        });
+                        var bundleSellingPrice = getBundleSellingMagnitude(normalizedBundle).toFixed(2);
+                        return _objectSpread(_objectSpread({}, n), {}, {
+                          custom_price: targetBundleItem.price,
+                          price: targetBundleItem.price_type === 'markdown' ? bundleSellingPrice : targetBundleItem.price,
+                          bundle_selling_price: bundleSellingPrice,
                           base_price: targetBundleItem.base_price
                         });
                       }

package/dist/modules/Order/index.js

@@ -1291,6 +1291,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncSummaryProductMetadata",
     value: function syncSummaryProductMetadata(products) {
       var moneyKeys = ['main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder'];
+      // 整单折扣均摊层产出的 payment 维度字段，直接由计算层写入 metadata，
+      // 这里需把它们一并回写到商品 metadata 以便持久化/出站。
+      var metadataMoneyKeys = ['main_product_attached_bundle_selling_price', 'main_product_attached_bundle_payment_price'];
       var _iterator8 = _createForOfIteratorHelper(products || []),
         _step8;
       try {
@@ -1314,17 +1317,39 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           } finally {
             _iterator9.f();
           }
+          var _iterator10 = _createForOfIteratorHelper(metadataMoneyKeys),
+            _step10;
+          try {
+            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+              var _key = _step10.value;
+              var _value = this.formatSummaryMetadataMoney(metadata[_key]);
+              if (_value === undefined) continue;
+              metadata[_key] = _value;
+              hasMetadataPatch = true;
+            }
+          } catch (err) {
+            _iterator10.e(err);
+          } finally {
+            _iterator10.f();
+          }
+          if (metadata.average_discount_amount_rate !== undefined) {
+            hasMetadataPatch = true;
+          }
           if (Array.isArray(productRecord.relation_surcharge_ids)) {
             metadata.relation_surcharge_ids = productRecord.relation_surcharge_ids;
             hasMetadataPatch = true;
           }
+          var productPaymentPrice = this.formatSummaryMetadataMoney(productRecord.payment_price);
+          if (productPaymentPrice !== undefined) {
+            productRecord.payment_price = productPaymentPrice;
+          }
           if (hasMetadataPatch) productRecord.metadata = metadata;
           if (!Array.isArray(productRecord.product_bundle)) continue;
-          var _iterator10 = _createForOfIteratorHelper(productRecord.product_bundle),
-            _step10;
+          var _iterator11 = _createForOfIteratorHelper(productRecord.product_bundle),
+            _step11;
           try {
-            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-              var bundle = _step10.value;
+            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+              var bundle = _step11.value;
               var bundleRecord = bundle;
               var bundleMetadata = bundleRecord.metadata && _typeof(bundleRecord.metadata) === 'object' ? _objectSpread({}, bundleRecord.metadata) : {};
               var hasBundleMetadataPatch = false;
@@ -1333,6 +1358,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bundleMetadata.surcharge_fee = bundleSurchargeFee;
                 hasBundleMetadataPatch = true;
               }
+              var bundlePaymentPrice = this.formatSummaryMetadataMoney(bundleRecord.bundle_payment_price);
+              if (bundlePaymentPrice !== undefined) {
+                bundleRecord.bundle_payment_price = bundlePaymentPrice;
+              }
               if (Array.isArray(bundleRecord.relation_surcharge_ids)) {
                 bundleMetadata.relation_surcharge_ids = bundleRecord.relation_surcharge_ids;
                 hasBundleMetadataPatch = true;
@@ -1340,9 +1369,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (hasBundleMetadataPatch) bundleRecord.metadata = bundleMetadata;
             }
           } catch (err) {
-            _iterator10.e(err);
+            _iterator11.e(err);
           } finally {
-            _iterator10.f();
+            _iterator11.f();
           }
         }
       } catch (err) {
@@ -1615,82 +1644,82 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function clearPersistedAmountFieldsForFullRecalc(products) {
       var moneyKeys = ['surcharge_fee', 'main_product_attached_bundle_surcharge_fee', 'surcharge_rounding_remainder', 'main_product_attached_bundle_tax_fee', 'tax_fee', 'original_tax_fee', 'tax_fee_rounding_remainder', 'original_tax_fee_rounding_remainder'];
       var metadataMoneyKeys = ['main_product_attached_bundle_surcharge_fee', 'surcharge_rounding_remainder', 'main_product_attached_bundle_tax_fee', 'tax_fee_rounding_remainder'];
-      var _iterator11 = _createForOfIteratorHelper(products || []),
-        _step11;
+      var _iterator12 = _createForOfIteratorHelper(products || []),
+        _step12;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var product = _step11.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var product = _step12.value;
           var record = product;
-          var _iterator12 = _createForOfIteratorHelper(moneyKeys),
-            _step12;
+          var _iterator13 = _createForOfIteratorHelper(moneyKeys),
+            _step13;
           try {
-            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-              var _key = _step12.value;
-              delete record[_key];
+            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+              var _key2 = _step13.value;
+              delete record[_key2];
             }
           } catch (err) {
-            _iterator12.e(err);
+            _iterator13.e(err);
           } finally {
-            _iterator12.f();
+            _iterator13.f();
           }
           if (record.metadata && _typeof(record.metadata) === 'object') {
             record.metadata = _objectSpread({}, record.metadata);
-            var _iterator13 = _createForOfIteratorHelper(metadataMoneyKeys),
-              _step13;
+            var _iterator14 = _createForOfIteratorHelper(metadataMoneyKeys),
+              _step14;
             try {
-              for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                var key = _step13.value;
+              for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+                var key = _step14.value;
                 delete record.metadata[key];
               }
             } catch (err) {
-              _iterator13.e(err);
+              _iterator14.e(err);
             } finally {
-              _iterator13.f();
+              _iterator14.f();
             }
           }
-          var _iterator14 = _createForOfIteratorHelper(record.product_bundle || []),
-            _step14;
+          var _iterator15 = _createForOfIteratorHelper(record.product_bundle || []),
+            _step15;
           try {
-            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-              var bundle = _step14.value;
-              var _iterator15 = _createForOfIteratorHelper(moneyKeys),
-                _step15;
+            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+              var bundle = _step15.value;
+              var _iterator16 = _createForOfIteratorHelper(moneyKeys),
+                _step16;
               try {
-                for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-                  var _key3 = _step15.value;
-                  delete bundle[_key3];
+                for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+                  var _key4 = _step16.value;
+                  delete bundle[_key4];
                 }
               } catch (err) {
-                _iterator15.e(err);
+                _iterator16.e(err);
               } finally {
-                _iterator15.f();
+                _iterator16.f();
               }
               if (bundle.metadata && _typeof(bundle.metadata) === 'object') {
                 bundle.metadata = _objectSpread({}, bundle.metadata);
-                var _iterator16 = _createForOfIteratorHelper(metadataMoneyKeys),
-                  _step16;
+                var _iterator17 = _createForOfIteratorHelper(metadataMoneyKeys),
+                  _step17;
                 try {
-                  for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-                    var _key2 = _step16.value;
-                    delete bundle.metadata[_key2];
+                  for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+                    var _key3 = _step17.value;
+                    delete bundle.metadata[_key3];
                   }
                 } catch (err) {
-                  _iterator16.e(err);
+                  _iterator17.e(err);
                 } finally {
-                  _iterator16.f();
+                  _iterator17.f();
                 }
               }
             }
           } catch (err) {
-            _iterator14.e(err);
+            _iterator15.e(err);
           } finally {
-            _iterator14.f();
+            _iterator15.f();
           }
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator11.f();
+        _iterator12.f();
       }
     }
   }, {
@@ -2562,21 +2591,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateVoucherOrderPayments(payments) {
       var _this15 = this;
       var tempOrder = this.ensureTempOrder();
+      var isVoucherPayment = function isVoucherPayment(payment) {
+        return payment.voucher_id !== undefined && Number(payment.voucher_id) !== 0;
+      };
+      var hasSyncedOrderPayment = function hasSyncedOrderPayment(payment) {
+        return payment.order_payment_id !== undefined && payment.order_payment_id !== null;
+      };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
         return _this15.normalizePaymentSource(payment, {
           defaultPaid: true
         });
       })).filter(function (payment) {
-        return payment.voucher_id !== undefined && Number(payment.voucher_id) !== 0;
+        return isVoucherPayment(payment);
       });
       var nonVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
-        return payment.voucher_id === undefined || Number(payment.voucher_id) === 0;
+        return !isVoucherPayment(payment);
+      });
+      var syncedVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
+        return isVoucherPayment(payment) && hasSyncedOrderPayment(payment);
+      });
+      var syncedVoucherPaymentIds = new Set(syncedVoucherPayments.map(function (payment) {
+        return String(payment.order_payment_id);
+      }));
+      var replaceableVouchers = mappedVouchers.filter(function (payment) {
+        if (!hasSyncedOrderPayment(payment)) return true;
+        return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
       });
       var cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
-        vouchers: mappedVouchers,
-        nonVoucherPayments: nonVoucherPayments
+        vouchers: replaceableVouchers,
+        nonVoucherPayments: [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments))
       });
-      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(cappedVouchers));
+      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments), _toConsumableArray(cappedVouchers));
       this.updateTempOrderPaymentStatus(tempOrder);
       this.persistTempOrder();
       void this.recalculateSummary({
@@ -3857,14 +3902,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(record, options) {
         var _this$store$discount13, _this$store$discount14;
-        var raw, nextTempOrder, hydratedEditDiscounts;
+        var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts;
         return _regeneratorRuntime().wrap(function _callee29$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
               nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+              rawSummary = raw.summary && _typeof(raw.summary) === 'object' ? raw.summary : {};
+              summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
+                return _objectSpread({}, s || {});
+              }) : cloneDeep(nextTempOrder.surcharges || []);
               this.store.tempOrder = nextTempOrder;
-              this.store.summary = raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread(_objectSpread({}, createEmptySummary()), raw.summary) : createEmptySummary();
+              this.store.summary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), rawSummary), {}, {
+                surcharges: summarySurcharges
+              });
               nextTempOrder._extend = _objectSpread(_objectSpread({}, nextTempOrder._extend || {}), {}, {
                 originalSalesSnapshot: {
                   summary: cloneDeep(this.store.summary),
@@ -3876,24 +3927,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-              _context31.next = 9;
-              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setOriginalDiscountList(hydratedEditDiscounts);
-            case 9:
               _context31.next = 11;
-              return (_this$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.setDiscountList(hydratedEditDiscounts);
+              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setOriginalDiscountList(hydratedEditDiscounts);
             case 11:
+              _context31.next = 13;
+              return (_this$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.setDiscountList(hydratedEditDiscounts);
+            case 13:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context31.next = 14;
+                _context31.next = 16;
                 break;
               }
-              _context31.next = 14;
+              _context31.next = 16;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 14:
+            case 16:
               this.persistTempOrder();
               return _context31.abrupt("return", nextTempOrder);
-            case 16:
+            case 18:
             case "end":
               return _context31.stop();
           }
@@ -3954,14 +4005,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       };
       var tempOrderExtend = nextTempOrder._extend;
       var productsByUid = tempOrderExtend.productsByUid || {};
-      var _iterator17 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
-        _step17;
+      var _iterator18 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
+        _step18;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
           var _product$metadata7, _ref64, _ref65, _existed$origin, _rawProduct$metadata;
-          var _step17$value = _slicedToArray(_step17.value, 2),
-            index = _step17$value[0],
-            product = _step17$value[1];
+          var _step18$value = _slicedToArray(_step18.value, 2),
+            index = _step18$value[0],
+            product = _step18$value[1];
           var uid = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
@@ -3982,9 +4033,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator17.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator17.f();
+        _iterator18.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
@@ -4015,18 +4066,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var segments = [];
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       if (Array.isArray(sku.variant)) {
-        var _iterator18 = _createForOfIteratorHelper(sku.variant),
-          _step18;
+        var _iterator19 = _createForOfIteratorHelper(sku.variant),
+          _step19;
         try {
-          for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-            var variant = _step18.value;
+          for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+            var variant = _step19.value;
             var segment = this.formatHydratedNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
             if (segment) segments.push(segment);
           }
         } catch (err) {
-          _iterator18.e(err);
+          _iterator19.e(err);
         } finally {
-          _iterator18.f();
+          _iterator19.f();
         }
       }
       return segments.join(', ');
@@ -4128,67 +4179,67 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
         savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
       };
-      var _iterator19 = _createForOfIteratorHelper(productList),
-        _step19;
+      var _iterator20 = _createForOfIteratorHelper(productList),
+        _step20;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var product = _step19.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var product = _step20.value;
           var qty = product.num || 1;
-          var _iterator21 = _createForOfIteratorHelper(product.discount_list || []),
-            _step21;
+          var _iterator22 = _createForOfIteratorHelper(product.discount_list || []),
+            _step22;
           try {
-            for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-              var pd = _step21.value;
+            for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+              var pd = _step22.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator21.e(err);
+            _iterator22.e(err);
           } finally {
-            _iterator21.f();
+            _iterator22.f();
           }
-          var _iterator22 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step22;
+          var _iterator23 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step23;
           try {
-            for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+            for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
               var _ref68, _bundle$num3;
-              var bundle = _step22.value;
+              var bundle = _step23.value;
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref68 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref68 !== void 0 ? _ref68 : 1) || 1).toNumber();
-              var _iterator23 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step23;
+              var _iterator24 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step24;
               try {
-                for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-                  var _pd = _step23.value;
+                for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+                  var _pd = _step24.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator23.e(err);
+                _iterator24.e(err);
               } finally {
-                _iterator23.f();
+                _iterator24.f();
               }
             }
           } catch (err) {
-            _iterator22.e(err);
+            _iterator23.e(err);
           } finally {
-            _iterator22.f();
+            _iterator23.f();
           }
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator19.f();
+        _iterator20.f();
       }
-      var _iterator20 = _createForOfIteratorHelper(discountList),
-        _step20;
+      var _iterator21 = _createForOfIteratorHelper(discountList),
+        _step21;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var d = _step20.value;
+        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+          var d = _step21.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator21.e(err);
       } finally {
-        _iterator20.f();
+        _iterator21.f();
       }
     }
   }]);

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

@@ -194,6 +194,7 @@ export interface OrderSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

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

@@ -1,5 +1,5 @@
 import Decimal from 'decimal.js';
-import { CartItem } from "../Cart";
+import type { CartItem } from "../Cart";
 import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
@@ -21,10 +21,20 @@ export declare function composeLinePrice(params: {
     bundle?: Array<{
         bundle_selling_price?: any;
         price?: any;
+        custom_price?: any;
         num?: any;
         quantity?: any;
         original_price?: any;
         product_price?: any;
+        price_type?: any;
+        price_type_ext?: any;
+        custom_price_type?: any;
+        custom_price_type_ext?: any;
+        option?: Array<{
+            add_price?: any;
+            price?: any;
+            num?: any;
+        }>;
     }> | null;
     useOriginalBundle?: boolean;
 }): string;
@@ -43,6 +53,27 @@ export declare function sumOptionUnitPrice(options?: Array<{
     price?: any;
     num?: any;
 }> | null): Decimal;
+/**
+ * 判定套餐子商品是否为 markdown（减价）类型。
+ * 与后端口径一致：price_type='markdown' 且 price_type_ext 非 'product_price'（原价子商品）。
+ */
+export declare function isMarkdownBundle(bundle: Record<string, any> | null | undefined): boolean;
+/**
+ * 套餐子商品对「行价」的带符号单位贡献（与后端 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 declare function getBundleSignedUnit(bundle: Record<string, any> | null | undefined, options?: {
+    useOriginal?: boolean;
+}): Decimal;
+/**
+ * 套餐子商品 `bundle_selling_price` 的存储净额（正值幅度）。
+ * markdown 取净额绝对值（3.70）；markup/原价维持原值。
+ */
+export declare function getBundleSellingMagnitude(bundle: Record<string, any> | null | undefined): Decimal;
 /**
  * OrderModule 默认 Rules 钩子工厂。
  *
@@ -55,7 +86,7 @@ export declare function sumOptionUnitPrice(options?: Array<{
  *   不含折扣。**权威源**。
  * - `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 主价**