@pisell/pisellos 2.2.180 → 2.2.182

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
-import type { OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 /**
@@ -65,6 +65,37 @@ export declare function sumOptionUnitPrice(options?: Array<{
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
+/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
+export declare function resolveRulesManualDiscountFlag(metadata: Record<string, any> | null | undefined): boolean | undefined;
+/**
+ * 商品行折扣只保留后端 OrderProductDiscountItem 协议字段。
+ * Rules/券计算过程中的 `_num`、`config` 等运行态字段不应进入 tempOrder 或提交 payload。
+ */
+export declare function normalizeOrderProductDiscountList(discountList?: unknown[] | null): OrderProductDiscountItem[];
+/**
+ * 手动改价（price_override）时行级 original_price（composite 单价）：
+ * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），
+ * 而非 bundle 子项 catalog 原价合成的 composedOriginalPrice（如 30）。
+ *
+ * origin_total 与 SkuDetailModal / cacheItem._extend 一致，为单价语义，不再除以 num。
+ */
+export declare function resolveManualOverrideLineOriginalPrice(params: {
+    num?: number;
+    metadata?: Record<string, any> | null;
+    /** 已有行级 original_price（origin 被裁剪时兜底划线价） */
+    lineOriginalPrice?: string | number | null;
+}, fallbackCompositeOriginal: string): string;
+/**
+ * 计算商品行「每单位有效折扣」：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 declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
 export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -140,4 +171,55 @@ export declare function formatV1Product(products: OrderSubmitProduct[]): {
     session: null;
     unique: string;
 }[];
+/**
+ * 判断 holder_id 是否已分配（非空）。
+ *
+ * @example
+ * hasAssignedHolderId(12); // true
+ * hasAssignedHolderId([]); // false
+ */
+export declare function hasAssignedHolderId(value: unknown): boolean;
+/**
+ * 清空 tempOrder 购物车行上的 holder 分配（products / bookings / runtime origin）。
+ * 移除或更换下单客户时调用，与 booking 页换客户清 holder 行为对齐。
+ *
+ * @example
+ * clearTempOrderHolderAssignments(tempOrder);
+ */
+export declare function clearTempOrderHolderAssignments(tempOrder: OrderTempOrder): boolean;
+/**
+ * 读取购物车行的 stable uid（优先 metadata.unique_identification_number）。
+ *
+ * @example
+ * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
+ */
+export declare function getOrderProductLineUid(product: Record<string, any> | null | undefined): string | null;
+/**
+ * 判断展示字段是否为空（含 i18n 对象全空）。
+ *
+ * @example
+ * isEmptyOrderProductDisplayValue(''); // true
+ * isEmptyOrderProductDisplayValue({ auto: '桌台费' }); // false
+ */
+export declare function isEmptyOrderProductDisplayValue(value: unknown): boolean;
+/**
+ * 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 declare function mergeOrderProductDisplayFields(previous: Record<string, any>, next: Record<string, any>): Record<string, any>;
+/**
+ * 按 uid 索引 tempOrder.products，供 applyDiscount 合并展示字段。
+ *
+ * @example
+ * indexOrderProductsByUid([{ metadata: { unique_identification_number: 'u1' } }]);
+ */
+export declare function indexOrderProductsByUid(products: Array<Record<string, any>> | null | undefined): Map<string, Record<string, any>>;
 export { createEmptySummary } from '../../solution/ScanOrder/utils';
+export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems, } from './utils/manualProductDiscount';
+export type { ManualProductDiscountItem } from './utils/manualProductDiscount';

package/lib/modules/Order/utils.js

@@ -29,32 +29,54 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Order/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  buildManualProductDiscountItem: () => import_manualProductDiscount.buildManualProductDiscountItem,
   buildSubmitPayload: () => buildSubmitPayload,
+  clearTempOrderHolderAssignments: () => clearTempOrderHolderAssignments,
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
+  ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
+  findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
+  getOrderProductLineUid: () => getOrderProductLineUid,
+  hasAssignedHolderId: () => hasAssignedHolderId,
+  indexOrderProductsByUid: () => indexOrderProductsByUid,
+  isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
+  mergeManualProductDiscountIntoList: () => import_manualProductDiscount.mergeManualProductDiscountIntoList,
+  mergeOrderProductDisplayFields: () => mergeOrderProductDisplayFields,
   mergeRelationForms: () => mergeRelationForms,
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
+  normalizeOrderProductDiscountList: () => normalizeOrderProductDiscountList,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  resolveEffectivePerUnitDiscount: () => resolveEffectivePerUnitDiscount,
+  resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal: () => import_manualProductDiscount.resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources: () => import_manualProductDiscount.resolveManualDiscountReasonFromSources,
+  resolveManualOverrideLineOriginalPrice: () => resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag: () => resolveRulesManualDiscountFlag,
+  resolveSafeProductNum: () => import_manualProductDiscount.resolveSafeProductNum,
   resolveSubmitCollectPax: () => resolveSubmitCollectPax,
