@pisell/pisellos 2.2.198 → 2.2.200

package/dist/solution/BookingTicket/utils/bookingStatus.d.ts

@@ -9,6 +9,21 @@
  * 字段含义严格对齐既有协议（OrderTempOrder / parseSalesResponse），
  * 不发明等价关系。
  */
+/**
+ * 子预约状态机转移动作（POST /schedule/booking-transition/{schedule_event_id}）。
+ *
+ * @example
+ * await bookingTicket.transitionChildBooking({
+ *   schedule_event_id: 301,
+ *   action: 'confirm',
+ * });
+ */
+export type BookingTransitionAction = 'confirm' | 'reject' | 'arrive' | 'start' | 'complete' | 'cancel' | 'no_show' | 'reschedule';
+/** 子预约状态转移入参 */
+export interface TransitionChildBookingParams {
+    schedule_event_id: number | string;
+    action: BookingTransitionAction;
+}
 /**
  * 从 tempOrder 解析用于调用 appointment-status 接口的 schedule id。
  *
@@ -35,3 +50,28 @@ export declare function applyBookingsStatus(bookings: any[] | null | undefined,
  * 长度不一致时按较短一方对齐（防御式编程，正常路径不会发生）。
  */
 export declare function restoreBookingsStatus(bookings: any[] | null | undefined, previous: Array<string | undefined>): void;
+/**
+ * 将状态机 action 解析为转移后的 `appointment_status`。
+ *
+ * `reschedule` 暂未在状态矩阵启用，返回 null 表示跳过乐观更新。
+ *
+ * @example
+ * resolveStatusAfterTransition('confirm'); // 'confirmed'
+ */
+export declare function resolveStatusAfterTransition(action: BookingTransitionAction): string | null;
+/**
+ * 在 bookings 中按 `schedule_event_id` 定位子预约并乐观写入 `appointment_status`。
+ *
+ * @returns 写入前的 status；未命中时返回 undefined（调用方跳过回滚）
+ *
+ * @example
+ * const prev = applyChildBookingStatus(tempOrder.bookings, 301, 'confirmed');
+ */
+export declare function applyChildBookingStatus(bookings: any[] | null | undefined, scheduleEventId: number | string, status: string): string | undefined;
+/**
+ * 撤销 applyChildBookingStatus 对单条子预约的乐观写入。
+ *
+ * @example
+ * restoreChildBookingStatus(tempOrder.bookings, 301, prev);
+ */
+export declare function restoreChildBookingStatus(bookings: any[] | null | undefined, scheduleEventId: number | string, previous: string | undefined): void;

package/dist/solution/BookingTicket/utils/bookingStatus.js

@@ -10,6 +10,18 @@
  * 不发明等价关系。
  */
 
