@pisell/pisellos 2.2.181 → 2.2.183

package/dist/modules/Order/utils.js

@@ -1,10 +1,9 @@
 var _excluded = ["unique_identification_number"],
-  _excluded2 = ["num", "product_option_item", "surcharge_fee"],
-  _excluded3 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "shop_full_order_number", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
+  _excluded2 = ["num", "product_option_item", "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"];
 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 _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); }
 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -14,6 +13,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
 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 _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 _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; }
@@ -113,14 +113,165 @@ export function sumOptionUnitPrice(options) {
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
+
+/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
+export function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata) return undefined;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  var priceOverride = metadata.price_override;
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '') {
+    return true;
+  }
+  return undefined;
+}
+function normalizeOrderProductDiscountAmount(amount) {
+  if (amount === undefined || amount === null) return undefined;
+  return String(amount);
+}
+
+/**
+ * 商品行折扣只保留后端 OrderProductDiscountItem 协议字段。
+ * Rules/券计算过程中的 `_num`、`config` 等运行态字段不应进入 tempOrder 或提交 payload。
+ */
+export function normalizeOrderProductDiscountList(discountList) {
+  if (!Array.isArray(discountList)) return [];
+  return discountList.filter(function (item) {
+    return !!item && _typeof(item) === 'object';
+  }).map(function (item) {
+    var normalized = {
+      discount_id: Number.isFinite(Number(item.discount_id)) ? Number(item.discount_id) : 0
+    };
+    if (item.order_discount_id === null) {
+      normalized.order_discount_id = null;
+    } else if (item.order_discount_id !== undefined) {
+      var orderDiscountId = Number(item.order_discount_id);
+      if (Number.isFinite(orderDiscountId)) {
+        normalized.order_discount_id = orderDiscountId;
+      }
+    }
+    if (item.type !== undefined) normalized.type = item.type;
+    var amount = normalizeOrderProductDiscountAmount(item.amount);
+    if (amount !== undefined) normalized.amount = amount;
+    if (item.discount && _typeof(item.discount) === 'object') {
+      normalized.discount = _objectSpread({}, item.discount);
+    }
+    if (item.metadata === null) {
+      normalized.metadata = null;
+    } else if (item.metadata && _typeof(item.metadata) === 'object') {
+      normalized.metadata = _objectSpread({}, item.metadata);
+    }
+    return normalized;
+  });
+}
+
+/**
+ * 手动改价（price_override）时行级 original_price（composite 单价）：
+ * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），
+ * 而非 bundle 子项 catalog 原价合成的 composedOriginalPrice（如 30）。
+ *
+ * origin_total 与 SkuDetailModal / cacheItem._extend 一致，为单价语义，不再除以 num。
+ */
+export function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  var _metadata$origin;
+  var metadata = params.metadata || {};
+  var priceOverride = metadata.price_override;
+  if (priceOverride === undefined || priceOverride === null || priceOverride === '') {
+    return fallbackCompositeOriginal;
+  }
+  var refTotal = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.origin_total;
+  if (refTotal !== undefined && refTotal !== null && refTotal !== '') {
+    var parsed = Number(refTotal);
+    if (Number.isFinite(parsed)) {
+      return new Decimal(parsed).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  var lineOriginal = params.lineOriginalPrice;
+  if (lineOriginal !== undefined && lineOriginal !== null && lineOriginal !== '') {
+    var parsedLine = Number(lineOriginal);
+    var parsedFallback = Number(fallbackCompositeOriginal);
+    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
+      return new Decimal(parsedLine).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  return fallbackCompositeOriginal;
+}
+
+/**
+ * 计算商品行「每单位有效折扣」：discount_list 合计 + 被 Rules 剥离但仍 inPromotion 的差额。
+ *
+ * Rules.calcDiscount 会把 type=promotion 从 discount_list 去掉，但 metadata._promotion 仍保留；
+ * applyProductDiscountPrices 必须回读 _promotion，否则抬价/降价都会在第二步被 source 原价覆盖。
+ *
+ * @example
+ * resolveEffectivePerUnitDiscount({ metadata: { _promotion: { inPromotion: true, originalPrice: 1, finalPrice: 5 } }, discount_list: [] });
+ * // => -4
+ */
+export function resolveEffectivePerUnitDiscount(product) {
+  var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
+  var fromList = discountList.reduce(function (sum, discount) {
+    return sum + Number((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+  }, 0);
+  var hasPromoDiscountItem = discountList.some(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion';
+  });
+  if (hasPromoDiscountItem) return fromList;
+  var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
+  var optionSum = sumOptionUnitPrice(product === null || product === void 0 ? void 0 : product.product_option_item).toNumber();
+
+  // applyPromotion 写价后、Rules 剥离 promotion discount 的兜底
+  if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
+    var source = Number(metadata.source_product_price);
+    var selling = Number(metadata.main_product_selling_price) - optionSum;
+    if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
+      return fromList + (source - selling);
+    }
+  }
+  var promo = metadata._promotion;
+  if ((promo === null || promo === void 0 ? void 0 : promo.inPromotion) !== true) return fromList;
+  var originalPrice = Number(promo.originalPrice);
+  var finalPrice = Number(promo.finalPrice);
+  if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
+  return fromList + (originalPrice - finalPrice);
+}
 export function createDefaultOrderRulesHooks() {
   var toUnitPriceString = function toUnitPriceString(totalLike, num) {
     var effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+  var getBundleIdentity = function getBundleIdentity(bundle) {
+    var _ref3, _bundle$bundle_id, _ref4, _ref5, _bundle$bundle_produc, _ref6, _ref7, _bundle$bundle_varian, _ref8, _bundle$bundle_group_;
+    return [(_ref3 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref3 !== void 0 ? _ref3 : '', (_ref4 = (_ref5 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref5 !== void 0 ? _ref5 : bundle.product_id) !== null && _ref4 !== void 0 ? _ref4 : '', (_ref6 = (_ref7 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref7 !== void 0 ? _ref7 : bundle.product_variant_id) !== null && _ref6 !== void 0 ? _ref6 : 0, (_ref8 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref8 !== void 0 ? _ref8 : ''].join('|');
+  };
+  var mergeRulesBundlePrices = function mergeRulesBundlePrices(currentBundle, rulesBundle) {
+    if (!Array.isArray(rulesBundle)) return rulesBundle;
+    var currentByIdentity = new Map();
+    (currentBundle || []).forEach(function (bundle) {
+      if (!bundle || _typeof(bundle) !== 'object') return;
+      currentByIdentity.set(getBundleIdentity(bundle), bundle);
+    });
+    return rulesBundle.map(function (bundle) {
+      var _bundle$price_type_ex, _ref9, _ref10, _current$price, _ref11, _ref12, _ref13, _current$original_pri;
+      if (!bundle || _typeof(bundle) !== 'object') return bundle;
+      var current = currentByIdentity.get(getBundleIdentity(bundle));
+      if (!current) return bundle;
+      var isProductPriceBundle = ((_bundle$price_type_ex = bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : current.price_type_ext) === 'product_price';
+      if (!isProductPriceBundle) return bundle;
+      var sourcePrice = (_ref9 = (_ref10 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref10 !== void 0 ? _ref10 : current.original_price) !== null && _ref9 !== void 0 ? _ref9 : current.bundle_selling_price;
+      var originalPrice = (_ref11 = (_ref12 = (_ref13 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref13 !== void 0 ? _ref13 : current.price) !== null && _ref12 !== void 0 ? _ref12 : current.custom_price) !== null && _ref11 !== void 0 ? _ref11 : sourcePrice;
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundle), sourcePrice !== undefined ? {
+        price: sourcePrice
+      } : {}), originalPrice !== undefined ? {
+        original_price: originalPrice
+      } : {}), current.original_total !== undefined ? {
+        original_total: current.original_total
+      } : {});
+    });
+  };
   return {
     getProduct: function getProduct(product) {
-      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
+      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _metadataAny$_promoti;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
       var optionSum = sumOptionUnitPrice(product.product_option_item);
@@ -145,7 +296,7 @@ export function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
-        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证唯一值存在；
+        // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
         _id: (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(product.product_option_item, product.product_bundle)),
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
@@ -161,16 +312,21 @@ export function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.booking_id) || null,
         isClient: false,
-        isManualDiscount: ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_manual_discount) || false,
-        holder_id: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.holder_id,
-        startDate: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate)
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
+        holder_id: (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.holder_id,
+        startDate: ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.start_date) || ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.startDate),
+        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
+        inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
+        _promotion: metadataAny._promotion
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref3, _values$quantity, _ref4, _metadataAny$source_p, _values$bundle, _values$discount_list, _values$quantity2;
-      var nextNum = Number((_ref3 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref3 !== void 0 ? _ref3 : 1) || 1;
+      var _ref14, _values$quantity, _ref15, _metadataAny$source_p, _values$discount_list, _values$quantity2;
+      var nextNum = Number((_ref14 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref14 !== void 0 ? _ref14 : 1) || 1;
       var metadataAny = product.metadata || {};
-      var existedSource = (_ref4 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref4 !== void 0 ? _ref4 : '0';
+      var existedSource = (_ref15 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref15 !== void 0 ? _ref15 : '0';
       var nextOptions = product.product_option_item;
       var optionSum = sumOptionUnitPrice(nextOptions);
 
@@ -186,7 +342,7 @@ export function createDefaultOrderRulesHooks() {
       // 含 option 的 main_product_*
       var nextMainSellingPrice = new Decimal(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       var nextMainOriginalPrice = new Decimal(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
-      var nextBundle = (_values$bundle = values.bundle) !== null && _values$bundle !== void 0 ? _values$bundle : product.product_bundle;
+      var nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       var composedSellingPrice = composeLinePrice({
         mainPrice: nextMainSellingPrice,
         bundle: nextBundle
@@ -196,9 +352,14 @@ export function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
+        num: nextNum,
+        metadata: metadataAny,
+        lineOriginalPrice: product.original_price
+      }, composedOriginalPrice);
       return _objectSpread(_objectSpread({}, product), {}, {
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
@@ -337,11 +498,11 @@ function toMoneyString(value) {
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(function (b) {
-    var _rawBundle$bundle_sel, _ref5, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref6, _rawBundle$price_type, _ref7, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
+    var _rawBundle$bundle_sel, _ref16, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref17, _rawBundle$price_type, _ref18, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
     var rawBundle = b && _typeof(b) === 'object' ? b : {};
     var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
     var sellingPrice = toMoneyString((_rawBundle$bundle_sel = rawBundle.bundle_selling_price) !== null && _rawBundle$bundle_sel !== void 0 ? _rawBundle$bundle_sel : rawBundle.price);
-    var priceValue = (_ref5 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref5 !== void 0 ? _ref5 : rawBundle.bundle_selling_price;
+    var priceValue = (_ref16 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref16 !== void 0 ? _ref16 : rawBundle.bundle_selling_price;
     var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
     var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -354,8 +515,8 @@ function formatSubmitBundleItems(bundle) {
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
       extension_type: (_rawBundle$extension_2 = rawBundle.extension_type) !== null && _rawBundle$extension_2 !== void 0 ? _rawBundle$extension_2 : 'normal',
       price: priceValue,
-      price_type: (_ref6 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref6 !== void 0 ? _ref6 : '',
-      price_type_ext: (_ref7 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref7 !== void 0 ? _ref7 : '',
+      price_type: (_ref17 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref17 !== void 0 ? _ref17 : '',
+      price_type_ext: (_ref18 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref18 !== void 0 ? _ref18 : '',
       bundle_selling_price: sellingPrice,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: (_rawBundle$bundle_gro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_group_id) !== null && _rawBundle$bundle_gro !== void 0 ? _rawBundle$bundle_gro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
@@ -388,12 +549,17 @@ function formatSubmitBundleItems(bundle) {
  */
 function normalizeSubmitProduct(product) {
   var _rawMetadata$product_, _submitProduct$produc;
-  var _ref8 = product,
-    _runtimeUid = _ref8.unique_identification_number,
-    submitProduct = _objectWithoutProperties(_ref8, _excluded);
+  var _ref19 = product,
+    _runtimeUid = _ref19.unique_identification_number,
+    submitProduct = _objectWithoutProperties(_ref19, _excluded);
   var num = submitProduct.num,
     productOptionItem = submitProduct.product_option_item,
     _productSurchargeFee = submitProduct.surcharge_fee,
+    _deprecatedDiscountAmount = submitProduct.discount_amount,
+    _deprecatedDiscountType = submitProduct.discount_type,
+    _deprecatedDiscountway = submitProduct.discountway,
+    _deprecatedProductDiscountReason = submitProduct.product_discount_reason,
+    _deprecatedDiscountPer = submitProduct.discount_per,
     productRest = _objectWithoutProperties(submitProduct, _excluded2);
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
@@ -423,7 +589,7 @@ function normalizeSubmitProduct(product) {
   } : {}), {}, {
     product_quantity: toBundleNumber(num !== null && num !== void 0 ? num : submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: submitProduct.discount_list || [],
+    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
@@ -502,22 +668,23 @@ export function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: '',
-    order_number: '',
-    shop_order_number: '',
-    shop_full_order_number: '',
-    type: 'appointment_booking',
-    business_code: 'appointment_booking',
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
+    type: '',
+    business_code: undefined,
     platform: 'h5',
     sales_channel: 'my_pisel',
     order_sales_channel: 'online_store',
     status: 'normal',
     payment_status: 'payment_processing',
     shipping_status: 'unfulfilled',
-    customer_id: null,
+    customer_id: 0,
     customer_name: '',
     country_calling_code: '',
     phone: '',
     email: '',
+    customer: null,
     is_price_include_tax: 1,
     tax_title: '',
     tax_country_code: '',
@@ -537,7 +704,6 @@ export function createDefaultTempOrder(params) {
     bookings: [],
     payments: [],
     surcharges: [],
-    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -549,7 +715,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _ref10, _ref11, _ref12, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _tempOrder$customer_i, _ref21, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -561,33 +727,48 @@ export function buildSubmitPayload(params) {
     enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
-  var _ref9 = tempOrder,
-    _extend = _ref9._extend,
-    _relationId = _ref9.relation_id,
-    _tableFormId = _ref9.table_form_id,
-    _resourceId = _ref9.resource_id,
-    _summary = _ref9.summary,
-    _lastOrderInfo = _ref9.lastOrderInfo,
-    _paidAmount = _ref9.paid_amount,
-    _shopId = _ref9.shop_id,
-    _shopNote = _ref9.shop_note,
-    _shopServiceType = _ref9.shop_service_type,
-    _startTime = _ref9.start_time,
-    _customer = _ref9.customer,
-    _shopFullOrderNumber = _ref9.shop_full_order_number,
-    _rootTaxFee = _ref9.tax_fee,
-    _totalAmount = _ref9.total_amount,
-    _totalRefundAmount = _ref9.total_refund_amount,
-    _createDate = _ref9.create_date,
-    _holderId = _ref9.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref9, _excluded3);
+  var _ref20 = tempOrder,
+    _extend = _ref20._extend,
+    _relationId = _ref20.relation_id,
+    _tableFormId = _ref20.table_form_id,
+    _resourceId = _ref20.resource_id,
+    _summary = _ref20.summary,
+    _lastOrderInfo = _ref20.lastOrderInfo,
+    _paidAmount = _ref20.paid_amount,
+    _shopId = _ref20.shop_id,
+    _shopNote = _ref20.shop_note,
+    _shopServiceType = _ref20.shop_service_type,
+    _startTime = _ref20.start_time,
+    _customer = _ref20.customer,
+    _discountList = _ref20.discount_list,
+    _rootTaxFee = _ref20.tax_fee,
+    _totalAmount = _ref20.total_amount,
+    _totalRefundAmount = _ref20.total_refund_amount,
+    _createDate = _ref20.create_date,
+    _holderId = _ref20.holder_id,
+    tempOrderRest = _objectWithoutProperties(_ref20, _excluded3);
+  var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
+  if (!submitType) {
+    var _tempOrder$bookings;
+    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
+    if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
+      submitType = 'appointment_booking';
+    } else {
+      submitType = 'virtual';
+    }
+  }
   var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
+    customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
+    customer_name: tempOrder.customer_name || 'Select a customer',
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || "".concat(tempOrder.external_sale_number, "_").concat(now.getTime()),
-    type: (_ref10 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref10 !== void 0 ? _ref10 : 'table-order',
-    business_code: (_ref11 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref11 !== void 0 ? _ref11 : 'table-order',
+    type: submitType,
+    business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref12 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref12 !== void 0 ? _ref12 : 'online_store',
+    order_sales_channel: (_ref21 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref21 !== void 0 ? _ref21 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -600,25 +781,23 @@ export function buildSubmitPayload(params) {
     note: tempOrder.note || '',
     delivery_type: tempOrder.delivery_type || 'nil',
     schedule_date: scheduleDate,
-    created_at: tempOrder.created_at || formatDateTime(now),
+    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(function (booking) {
-      var _parent_id;
-      return Number((_parent_id = booking.parent_id) !== null && _parent_id !== void 0 ? _parent_id : 0) !== 0;
+      return Number(booking.parent_id) !== 0;
     }).map(function (booking) {
       return normalizeSubmitBooking(booking);
     }),
     payments: tempOrder.payments || [],
-    // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
     // summary,
     metadata: function () {
-      var _ref13 = tempOrder.metadata || {},
-        _collectPax = _ref13.collect_pax,
-        _tableOccupancyDuration = _ref13.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref13, _excluded4);
+      var _ref22 = tempOrder.metadata || {},
+        _collectPax = _ref22.collect_pax,
+        _tableOccupancyDuration = _ref22.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref22, _excluded4);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
@@ -713,4 +892,169 @@ export function formatV1Product(products) {
     };
   });
 }
-export { createEmptySummary } from "../../solution/ScanOrder/utils";
+
+/**
+ * 判断 holder_id 是否已分配（非空）。
+ *
+ * @example
+ * hasAssignedHolderId(12); // true
+ * hasAssignedHolderId([]); // false
+ */
+export function hasAssignedHolderId(value) {
+  if (value === undefined || value === null || value === '') return false;
+  if (Array.isArray(value)) return value.length > 0;
+  return true;
+}
+
+/**
+ * 清空 tempOrder 购物车行上的 holder 分配（products / bookings / runtime origin）。
+ * 移除或更换下单客户时调用，与 booking 页换客户清 holder 行为对齐。
+ *
+ * @example
+ * clearTempOrderHolderAssignments(tempOrder);
+ */
+export function clearTempOrderHolderAssignments(tempOrder) {
+  var _tempOrder$_extend;
+  var changed = false;
+  var resetHolderField = function resetHolderField(target) {
+    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'holder_id';
+    if (!hasAssignedHolderId(target[key])) return;
+    target[key] = null;
+    changed = true;
+  };
+  var _iterator4 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step4;
+  try {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var product = _step4.value;
+      if (product.metadata && _typeof(product.metadata) === 'object') {
+        resetHolderField(product.metadata);
+      }
+    }
+  } catch (err) {
+    _iterator4.e(err);
+  } finally {
+    _iterator4.f();
+  }
+  var _iterator5 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var booking = _step5.value;
+      var bookingRecord = booking;
+      if (booking.metadata && _typeof(booking.metadata) === 'object') {
+        resetHolderField(booking.metadata);
+      }
+      if (bookingRecord.holder !== undefined && bookingRecord.holder !== null) {
+        delete bookingRecord.holder;
+        changed = true;
+      }
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+  var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
+  if (productsByUid && _typeof(productsByUid) === 'object') {
+    for (var _i4 = 0, _Object$values = Object.values(productsByUid); _i4 < _Object$values.length; _i4++) {
+      var entry = _Object$values[_i4];
+      var origin = entry === null || entry === void 0 ? void 0 : entry.origin;
+      if (!origin || _typeof(origin) !== 'object') continue;
+      if (origin.metadata && _typeof(origin.metadata) === 'object') {
+        resetHolderField(origin.metadata);
+      }
+      if (origin._extend && _typeof(origin._extend) === 'object') {
+        resetHolderField(origin._extend);
+      }
+    }
+  }
+  return changed;
+}
+
+/**
+ * 读取购物车行的 stable uid（优先 metadata.unique_identification_number）。
+ *
+ * @example
+ * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
+ */
+export function getOrderProductLineUid(product) {
+  var _product$metadata$uni, _product$metadata6;
+  if (!product || _typeof(product) !== 'object') return null;
+  var uid = (_product$metadata$uni = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return null;
+  return String(uid);
+}
+
+/**
+ * 判断展示字段是否为空（含 i18n 对象全空）。
+ *
+ * @example
+ * isEmptyOrderProductDisplayValue(''); // true
+ * isEmptyOrderProductDisplayValue({ auto: '桌台费' }); // false
+ */
+export function isEmptyOrderProductDisplayValue(value) {
+  if (value === undefined || value === null) return true;
+  if (typeof value === 'string') return value.trim() === '';
+  if (_typeof(value) === 'object') {
+    var record = value;
+    return !Object.values(record).some(function (item) {
+      return typeof item === 'string' && item.trim() !== '';
+    });
+  }
+  return false;
+}
+
+/**
+ * calcDiscount / applyDiscount 回写时 Rules 往往不带 product_title 等展示字段；
+ * 用旧行补齐，避免编辑态 hydrate 后标题被冲掉。
+ *
+ * @example
+ * mergeOrderProductDisplayFields(
+ *   { product_title: { auto: '桌台费' }, metadata: { unique_identification_number: 'u1' } },
+ *   { selling_price: '10.00', metadata: { unique_identification_number: 'u1' } },
+ * );
+ */
+export function mergeOrderProductDisplayFields(previous, next) {
+  var merged = _objectSpread({}, next);
+  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'variant_title', 'product_sku'];
+  displayFields.forEach(function (field) {
+    if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
+      merged[field] = previous[field];
+    }
+  });
+  if (previous.metadata || next.metadata) {
+    merged.metadata = _objectSpread(_objectSpread({}, previous.metadata || {}), next.metadata || {});
+    ['product_title', 'product_name'].forEach(function (field) {
+      var _previous$metadata;
+      if (isEmptyOrderProductDisplayValue(merged.metadata[field]) && !isEmptyOrderProductDisplayValue((_previous$metadata = previous.metadata) === null || _previous$metadata === void 0 ? void 0 : _previous$metadata[field])) {
+        merged.metadata[field] = previous.metadata[field];
+      }
+    });
+  }
+  if (previous._extend && !merged._extend) {
+    merged._extend = previous._extend;
+  }
+  return merged;
+}
+
+/**
+ * 按 uid 索引 tempOrder.products，供 applyDiscount 合并展示字段。
+ *
+ * @example
+ * indexOrderProductsByUid([{ metadata: { unique_identification_number: 'u1' } }]);
+ */
+export function indexOrderProductsByUid(products) {
+  var map = new Map();
+  (products || []).forEach(function (product, index) {
+    var uid = getOrderProductLineUid(product);
+    if (uid) {
+      map.set(uid, product);
+      return;
+    }
+    map.set("__index__:".concat(index), product);
+  });
+  return map;
+}
+export { createEmptySummary } from "../../solution/ScanOrder/utils";
+export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems } from "./utils/manualProductDiscount";

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

@@ -47,7 +47,6 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
-    private filterQuotationsByCustomer;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private isQuotationActiveAt;