-  sumOptionUnitPrice: () => sumOptionUnitPrice
+  shouldBuildManualProductDiscount: () => import_manualProductDiscount.shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems: () => import_manualProductDiscount.stripManualProductDiscountItems,
+  sumOptionUnitPrice: () => sumOptionUnitPrice,
+  syncManualProductDiscountProductNum: () => import_manualProductDiscount.syncManualProductDiscountProductNum
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../solution/ScanOrder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
   let total = new import_decimal.default(Number(mainPrice) || 0);
@@ -80,11 +102,146 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata)
+    return void 0;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  const priceOverride = metadata.price_override;
+  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "") {
+    return true;
+  }
+  return void 0;
+}
+function normalizeOrderProductDiscountAmount(amount) {
+  if (amount === void 0 || amount === null)
+    return void 0;
+  return String(amount);
+}
+function normalizeOrderProductDiscountList(discountList) {
+  if (!Array.isArray(discountList))
+    return [];
+  return discountList.filter((item) => !!item && typeof item === "object").map((item) => {
+    const 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 !== void 0) {
+      const orderDiscountId = Number(item.order_discount_id);
+      if (Number.isFinite(orderDiscountId)) {
+        normalized.order_discount_id = orderDiscountId;
+      }
+    }
+    if (item.type !== void 0)
+      normalized.type = item.type;
+    const amount = normalizeOrderProductDiscountAmount(item.amount);
+    if (amount !== void 0)
+      normalized.amount = amount;
+    if (item.discount && typeof item.discount === "object") {
+      normalized.discount = { ...item.discount };
+    }
+    if (item.metadata === null) {
+      normalized.metadata = null;
+    } else if (item.metadata && typeof item.metadata === "object") {
+      normalized.metadata = { ...item.metadata };
+    }
+    return normalized;
+  });
+}
+function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  var _a, _b;
+  const metadata = params.metadata || {};
+  const priceOverride = metadata.price_override;
+  if (priceOverride === void 0 || priceOverride === null || priceOverride === "") {
+    return fallbackCompositeOriginal;
+  }
+  const refTotal = (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.origin_total;
+  if (refTotal !== void 0 && refTotal !== null && refTotal !== "") {
+    const parsed = Number(refTotal);
+    if (Number.isFinite(parsed)) {
+      return new import_decimal.default(parsed).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  const lineOriginal = params.lineOriginalPrice;
+  if (lineOriginal !== void 0 && lineOriginal !== null && lineOriginal !== "") {
+    const parsedLine = Number(lineOriginal);
+    const parsedFallback = Number(fallbackCompositeOriginal);
+    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
+      return new import_decimal.default(parsedLine).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  return fallbackCompositeOriginal;
+}
+function resolveEffectivePerUnitDiscount(product) {
+  const discountList = Array.isArray(product == null ? void 0 : product.discount_list) ? product.discount_list : [];
+  const fromList = discountList.reduce(
+    (sum, discount) => sum + Number((discount == null ? void 0 : discount.amount) || 0),
+    0
+  );
+  const hasPromoDiscountItem = discountList.some((item) => (item == null ? void 0 : item.type) === "promotion");
+  if (hasPromoDiscountItem)
+    return fromList;
+  const metadata = (product == null ? void 0 : product.metadata) || {};
+  const optionSum = sumOptionUnitPrice(product == null ? void 0 : product.product_option_item).toNumber();
+  if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
+    const source = Number(metadata.source_product_price);
+    const selling = Number(metadata.main_product_selling_price) - optionSum;
+    if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
+      return fromList + (source - selling);
+    }
+  }
+  const promo = metadata._promotion;
+  if ((promo == null ? void 0 : promo.inPromotion) !== true)
+    return fromList;
+  const originalPrice = Number(promo.originalPrice);
+  const finalPrice = Number(promo.finalPrice);
+  if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice))
+    return fromList;
+  return fromList + (originalPrice - finalPrice);
+}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new import_decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+  const getBundleIdentity = (bundle) => {
+    return [
+      bundle.bundle_id ?? bundle.id ?? "",
+      bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? "",
+      bundle.bundle_variant_id ?? bundle.variant_id ?? bundle.product_variant_id ?? 0,
+      bundle.bundle_group_id ?? bundle.group_id ?? ""
+    ].join("|");
+  };
+  const mergeRulesBundlePrices = (currentBundle, rulesBundle) => {
+    if (!Array.isArray(rulesBundle))
+      return rulesBundle;
+    const currentByIdentity = /* @__PURE__ */ new Map();
+    (currentBundle || []).forEach((bundle) => {
+      if (!bundle || typeof bundle !== "object")
+        return;
+      currentByIdentity.set(getBundleIdentity(bundle), bundle);
+    });
+    return rulesBundle.map((bundle) => {
+      if (!bundle || typeof bundle !== "object")
+        return bundle;
+      const current = currentByIdentity.get(getBundleIdentity(bundle));
+      if (!current)
+        return bundle;
+      const isProductPriceBundle = (bundle.price_type_ext ?? current.price_type_ext) === "product_price";
+      if (!isProductPriceBundle)
+        return bundle;
+      const sourcePrice = current.price ?? current.custom_price ?? current.original_price ?? current.bundle_selling_price;
+      const originalPrice = current.original_price ?? current.product_price ?? current.price ?? current.custom_price ?? sourcePrice;
+      return {
+        ...bundle,
+        ...sourcePrice !== void 0 ? { price: sourcePrice } : {},
+        ...originalPrice !== void 0 ? { original_price: originalPrice } : {},
+        ...current.original_total !== void 0 ? { original_total: current.original_total } : {}
+      };
+    });
+  };
   return {
     getProduct: (product) => {
       var _a, _b, _c, _d, _e, _f;
@@ -114,7 +271,7 @@ function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
-        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证唯一值存在；
+        // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
         _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
           product.product_option_item,
@@ -135,9 +292,14 @@ function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_b = product.metadata) == null ? void 0 : _b.booking_id) || null,
         isClient: false,