+/**
+ * 子预约状态机转移动作（POST /schedule/booking-transition/{schedule_event_id}）。
+ *
+ * @example
+ * await bookingTicket.transitionChildBooking({
+ *   schedule_event_id: 301,
+ *   action: 'confirm',
+ * });
+ */
+
+/** 子预约状态转移入参 */
+
 /**
  * 从 tempOrder 解析用于调用 appointment-status 接口的 schedule id。
  *
@@ -63,4 +75,62 @@ export function restoreBookingsStatus(bookings, previous) {
     var b = bookings[i];
     if (b) b.appointment_status = previous[i];
   }
+}
+
+/**
+ * 将状态机 action 解析为转移后的 `appointment_status`。
+ *
+ * `reschedule` 暂未在状态矩阵启用，返回 null 表示跳过乐观更新。
+ *
+ * @example
+ * resolveStatusAfterTransition('confirm'); // 'confirmed'
+ */
+export function resolveStatusAfterTransition(action) {
+  var _map$action;
+  var map = {
+    confirm: 'confirmed',
+    reject: 'rejected',
+    arrive: 'arrived',
+    start: 'started',
+    complete: 'completed',
+    cancel: 'cancelled',
+    no_show: 'no_show',
+    reschedule: null
+  };
+  return (_map$action = map[action]) !== null && _map$action !== void 0 ? _map$action : null;
+}
+
+/**
+ * 在 bookings 中按 `schedule_event_id` 定位子预约并乐观写入 `appointment_status`。
+ *
+ * @returns 写入前的 status；未命中时返回 undefined（调用方跳过回滚）
+ *
+ * @example
+ * const prev = applyChildBookingStatus(tempOrder.bookings, 301, 'confirmed');
+ */
+export function applyChildBookingStatus(bookings, scheduleEventId, status) {
+  var _bookings$idx;
+  if (!Array.isArray(bookings)) return undefined;
+  var idx = bookings.findIndex(function (b) {
+    return b && String(b.schedule_event_id) === String(scheduleEventId);
+  });
+  if (idx === -1) return undefined;
+  var previous = (_bookings$idx = bookings[idx]) === null || _bookings$idx === void 0 ? void 0 : _bookings$idx.appointment_status;
+  bookings[idx].appointment_status = status;
+  return previous;
+}
+
+/**
+ * 撤销 applyChildBookingStatus 对单条子预约的乐观写入。
+ *
+ * @example
+ * restoreChildBookingStatus(tempOrder.bookings, 301, prev);
+ */
+export function restoreChildBookingStatus(bookings, scheduleEventId, previous) {
+  if (!Array.isArray(bookings) || previous === undefined) return;
+  var idx = bookings.findIndex(function (b) {
+    return b && String(b.schedule_event_id) === String(scheduleEventId);
+  });
+  if (idx === -1) return;
+  bookings[idx].appointment_status = previous;
 }

package/dist/solution/ScanOrder/types.d.ts

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

package/dist/solution/ScanOrder/utils.js

