@pisell/pisellos 2.3.6 → 2.3.8

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

@@ -491,7 +491,7 @@ export interface OrderPaymentData {
     voucher_id?: string | number;
     origin_amount?: string;
     service_fee?: string;
-    status?: 'active' | 'voided' | string;
+    status?: 'active' | 'paid' | 'voided' | 'payment_pending' | string;
     /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
     payment_time?: string;
     wallet_pass_usage_unit?: unknown;
@@ -537,6 +537,7 @@ export interface SyncPaymentsToOrderParams {
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
+    confirmPendingVoucherPayments?: boolean;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -696,6 +697,7 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     submitTempOrderAsync: <T = any>(params?: {
@@ -707,6 +709,7 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     getOrderPayments: () => OrderPaymentData[];
@@ -714,7 +717,17 @@ export interface OrderModuleAPI {
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
     updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>) => OrderPaymentData[];
     deleteOrderPayment: (paymentIdentity: string | number) => OrderPaymentData[];
-    updateVoucherOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
+    updateVoucherOrderPayments: (payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }) => OrderPaymentData[];
+    confirmPendingVoucherPayments: (options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }) => OrderPaymentData[];
+    discardPendingVoucherPayments: (options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }) => OrderPaymentData[];
     sendCustomerPayLink: <T = any>(params: SendCustomerPayLinkParams) => Promise<T>;
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {

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

@@ -0,0 +1,5 @@
+import type { OrderProductDiscountItem } from '../types';
+type NormalizeDiscountList = (discountList?: unknown[] | null) => OrderProductDiscountItem[];
+export declare function restoreHydratedBundleDiscounts<T extends Record<string, any>>(product: T, normalizeDiscountList: NormalizeDiscountList): T;
+export declare function expandHydratedProductsForDiscountCollection(products: any[] | undefined | null): any[];
+export {};

package/dist/modules/Order/utils/bundleDiscountHydration.js

@@ -0,0 +1,144 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var BUNDLE_MAP_ID_KEY = 'custom_product_bundle_map_id';
+function getBundleMapId(bundle) {
+  var _bundle$metadata;
+  var metadataMapId = bundle === null || bundle === void 0 || (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 ? void 0 : _bundle$metadata[BUNDLE_MAP_ID_KEY];
+  if (metadataMapId !== undefined && metadataMapId !== null && metadataMapId !== '') {
+    return String(metadataMapId);
+  }
+  if ((bundle === null || bundle === void 0 ? void 0 : bundle._id) !== undefined && bundle._id !== null && bundle._id !== '') {
+    return String(bundle._id);
+  }
+  return null;
+}
+function getDiscountBundleMapId(discount) {
+  var _discount$metadata;
+  var mapId = discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata[BUNDLE_MAP_ID_KEY];
+  if (mapId === undefined || mapId === null || mapId === '') return null;
+  return String(mapId);
+}
+function hasSameBundleDiscount(discountList, discount) {
+  var _ref, _discount$discount$re, _discount$discount;
+  var targetOrderDiscountId = discount.order_discount_id;
+  if (targetOrderDiscountId !== undefined && targetOrderDiscountId !== null) {
+    return discountList.some(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.order_discount_id) === targetOrderDiscountId;
+    });
+  }
+  var targetResourceId = (_ref = (_discount$discount$re = discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _discount$discount$re !== void 0 ? _discount$discount$re : discount === null || discount === void 0 ? void 0 : discount.resource_id) !== null && _ref !== void 0 ? _ref : discount === null || discount === void 0 ? void 0 : discount.discount_id;
+  var targetMapId = getDiscountBundleMapId(discount);
+  return discountList.some(function (item) {
+    var _ref2, _item$discount$resour, _item$discount, _item$amount, _discount$amount;
+    var resourceId = (_ref2 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref2 !== void 0 ? _ref2 : item === null || item === void 0 ? void 0 : item.discount_id;
+    return resourceId === targetResourceId && String((_item$amount = item === null || item === void 0 ? void 0 : item.amount) !== null && _item$amount !== void 0 ? _item$amount : '') === String((_discount$amount = discount === null || discount === void 0 ? void 0 : discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : '') && getDiscountBundleMapId(item) === targetMapId;
+  });
+}
+export function restoreHydratedBundleDiscounts(product, normalizeDiscountList) {
+  if (!Array.isArray(product.product_bundle) || !Array.isArray(product.discount_list)) {
+    return product;
+  }
+  var bundleByMapId = new Map();
+  product.product_bundle.forEach(function (bundle) {
+    if (!bundle || _typeof(bundle) !== 'object') return;
+    var mapId = getBundleMapId(bundle);
+    if (mapId) bundleByMapId.set(mapId, bundle);
+  });
+  if (!bundleByMapId.size) return product;
+  var mainDiscountList = [];
+  var bundleDiscounts = [];
+  product.discount_list.forEach(function (discount) {
+    var mapId = getDiscountBundleMapId(discount);
+    if (mapId && bundleByMapId.has(mapId)) {
+      bundleDiscounts.push({
+        mapId: mapId,
+        discount: discount
+      });
+    } else {
+      mainDiscountList.push(discount);
+    }
+  });
+  if (!bundleDiscounts.length) return product;
+  return _objectSpread(_objectSpread({}, product), {}, {
+    discount_list: normalizeDiscountList(mainDiscountList),
+    product_bundle: product.product_bundle.map(function (bundle) {
+      if (!bundle || _typeof(bundle) !== 'object') return bundle;
+      var mapId = getBundleMapId(bundle);
+      if (!mapId) return bundle;
+      var matchedDiscounts = bundleDiscounts.filter(function (item) {
+        return item.mapId === mapId;
+      }).map(function (item) {
+        return item.discount;
+      });
+      if (!matchedDiscounts.length) return bundle;
+      var currentDiscountList = Array.isArray(bundle.discount_list) ? _toConsumableArray(bundle.discount_list) : [];
+      var _iterator = _createForOfIteratorHelper(matchedDiscounts),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var discount = _step.value;
+          if (!hasSameBundleDiscount(currentDiscountList, discount)) {
+            currentDiscountList.push(discount);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return _objectSpread(_objectSpread({}, bundle), {}, {
+        discount_list: normalizeDiscountList(currentDiscountList),
+        metadata: _objectSpread(_objectSpread({}, bundle.metadata || {}), {}, _defineProperty({}, BUNDLE_MAP_ID_KEY, mapId))
+      });
+    })
+  });
+}
+export function expandHydratedProductsForDiscountCollection(products) {
+  var expanded = [];
+  var _iterator2 = _createForOfIteratorHelper(products || []),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var product = _step2.value;
+      expanded.push(product);
+      var _iterator3 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _ref3, _ref4, _bundle$bundle_produc, _ref5, _bundle$num, _ref6, _bundle$quantity, _ref7, _bundle$original_pric, _bundle$bundle_sellin, _bundle$is_charge_tax;
+          var bundle = _step3.value;
+          if (!Array.isArray(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || bundle.discount_list.length === 0) continue;
+          expanded.push(_objectSpread(_objectSpread({}, product), {}, {
+            product_id: (_ref3 = (_ref4 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref4 !== void 0 ? _ref4 : bundle.product_id) !== null && _ref3 !== void 0 ? _ref3 : product === null || product === void 0 ? void 0 : product.product_id,
+            num: (_ref5 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref5 !== void 0 ? _ref5 : product === null || product === void 0 ? void 0 : product.num,
+            product_quantity: (_ref6 = (_bundle$quantity = bundle.quantity) !== null && _bundle$quantity !== void 0 ? _bundle$quantity : bundle.num) !== null && _ref6 !== void 0 ? _ref6 : product === null || product === void 0 ? void 0 : product.product_quantity,
+            original_price: (_ref7 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle.product_price) !== null && _ref7 !== void 0 ? _ref7 : bundle.price,
+            selling_price: (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price,
+            is_charge_tax: (_bundle$is_charge_tax = bundle.is_charge_tax) !== null && _bundle$is_charge_tax !== void 0 ? _bundle$is_charge_tax : product === null || product === void 0 ? void 0 : product.is_charge_tax,
+            discount_list: bundle.discount_list
+          }));
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return expanded;
+}

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

@@ -254,6 +254,10 @@ export declare function clearTempOrderHolderAssignments(tempOrder: OrderTempOrde
  * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
  */
 export declare function getOrderProductLineUid(product: Record<string, any> | null | undefined): string | null;
+export declare function getRuntimeProductOrigin(tempOrder: OrderTempOrder | null | undefined, product: any): Record<string, any> | null;
+export declare function isHolderConfigRequired(holderConfig: any): boolean;
+export declare function productRequiresFormSubject(tempOrder: OrderTempOrder | null | undefined, product: any): boolean;
+export declare function resolveIsFormSubject(tempOrder: OrderTempOrder | null | undefined, product?: any): boolean;
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。
  *

package/dist/modules/Order/utils.js

@@ -1,7 +1,8 @@
-var _excluded = ["unique_identification_number"],
-  _excluded2 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
-  _excluded3 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
-  _excluded4 = ["collect_pax", "table_occupancy_duration"];
+var _excluded = ["custom_product_bundle_map_id"],
+  _excluded2 = ["unique_identification_number"],
+  _excluded3 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
+  _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
+  _excluded5 = ["collect_pax", "table_occupancy_duration"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -446,6 +447,54 @@ export function normalizeOrderProductDiscountList(discountList) {
     return normalized;
   });
 }
+function resolveSubmitBundleMapId(bundle) {
+  var _bundle$metadata;
+  var metadataMapId = (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 ? void 0 : _bundle$metadata.custom_product_bundle_map_id;
+  if (metadataMapId !== undefined && metadataMapId !== null && metadataMapId !== '') {
+    return metadataMapId;
+  }
+  if (bundle._id !== undefined && bundle._id !== null && bundle._id !== '') {
+    return bundle._id;
+  }
+  return undefined;
+}
+function collectSubmitProductDiscountList(product) {
+  var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
+  var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
+    _step6;
+  try {
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var bundle = _step6.value;
+      if (!bundle || _typeof(bundle) !== 'object') continue;
+      var bundleMapId = resolveSubmitBundleMapId(bundle);
+      var bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
+      var _iterator7 = _createForOfIteratorHelper(bundleDiscountList),
+        _step7;
+      try {
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var discount = _step7.value;
+          if (!discount || _typeof(discount) !== 'object') continue;
+          var discountMetadata = discount.metadata && _typeof(discount.metadata) === 'object' ? discount.metadata : {};
+          var discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
+          submitDiscountList.push(_objectSpread(_objectSpread({}, discount), discountMapId !== undefined ? {
+            metadata: _objectSpread(_objectSpread({}, discountMetadata), {}, {
+              custom_product_bundle_map_id: discountMapId
+            })
+          } : {}));
+        }
+      } catch (err) {
+        _iterator7.e(err);
+      } finally {
+        _iterator7.f();
+      }
+    }
+  } catch (err) {
+    _iterator6.e(err);
+  } finally {
+    _iterator6.f();
+  }
+  return normalizeOrderProductDiscountList(submitDiscountList);
+}
 
 /**
  * 手动改价（price_override）时行级 original_price（composite 单价）：
@@ -783,6 +832,8 @@ function formatSubmitBundleItems(bundle) {
     var _ref25, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref26, _rawBundle$price_type, _ref27, _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 _customProductBundleMapId = existedMetadata.custom_product_bundle_map_id,
+      submitMetadata = _objectWithoutProperties(existedMetadata, _excluded);
 
     // bundle_selling_price 出站存「正净额」：markdown 为 |price| − Σoptions（如 3.70），
     // markup/原价维持原值；与后端口径一致（price 仍为毛价）。
@@ -794,6 +845,8 @@ function formatSubmitBundleItems(bundle) {
     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);
     var num = toBundleNumber((_rawBundle$num = rawBundle.num) !== null && _rawBundle$num !== void 0 ? _rawBundle$num : rawBundle.quantity, 1);
+    var bundleMapId = resolveSubmitBundleMapId(rawBundle);
+    var hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
     return {
       is_charge_tax: (_rawBundle$is_charge_ = rawBundle.is_charge_tax) !== null && _rawBundle$is_charge_ !== void 0 ? _rawBundle$is_charge_ : 0,
       bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0,
@@ -810,7 +863,9 @@ function formatSubmitBundleItems(bundle) {
       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,
       bundle_product_id: (_rawBundle$bundle_pro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_product_id) !== null && _rawBundle$bundle_pro !== void 0 ? _rawBundle$bundle_pro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle._bundle_product_id,
-      metadata: _objectSpread(_objectSpread({}, existedMetadata), {}, {
+      metadata: _objectSpread(_objectSpread(_objectSpread({}, submitMetadata), hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
+        custom_product_bundle_map_id: bundleMapId
+      } : {}), {}, {
         surcharge_fee: surchargeFee,
         relation_surcharge_ids: relationSurchargeIds,
         product_discount_difference: productDiscountDifference
@@ -839,7 +894,7 @@ function normalizeSubmitProduct(product) {
   var _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
   var _ref28 = product,
     _runtimeUid = _ref28.unique_identification_number,
-    submitProduct = _objectWithoutProperties(_ref28, _excluded);
+    submitProduct = _objectWithoutProperties(_ref28, _excluded2);
   var num = submitProduct.num,
     _productSurchargeFee = submitProduct.surcharge_fee,
     _deprecatedDiscountAmount = submitProduct.discount_amount,
@@ -847,7 +902,7 @@ function normalizeSubmitProduct(product) {
     _deprecatedDiscountway = submitProduct.discountway,
     _deprecatedProductDiscountReason = submitProduct.product_discount_reason,
     _deprecatedDiscountPer = submitProduct.discount_per,
-    productRest = _objectWithoutProperties(submitProduct, _excluded2);
+    productRest = _objectWithoutProperties(submitProduct, _excluded3);
   delete productRest["product_".concat('option', "_item")];
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
@@ -877,7 +932,7 @@ function normalizeSubmitProduct(product) {
   } : {}), {}, {
     product_quantity: toBundleNumber(num !== null && num !== void 0 ? num : submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
+    discount_list: collectSubmitProductDiscountList(submitProduct),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
@@ -899,19 +954,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator6 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step6;
+  var _iterator8 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step8;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var key = _step6.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var key = _step8.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator6.f();
+    _iterator8.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -1035,7 +1090,7 @@ export function buildSubmitPayload(params) {
     _totalRefundAmount = _ref29.total_refund_amount,
     _createDate = _ref29.create_date,
     _holderId = _ref29.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref29, _excluded3);
+    tempOrderRest = _objectWithoutProperties(_ref29, _excluded4);
   var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
   if (!submitType) {
     var _tempOrder$bookings;
@@ -1086,7 +1141,7 @@ export function buildSubmitPayload(params) {
       var _ref31 = tempOrder.metadata || {},
         _collectPax = _ref31.collect_pax,
         _tableOccupancyDuration = _ref31.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref31, _excluded4);
+        rest = _objectWithoutProperties(_ref31, _excluded5);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
@@ -1224,25 +1279,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
     target[key] = null;
     changed = true;
   };
-  var _iterator7 = _createForOfIteratorHelper(tempOrder.products || []),
-    _step7;
+  var _iterator9 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step9;
   try {
-    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var product = _step7.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var product = _step9.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         resetHolderField(product.metadata);
       }
     }
   } catch (err) {
-    _iterator7.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator7.f();
+    _iterator9.f();
   }
-  var _iterator8 = _createForOfIteratorHelper(tempOrder.bookings || []),
-    _step8;
+  var _iterator10 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step10;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var booking = _step8.value;
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      var booking = _step10.value;
       var bookingRecord = booking;
       if (booking.metadata && _typeof(booking.metadata) === 'object') {
         resetHolderField(booking.metadata);
@@ -1253,9 +1308,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator10.e(err);
   } finally {
-    _iterator8.f();
+    _iterator10.f();
   }
   var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {
@@ -1287,6 +1342,37 @@ export function getOrderProductLineUid(product) {
   if (uid === undefined || uid === null || uid === '') return null;
   return String(uid);
 }
+export function getRuntimeProductOrigin(tempOrder, product) {
+  var _tempOrder$_extend2, _tempOrder$_extend3;
+  var uid = getOrderProductLineUid(product);
+  if (uid && tempOrder !== null && tempOrder !== void 0 && (_tempOrder$_extend2 = tempOrder._extend) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2.productsByUid) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2[uid]) !== null && _tempOrder$_extend2 !== void 0 && _tempOrder$_extend2.origin) {
+    return tempOrder._extend.productsByUid[uid].origin;
+  }
+  var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
+    var _ref32, _item$product_id, _ref33, _product$product_id;
+    return item === product || getOrderProductLineUid(item) === uid || String((_ref32 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref32 !== void 0 ? _ref32 : '') === String((_ref33 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref33 !== void 0 ? _ref33 : '');
+  });
+  var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
+  return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[matchedUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin) || null : null;
+}
+export function isHolderConfigRequired(holderConfig) {
+  if (!holderConfig || _typeof(holderConfig) !== 'object') return false;
+  if (holderConfig.status === 'disable') return false;
+  return Number(holderConfig.required) === 1;
+}
+export function productRequiresFormSubject(tempOrder, product) {
+  var runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
+  return isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config);
+}
+export function resolveIsFormSubject(tempOrder, product) {
+  var _tempOrder$holder;
+  // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
+  if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
+  if (product) return productRequiresFormSubject(tempOrder, product);
+  return ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).some(function (item) {
+    return productRequiresFormSubject(tempOrder, item);
+  });
+}
 
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -24,7 +24,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
@@ -43,7 +43,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;

package/dist/modules/Rules/index.js

@@ -118,7 +118,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
       // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
-      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
+      // 旧版 holders[0].form_record_id 新版 holders[0]
+      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : undefined;
       var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
       // 商品不需要选holder，则不对比holder，直接返回true，
       if (!product.isNeedHolder) return true;
@@ -323,6 +324,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject,
         orderTotalAmount = _ref2.orderTotalAmount;
+      var resolveIsFormSubject = function resolveIsFormSubject(product) {
+        return typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
+      };
+
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -885,7 +890,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
@@ -1088,7 +1093,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           // 如果 holder 不匹配，则不适用

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

@@ -22,6 +22,7 @@ export interface DiscountResult {
     productList: any[];
     discountList: any[];
 }
+export type RulesFormSubject = boolean | ((product: any) => boolean);
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -31,7 +32,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }) => DiscountResult;
 }

package/dist/server/index.js

@@ -4038,6 +4038,7 @@ var Server = /*#__PURE__*/function () {
                 shop_order_number: next.shop_order_number,
                 shop_full_order_number: next.shop_full_order_number
               });
+              // 删除 数据体中的 vouchers,对小票和后端来说他们不需要，这个字段只是单向同步给前端用的，而且目前对订单来说还没什么用
               return _context42.abrupt("return", next);
             case 28:
               _context42.prev = 28;

package/dist/server/modules/order/index.d.ts

@@ -31,10 +31,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志

package/dist/server/modules/order/index.js

@@ -177,10 +177,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return initialize;
     }()
     /**
-    * 记录信息日志
-    * @param title 日志标题
-    * @param metadata 日志元数据
-    */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {

package/dist/solution/BaseSales/index.d.ts

@@ -195,6 +195,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     /**
@@ -207,12 +208,14 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
@@ -229,7 +232,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 删除当前订单中的指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
+    confirmPendingVoucherPayments(): OrderPaymentData[];
+    discardPendingVoucherPayments(): OrderPaymentData[];
     private getWalletProductList;
     initWalletData(params?: {
         order_wait_pay_amount?: number;