-        isManualDiscount: ((_c = product.metadata) == null ? void 0 : _c.is_manual_discount) || false,
-        holder_id: (_d = product.metadata) == null ? void 0 : _d.holder_id,
-        startDate: ((_e = product.metadata) == null ? void 0 : _e.start_date) || ((_f = product.metadata) == null ? void 0 : _f.startDate)
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
+        holder_id: (_c = product.metadata) == null ? void 0 : _c.holder_id,
+        startDate: ((_d = product.metadata) == null ? void 0 : _d.start_date) || ((_e = product.metadata) == null ? void 0 : _e.startDate),
+        main_product_selling_price: metadataAny.main_product_selling_price !== void 0 ? new import_decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : void 0,
+        inPromotion: ((_f = metadataAny._promotion) == null ? void 0 : _f.inPromotion) === true,
+        _promotion: metadataAny._promotion
       };
     },
     setProduct: (product, values) => {
@@ -150,7 +312,7 @@ function createDefaultOrderRulesHooks() {
       const nextSourceOriginalPrice = values.original_price !== void 0 ? String(values.original_price) : String(existedSource);
       const nextMainSellingPrice = new import_decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       const nextMainOriginalPrice = new import_decimal.default(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
-      const nextBundle = values.bundle ?? product.product_bundle;
+      const nextBundle = values.bundle !== void 0 ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       const composedSellingPrice = composeLinePrice({
         mainPrice: nextMainSellingPrice,
         bundle: nextBundle
@@ -160,10 +322,14 @@ function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      const finalOriginalPrice = resolveManualOverrideLineOriginalPrice(
+        { num: nextNum, metadata: metadataAny, lineOriginalPrice: product.original_price },
+        composedOriginalPrice
+      );
       return {
         ...product,
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
@@ -321,6 +487,11 @@ function normalizeSubmitProduct(product) {
     num,
     product_option_item: productOptionItem,
     surcharge_fee: _productSurchargeFee,
+    discount_amount: _deprecatedDiscountAmount,
+    discount_type: _deprecatedDiscountType,
+    discountway: _deprecatedDiscountway,
+    product_discount_reason: _deprecatedProductDiscountReason,
+    discount_per: _deprecatedDiscountPer,
     ...productRest
   } = submitProduct;
   const rawMetadata = submitProduct.metadata || {};
@@ -365,7 +536,7 @@ function normalizeSubmitProduct(product) {
     ...bookingUid ? { booking_uid: bookingUid } : {},
     product_quantity: toBundleNumber(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 直接派生。
@@ -425,22 +596,23 @@ 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: void 0,
     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: "",
@@ -460,7 +632,6 @@ function createDefaultTempOrder(params) {
     bookings: [],
     payments: [],
     surcharges: [],
-    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -472,6 +643,7 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
+  var _a;
   const {
     tempOrder,
     cacheId,
@@ -497,7 +669,7 @@ function buildSubmitPayload(params) {
     shop_service_type: _shopServiceType,
     start_time: _startTime,
     customer: _customer,
-    shop_full_order_number: _shopFullOrderNumber,
+    discount_list: _discountList,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
@@ -505,12 +677,25 @@ function buildSubmitPayload(params) {
     holder_id: _holderId,
     ...tempOrderRest
   } = tempOrder;
+  let submitType = type ?? tempOrder.type;
+  if (!submitType) {
+    if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
+      submitType = "appointment_booking";
+    } else {
+      submitType = "virtual";
+    }
+  }
   const payload = {
     ...tempOrderRest,
+    customer_id: tempOrder.customer_id ?? 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 || `${tempOrder.external_sale_number}_${now.getTime()}`,
-    type: type ?? tempOrder.type ?? "table-order",
-    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
+    type: submitType,
+    business_code: businessCode ?? tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || "my_pisel",
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
@@ -525,12 +710,11 @@ 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(
-      (booking) => Number(booking.parent_id ?? 0) !== 0
+      (booking) => Number(booking.parent_id) !== 0
     ).map((booking) => 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,
@@ -611,26 +795,160 @@ function formatV1Product(products) {
     };
   });
 }
+function hasAssignedHolderId(value) {
+  if (value === void 0 || value === null || value === "")
+    return false;
+  if (Array.isArray(value))
+    return value.length > 0;
+  return true;
+}
+function clearTempOrderHolderAssignments(tempOrder) {
+  var _a;
+  let changed = false;
+  const resetHolderField = (target, key = "holder_id") => {
+    if (!hasAssignedHolderId(target[key]))
+      return;
+    target[key] = null;
+    changed = true;
+  };
+  for (const product of tempOrder.products || []) {
+    if (product.metadata && typeof product.metadata === "object") {
+      resetHolderField(product.metadata);
+    }
+  }
+  for (const booking of tempOrder.bookings || []) {
+    const bookingRecord = booking;
+    if (booking.metadata && typeof booking.metadata === "object") {
+      resetHolderField(booking.metadata);
+    }
+    if (bookingRecord.holder !== void 0 && bookingRecord.holder !== null) {
+      delete bookingRecord.holder;
+      changed = true;
+    }
+  }
+  const productsByUid = (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid;
+  if (productsByUid && typeof productsByUid === "object") {
+    for (const entry of Object.values(productsByUid)) {
+      const origin = entry == null ? 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;
+}
+function getOrderProductLineUid(product) {
+  var _a;
+  if (!product || typeof product !== "object")
+    return null;
+  const uid = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ?? product.unique_identification_number;
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
+}
+function isEmptyOrderProductDisplayValue(value) {
+  if (value === void 0 || value === null)
+    return true;
+  if (typeof value === "string")
+    return value.trim() === "";
+  if (typeof value === "object") {
+    const record = value;
+    return !Object.values(record).some(
+      (item) => typeof item === "string" && item.trim() !== ""
+    );
+  }
+  return false;
+}
+function mergeOrderProductDisplayFields(previous, next) {
+  const merged = { ...next };
+  const displayFields = [
+    "product_title",
+    "product_name",
+    "product_cover",
+    "cover",
+    "variant_title",
+    "product_sku"
+  ];
+  displayFields.forEach((field) => {
+    if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
+      merged[field] = previous[field];
+    }
+  });
+  if (previous.metadata || next.metadata) {
+    merged.metadata = {
+      ...previous.metadata || {},
+      ...next.metadata || {}
+    };
+    ["product_title", "product_name"].forEach((field) => {
+      var _a;
+      if (isEmptyOrderProductDisplayValue(merged.metadata[field]) && !isEmptyOrderProductDisplayValue((_a = previous.metadata) == null ? void 0 : _a[field])) {
+        merged.metadata[field] = previous.metadata[field];
+      }
+    });
+  }
+  if (previous._extend && !merged._extend) {
+    merged._extend = previous._extend;
+  }
+  return merged;
+}
+function indexOrderProductsByUid(products) {
+  const map = /* @__PURE__ */ new Map();
+  (products || []).forEach((product, index) => {
+    const uid = getOrderProductLineUid(product);
+    if (uid) {
+      map.set(uid, product);
+      return;
+    }
+    map.set(`__index__:${index}`, product);
+  });
+  return map;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  buildManualProductDiscountItem,
   buildSubmitPayload,
+  clearTempOrderHolderAssignments,
   composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  ensureManualProductDiscountList,
+  findManualProductDiscountItem,
   formatDateTime,
   formatV1Product,
   generateDuration,
   getAllDiscountList,
+  getOrderProductLineUid,
+  hasAssignedHolderId,
+  indexOrderProductsByUid,
+  isEmptyOrderProductDisplayValue,
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,
+  mergeManualProductDiscountIntoList,
+  mergeOrderProductDisplayFields,
   mergeRelationForms,
   normalizeBookingIsAll,
   normalizeBookingSubType,
+  normalizeOrderProductDiscountList,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  resolveEffectivePerUnitDiscount,
+  resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources,
+  resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag,
+  resolveSafeProductNum,
   resolveSubmitCollectPax,
-  sumOptionUnitPrice
+  shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems,
+  sumOptionUnitPrice,
+  syncManualProductDiscountProductNum
 });

package/lib/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/lib/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;