@@ -13,7 +13,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; }
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
-import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, ensureProductSku, getBundleSellingMagnitude, getProductSkuOptions, normalizeProductSkuOptions, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
@@ -31,6 +31,7 @@ export function createEmptySummary() {
     shipping_tax_fee: '0.00',
     tax_fee: '0.00',
     surcharge_fee: '0.00',
+    surcharges: [],
     discount_amount: '0.00',
     deposit_amount: '0.00',
     expect_amount: '0.00',
@@ -510,16 +511,32 @@ export function normalizeOrderProduct(product) {
     });
   }
   var normalizedBundle = bundleInput.map(function (item) {
-    var _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref5, _item$bundle_selling_, _ref6, _ref7, _item$price2, _ref8, _item$price_type, _ref9, _item$price_type_ext;
-    return _objectSpread(_objectSpread({}, item), {}, {
+    var _item$price2, _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref5, _ref6, _item$price3, _ref7, _item$price_type, _ref8, _item$price_type_ext;
+    var magnitudeSource = _objectSpread(_objectSpread({}, item), {}, {
+      // 计算 markdown 净额时，只把真实毛价交给 helper；若只有 bundle_selling_price，
+      // helper 会按历史净额兜底，避免 option 二次扣减。
+      price: (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price
+    });
+    var normalizedItem = _objectSpread(_objectSpread({}, item), {}, {
       bundle_id: (_item$bundle_id2 = item.bundle_id) !== null && _item$bundle_id2 !== void 0 ? _item$bundle_id2 : item.id,
       bundle_product_id: (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id,
       bundle_group_id: (_item$bundle_group_id = item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item.group_id,
-      bundle_selling_price: (_ref5 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref5 !== void 0 ? _ref5 : '0.00',
-      price: (_ref6 = (_ref7 = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price) !== null && _ref7 !== void 0 ? _ref7 : item.bundle_selling_price) !== null && _ref6 !== void 0 ? _ref6 : '0.00',
-      price_type: (_ref8 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref8 !== void 0 ? _ref8 : '',
-      price_type_ext: (_ref9 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref9 !== void 0 ? _ref9 : ''
+      // price 保留毛价（markdown 仍为 5），由 price_type 决定符号。
+      price: (_ref5 = (_ref6 = (_item$price3 = item.price) !== null && _item$price3 !== void 0 ? _item$price3 : item.custom_price) !== null && _ref6 !== void 0 ? _ref6 : item.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : '0.00',
+      price_type: (_ref7 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref7 !== void 0 ? _ref7 : '',
+      price_type_ext: (_ref8 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref8 !== void 0 ? _ref8 : ''
     });
+    // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
+    normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);
+    if (normalizedItem.price_type === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      var _normalizedItem$custo;
+      normalizedItem.custom_price = (_normalizedItem$custo = normalizedItem.custom_price) !== null && _normalizedItem$custo !== void 0 ? _normalizedItem$custo : normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    if ((normalizedItem.price_type === 'markdown' || normalizedItem.price_type === 'markup') && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      delete normalizedItem.original_total;
+    }
+    return normalizedItem;
   });
   var normalizedOptions = normalizeProductSkuOptions((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option);
   var optionSum = sumOptionUnitPrice(normalizedOptions);
@@ -541,7 +558,7 @@ export function normalizeOrderProduct(product) {
   var variantPrice = Array.isArray(variantList) ? (_variantList$find = variantList.find(function (v) {
     return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
   })) === null || _variantList$find === void 0 ? void 0 : _variantList$find.price : undefined;
-  var resolvedSource = function (_product$_origin, _product$_origin2, _ref10, _product$original_pri) {
+  var resolvedSource = function (_product$_origin, _product$_origin2, _ref9, _product$original_pri) {
     if (metadata.source_product_price !== undefined) {
       return String(metadata.source_product_price);
     }
@@ -559,7 +576,7 @@ export function normalizeOrderProduct(product) {
     if (!isV2 && metadata.main_product_original_price !== undefined) {
       return String(metadata.main_product_original_price);
     }
-    return (_ref10 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref10 !== void 0 ? _ref10 : '0.00';
+    return (_ref9 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref9 !== void 0 ? _ref9 : '0.00';
   }();
 
   // 2) 派生 main_product_original_price（含 option、不含折扣）

package/dist/solution/VenueBooking/index.js

@@ -2295,7 +2295,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getOrderProducts",
     value: function getOrderProducts() {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      return this.store.order.getOrderProducts();
+      var products = this.store.order.getOrderProducts();
+      return products;
     }
   }, {
     key: "getSummary",

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

@@ -64,11 +64,14 @@ function mapOrderBundleToOtherBundle(bundle) {
     const catalogOriginal = item.original_price ?? item.product_price ?? item.price ?? item.bundle_selling_price;
     const selling = item.bundle_selling_price ?? item.price ?? catalogOriginal;
     const { bundle_selling_price: _omitBundleSelling, ...rest } = item;
+    const isMarkupOrMarkdown = (item.price_type === "markdown" || item.price_type === "markup") && (item.price_type_ext === "" || item.price_type_ext === void 0 || item.price_type_ext === null);
+    if (isMarkupOrMarkdown)
+      delete rest.original_total;
     return {
       ...rest,
       price: selling,
       original_price: catalogOriginal,
-      original_total: item.original_total ?? catalogOriginal,
+      ...isMarkupOrMarkdown ? {} : { original_total: item.original_total ?? catalogOriginal },
       num: item.num ?? item.quantity ?? 1,
       quantity: item.quantity ?? item.num ?? 1
     };

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

@@ -46,6 +46,7 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
 var import_utils2 = require("../../../solution/ShopDiscount/utils");
 var import_utils3 = require("../../Summary/utils");
+var import_utils4 = require("../../Order/utils");
 var toDiscountPayload = (discountItem) => {
   var _a, _b;
   return {
@@ -337,6 +338,15 @@ var formatBundleToOrigin = (bundle) => {
       var _a;
       return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
     }, 0);
+    const normalizedBundle = {
+      ...d,
+      // 计算 markdown 净额时只传真实毛价；若仅有 bundle_selling_price，则由 helper 当历史净额兜底。
+      price: (d == null ? void 0 : d.price) ?? (d == null ? void 0 : d.custom_price),
+      bundle_selling_price: d == null ? void 0 : d.bundle_selling_price,
+      price_type: (d == null ? void 0 : d.price_type) ?? (d == null ? void 0 : d.custom_price_type),
+      price_type_ext: (d == null ? void 0 : d.price_type_ext) ?? (d == null ? void 0 : d.custom_price_type_ext),
+      option: getBundleValueByKey("option")
+    };
     return {
       bundle_group_id: getBundleValueByKey("group_id"),
       bundle_id: d.id,
@@ -347,7 +357,7 @@ var formatBundleToOrigin = (bundle) => {
       extension_type: getBundleValueByKey("extension_type"),
       option: formatOptionsToOrigin(getBundleValueByKey("option")),
       discount_list: d.discount_list,
-      "bundle_selling_price": d == null ? void 0 : d.price,
+      "bundle_selling_price": (0, import_utils4.getBundleSellingMagnitude)(normalizedBundle).toFixed(2),
       "custom_price": d == null ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,

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

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Cart/utils/changePrice.ts
@@ -32,7 +22,7 @@ __export(changePrice_exports, {
   updateAllCartItemPrice: () => updateAllCartItemPrice
 });
 module.exports = __toCommonJS(changePrice_exports);
-var import_decimal = __toESM(require("decimal.js"));
+var import_utils = require("../../Order/utils");
 async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart, updateItemInitInfo) {
   var _a, _b;
   for (const item of cartItems) {
@@ -57,18 +47,20 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         const targetBundleItem = targetBundle.bundle_item.find(
           (m) => m.id === n.id
         );
-        if (targetBundleItem.price_type === "markdown") {
-          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
-        }
-        if (n.option) {
-          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).add(n.option.reduce((pre, cur) => {
-            return pre + new import_decimal.default(cur.price || 0).mul(cur.num || 1).toNumber();
-          }, 0)).toNumber();
-        }
         if (targetBundleItem) {
-          return {
+          const normalizedBundle = {
             ...n,
             price: targetBundleItem.price,
+            custom_price: targetBundleItem.price,
+            price_type: targetBundleItem.price_type,
+            price_type_ext: targetBundleItem.price_type_ext
+          };
+          const bundleSellingPrice = (0, import_utils.getBundleSellingMagnitude)(normalizedBundle).toFixed(2);
+          return {
+            ...n,
+            custom_price: targetBundleItem.price,
+            price: targetBundleItem.price_type === "markdown" ? bundleSellingPrice : targetBundleItem.price,
+            bundle_selling_price: bundleSellingPrice,
             base_price: targetBundleItem.base_price
           };
         }

package/lib/modules/Order/index.js

@@ -891,6 +891,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "surcharge_rounding_remainder",
       "tax_fee_rounding_remainder"
     ];
+    const metadataMoneyKeys = [
+      "main_product_attached_bundle_selling_price",
+      "main_product_attached_bundle_payment_price"
+    ];
     for (const product of products || []) {
       const productRecord = product;
       const metadata = productRecord.metadata && typeof productRecord.metadata === "object" ? { ...productRecord.metadata } : {};
@@ -902,10 +906,26 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         metadata[key] = value;
         hasMetadataPatch = true;
       }
+      for (const key of metadataMoneyKeys) {
+        const value = this.formatSummaryMetadataMoney(metadata[key]);
+        if (value === void 0)
+          continue;
+        metadata[key] = value;
+        hasMetadataPatch = true;
+      }
+      if (metadata.average_discount_amount_rate !== void 0) {
+        hasMetadataPatch = true;
+      }
       if (Array.isArray(productRecord.relation_surcharge_ids)) {
         metadata.relation_surcharge_ids = productRecord.relation_surcharge_ids;
         hasMetadataPatch = true;
       }
+      const productPaymentPrice = this.formatSummaryMetadataMoney(
+        productRecord.payment_price
+      );
+      if (productPaymentPrice !== void 0) {
+        productRecord.payment_price = productPaymentPrice;
+      }
       if (hasMetadataPatch)
         productRecord.metadata = metadata;
       if (!Array.isArray(productRecord.product_bundle))
@@ -921,6 +941,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           bundleMetadata.surcharge_fee = bundleSurchargeFee;
           hasBundleMetadataPatch = true;
         }
+        const bundlePaymentPrice = this.formatSummaryMetadataMoney(
+          bundleRecord.bundle_payment_price
+        );
+        if (bundlePaymentPrice !== void 0) {
+          bundleRecord.bundle_payment_price = bundlePaymentPrice;
+        }
         if (Array.isArray(bundleRecord.relation_surcharge_ids)) {
           bundleMetadata.relation_surcharge_ids = bundleRecord.relation_surcharge_ids;
           hasBundleMetadataPatch = true;
@@ -1843,21 +1869,41 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   updateVoucherOrderPayments(payments) {
     const tempOrder = this.ensureTempOrder();
+    const isVoucherPayment = (payment) => {
+      return payment.voucher_id !== void 0 && Number(payment.voucher_id) !== 0;
+    };
+    const hasSyncedOrderPayment = (payment) => {
+      return payment.order_payment_id !== void 0 && payment.order_payment_id !== null;
+    };
     const mappedVouchers = (0, import_utils.mapPaymentItemsToOrderPayments)(
       payments.map(
         (payment) => this.normalizePaymentSource(payment, { defaultPaid: true })
       )
     ).filter((payment) => {
-      return payment.voucher_id !== void 0 && Number(payment.voucher_id) !== 0;
+      return isVoucherPayment(payment);
     });
     const nonVoucherPayments = (tempOrder.payments || []).filter((payment) => {
-      return payment.voucher_id === void 0 || Number(payment.voucher_id) === 0;
+      return !isVoucherPayment(payment);
+    });
+    const syncedVoucherPayments = (tempOrder.payments || []).filter((payment) => {
+      return isVoucherPayment(payment) && hasSyncedOrderPayment(payment);
+    });
+    const syncedVoucherPaymentIds = new Set(
+      syncedVoucherPayments.map((payment) => String(payment.order_payment_id))
+    );
+    const replaceableVouchers = mappedVouchers.filter((payment) => {
+      if (!hasSyncedOrderPayment(payment))
+        return true;
+      return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
     });
     const cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
-      vouchers: mappedVouchers,
-      nonVoucherPayments
+      vouchers: replaceableVouchers,
+      nonVoucherPayments: [
+        ...nonVoucherPayments,
+        ...syncedVoucherPayments
+      ]
     });
-    tempOrder.payments = [...nonVoucherPayments, ...cappedVouchers];
+    tempOrder.payments = [...nonVoucherPayments, ...syncedVoucherPayments, ...cappedVouchers];
     this.updateTempOrderPaymentStatus(tempOrder);
     this.persistTempOrder();
     void this.recalculateSummary({ createIfMissing: true }).catch((error) => {
@@ -2824,8 +2870,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a, _b;
     const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
     const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+    const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
+    const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map((s) => ({ ...s || {} })) : (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []);
     this.store.tempOrder = nextTempOrder;
-    this.store.summary = raw.summary && typeof raw.summary === "object" ? { ...(0, import_utils.createEmptySummary)(), ...raw.summary } : (0, import_utils.createEmptySummary)();
+    this.store.summary = {
+      ...(0, import_utils.createEmptySummary)(),
+      ...rawSummary,
+      surcharges: summarySurcharges
+    };
     nextTempOrder._extend = {
       ...nextTempOrder._extend || {},
       originalSalesSnapshot: {

package/lib/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/lib/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 主价**

package/lib/modules/Order/utils.js

@@ -44,11 +44,14 @@ __export(utils_exports, {
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
+  getBundleSellingMagnitude: () => getBundleSellingMagnitude,
+  getBundleSignedUnit: () => getBundleSignedUnit,
   getOrderProductLineUid: () => getOrderProductLineUid,
   getProductSkuOptions: () => getProductSkuOptions,
   hasAssignedHolderId: () => hasAssignedHolderId,
   indexOrderProductsByUid: () => indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
+  isMarkdownBundle: () => isMarkdownBundle,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
@@ -85,11 +88,10 @@ function composeLinePrice(params) {
   let total = new import_decimal.default(Number(mainPrice) || 0);
   if (Array.isArray(bundle)) {
     for (const item of bundle) {
-      const rawPrice = useOriginalBundle ? (item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price) : (item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price);
-      const price = new import_decimal.default(Number(rawPrice) || 0);
+      const signedUnit = getBundleSignedUnit(item, { useOriginal: useOriginalBundle });
       const rawNum = (item == null ? void 0 : item.num) ?? (item == null ? void 0 : item.quantity) ?? 1;
       const num = new import_decimal.default(Number(rawNum) || 0);
-      total = total.plus(price.times(num));
+      total = total.plus(signedUnit.times(num));
     }
   }
   return total.toDecimalPlaces(2).toFixed(2);
@@ -129,6 +131,33 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function isMarkdownBundle(bundle) {
+  if (!bundle || typeof bundle !== "object")
+    return false;
+  const ext = bundle.price_type_ext ?? bundle.custom_price_type_ext;
+  const type = bundle.price_type ?? bundle.custom_price_type;
+  return type === "markdown" && ext !== "product_price";
+}
+function getBundleSignedUnit(bundle, options) {
+  if (!bundle || typeof bundle !== "object")
+    return new import_decimal.default(0);
+  const useOriginal = (options == null ? void 0 : options.useOriginal) ?? false;
+  if (isMarkdownBundle(bundle)) {
+    const catalog = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.custom_price ?? bundle.base_price ?? bundle.price : bundle.custom_price ?? bundle.product_price ?? bundle.original_price ?? bundle.base_price ?? bundle.price;
+    if (catalog !== void 0 && catalog !== null && catalog !== "") {
+      const raw = new import_decimal.default(Number(catalog) || 0);
+      if (raw.lt(0))
+        return raw;
+      return raw.minus(sumOptionUnitPrice(bundle.option)).negated();
+    }
+    return new import_decimal.default(Number(bundle.bundle_selling_price) || 0).abs().negated();
+  }
+  const rawPrice = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.price : bundle.bundle_selling_price ?? bundle.price;
+  return new import_decimal.default(Number(rawPrice) || 0);
+}
+function getBundleSellingMagnitude(bundle) {
+  return getBundleSignedUnit(bundle).abs();
+}
 function resolveRulesManualDiscountFlag(metadata) {
   if (!metadata)
     return void 0;
@@ -472,9 +501,8 @@ function formatSubmitBundleItems(bundle) {
   return bundle.map((b) => {
     const rawBundle = b && typeof b === "object" ? b : {};
     const existedMetadata = rawBundle.metadata && typeof rawBundle.metadata === "object" ? rawBundle.metadata : {};
-    const sellingPrice = toMoneyString(
-      rawBundle.bundle_selling_price ?? rawBundle.price
-    );
+    const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    const paymentPrice = rawBundle.bundle_payment_price !== void 0 && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== "" ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
     const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toMoneyString(
@@ -496,6 +524,7 @@ function formatSubmitBundleItems(bundle) {
       price_type: rawBundle.price_type ?? rawBundle.custom_price_type ?? "",
       price_type_ext: rawBundle.price_type_ext ?? rawBundle.custom_price_type_ext ?? "",
       bundle_selling_price: sellingPrice,
+      bundle_payment_price: paymentPrice,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: (rawBundle == null ? void 0 : rawBundle.bundle_group_id) ?? (rawBundle == null ? void 0 : rawBundle.group_id),
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
@@ -532,6 +561,9 @@ function normalizeSubmitProduct(product) {
   const 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",
@@ -566,9 +598,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.payment_price ?? submitProduct.selling_price
   };
 }
 var SUBMIT_BOOKING_METADATA_WHITELIST = [
@@ -953,11 +985,14 @@ function indexOrderProductsByUid(products) {
   formatV1Product,
   generateDuration,
   getAllDiscountList,
+  getBundleSellingMagnitude,
+  getBundleSignedUnit,
   getOrderProductLineUid,
   getProductSkuOptions,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
+  isMarkdownBundle,
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,