@pisell/pisellos 2.2.174 → 2.2.175

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

@@ -2,12 +2,9 @@ import { CartItem } from '../Cart/types';
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
-import type { UnavailableReason } from '../Rules/types';
 import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
-import type { OrderProductDiscountItem } from '../../server/modules/order/types';
-export type { OrderProductDiscountItem } from '../../server/modules/order/types';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -51,13 +48,6 @@ export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
 }
-export interface OrderScanCodeResult {
-    isAvailable: boolean;
-    discountList: Discount[];
-    scannedDiscountList: Discount[];
-    type: 'server' | 'clientCalc';
-    unavailableReason?: UnavailableReason;
-}
 export interface OrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
@@ -76,7 +66,7 @@ export interface OrderProduct extends OrderProductIdentity {
     original_price: string;
     tax_fee: string;
     is_charge_tax: number;
-    discount_list: OrderProductDiscountItem[];
+    discount_list: any[];
     product_bundle: any[];
     booking_uid?: string;
     metadata: Record<string, any>;
@@ -113,11 +103,11 @@ export interface OrderSummary {
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
-    order_number: string | null;
-    shop_order_number: string | null;
-    shop_full_order_number: string | null;
+    order_number: string;
+    shop_order_number: string;
+    shop_full_order_number: string;
     type: string;
-    business_code?: string;
+    business_code: string;
     platform: string;
     sales_channel: string;
     order_sales_channel: string;
@@ -151,7 +141,7 @@ export interface OrderTempOrder {
     bookings: any[];
     payments: any[];
     surcharges: any[];
-    discount_list?: any[];
+    discount_list: any[];
     relation_forms: any[];
     contacts: any[];
     contacts_info: Record<string, any> | null;
@@ -167,7 +157,7 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: Record<string, any>;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'shop_full_order_number'> {
     platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -186,32 +176,16 @@ export interface OrderState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
-export interface ReplaceTempOrderOptions {
-    recalculateSummary?: boolean;
-    persist?: boolean;
-    saveDraft?: boolean;
-}
-export type AddProductBookingInput = Record<string, any>;
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
-export interface UpdateOrderProductParams {
+export interface UpdateProductInOrderParams {
     product_id: number | null;
     product_variant_id: number;
     updates: Partial<OrderProduct>;
     unique_identification_number?: string;
-    identity_key?: string;
     product_option_item?: any[];
     product_bundle?: any[];
-    booking?: AddProductBookingInput;
-}
-/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
-export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
-    num: number;
-    identity_key?: string;
-}
-export interface UpdateOrderBookingParams {
-    unique_identification_number: string;
-    updates: AddProductBookingInput;
 }
+export type AddProductBookingInput = Record<string, any>;
 export interface OrderProductMergeDecisionContext {
     incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
     normalizedIncoming: OrderProduct;
@@ -262,11 +236,10 @@ export interface SubmitSalesOrderParams {
     query: {
         order_id: number | null;
         external_sale_number: string;
-        order_number: string | null;
-        shop_order_number: string | null;
-        shop_full_order_number: string | null;
+        order_number: string;
+        shop_order_number: string;
         type: string;
-        business_code?: string;
+        business_code: string;
         platform: string;
         request_unique_idempotency_token?: string;
         sales_channel: string;
@@ -298,6 +271,7 @@ export interface SubmitSalesOrderParams {
         bookings: OrderSubmitBooking[];
         payments: any[];
         surcharges?: any[];
+        discount_list: any[];
         relation_forms: any[];
         form_record_ids?: OrderSubmitFormRecord[];
         contacts: any[];
@@ -376,7 +350,6 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
-    channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -473,7 +446,6 @@ export interface OrderModuleAPI {
     }) => void;
     getTempOrder: () => OrderTempOrder | null;
     ensureTempOrder: () => OrderTempOrder;
-    replaceTempOrder: (tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions) => Promise<OrderTempOrder>;
     addNewOrder: () => Promise<OrderTempOrder>;
     restoreOrder: () => OrderTempOrder;
     getOrderProducts: () => OrderProduct[];
@@ -486,26 +458,15 @@ export interface OrderModuleAPI {
     getOrderSyncState: () => OrderSyncState;
     getOrderAmountSnapshot: () => OrderAmountSnapshot | null;
     getTempOrderNote: () => string;
-    updateTempOrderNote: {
-        (note: string): string;
-        (note: string, sync: true): Promise<string>;
-        (note: string, sync: boolean): string | Promise<string>;
-    };
+    updateTempOrderNote: (note: string) => string;
     updateTempOrderShopDiscount: (amount: string | number) => string;
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
-    updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
-    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
-    updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
+    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<OrderProduct[]>;
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
-    /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
-    /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
-    setEnableTempOrderPersist: (enabled: boolean) => void;
-    /** @deprecated 固定返回 false；OrderModule 不再负责 tempOrder localStorage 持久化。 */
-    isTempOrderPersistEnabled: () => boolean;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;
@@ -555,10 +516,8 @@ export interface OrderModuleAPI {
     clearOrderCustomer: () => void;
     loadDiscountConfig: (params: {
         customerId: number;
-        action?: 'create' | 'edit';
-        orderId?: number;
-        apply?: boolean;
-    }) => Promise<Discount[]>;
+        action?: 'create';
+    }) => Promise<void>;
     getDiscountList: () => Discount[];
     applyDiscount: () => void;
     /**

package/dist/modules/Order/types.js

@@ -29,8 +29,6 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
 
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 
-/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
-
 /**
  * 订单信息
  */

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
-import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 /**
@@ -65,26 +65,6 @@ 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;
 export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -160,22 +140,4 @@ 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;
 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/dist/modules/Order/utils.js

@@ -1,9 +1,10 @@
 var _excluded = ["unique_identification_number"],
-  _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"],
+  _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"],
   _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); }
@@ -13,7 +14,6 @@ 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,90 +113,6 @@ 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;
-}
 export function createDefaultOrderRulesHooks() {
   var toUnitPriceString = function toUnitPriceString(totalLike, num) {
     var effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -204,7 +120,7 @@ export function createDefaultOrderRulesHooks() {
   };
   return {
     getProduct: function getProduct(product) {
-      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5;
+      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
       var optionSum = sumOptionUnitPrice(product.product_option_item);
@@ -229,7 +145,7 @@ export function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
-        // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
+        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证唯一值存在；
         // 留 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，
@@ -245,11 +161,9 @@ 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,
-        // 勿写死 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)
+        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)
       };
     },
     setProduct: function setProduct(product, values) {
@@ -282,14 +196,9 @@ 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: finalOriginalPrice,
+        original_price: composedOriginalPrice,
         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,
@@ -485,11 +394,6 @@ function normalizeSubmitProduct(product) {
   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;
@@ -519,7 +423,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: submitProduct.discount_list || [],
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
@@ -598,23 +502,22 @@ export function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: '',
-    order_number: null,
-    shop_order_number: null,
-    shop_full_order_number: null,
-    type: '',
-    business_code: undefined,
+    order_number: '',
+    shop_order_number: '',
+    shop_full_order_number: '',
+    type: 'appointment_booking',
+    business_code: 'appointment_booking',
     platform: 'h5',
     sales_channel: 'my_pisel',
     order_sales_channel: 'online_store',
     status: 'normal',
     payment_status: 'payment_processing',
     shipping_status: 'unfulfilled',
-    customer_id: 0,
+    customer_id: null,
     customer_name: '',
     country_calling_code: '',
     phone: '',
     email: '',
-    customer: null,
     is_price_include_tax: 1,
     tax_title: '',
     tax_country_code: '',
@@ -633,6 +536,7 @@ export function createDefaultTempOrder(params) {
     bookings: [],
     payments: [],
     surcharges: [],
+    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -644,7 +548,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _ref10, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _ref10, _ref11, _ref12, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -669,35 +573,20 @@ export function buildSubmitPayload(params) {
     _shopServiceType = _ref9.shop_service_type,
     _startTime = _ref9.start_time,
     _customer = _ref9.customer,
-    _discountList = _ref9.discount_list,
+    _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 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: submitType,
-    business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
+    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',
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref10 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref10 !== void 0 ? _ref10 : 'online_store',
+    order_sales_channel: (_ref12 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref12 !== void 0 ? _ref12 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -710,23 +599,25 @@ 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) {
-      return Number(booking.parent_id) !== 0;
+      var _parent_id;
+      return Number((_parent_id = booking.parent_id) !== null && _parent_id !== void 0 ? _parent_id : 0) !== 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 _ref11 = tempOrder.metadata || {},
-        _collectPax = _ref11.collect_pax,
-        _tableOccupancyDuration = _ref11.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref11, _excluded4);
+      var _ref13 = tempOrder.metadata || {},
+        _collectPax = _ref13.collect_pax,
+        _tableOccupancyDuration = _ref13.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref13, _excluded4);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
@@ -821,84 +712,4 @@ export function formatV1Product(products) {
     };
   });
 }
-
-/**
- * 判断 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;
-}
-export { createEmptySummary } from "../../solution/ScanOrder/utils";
-export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems } from "./utils/manualProductDiscount";
+export { createEmptySummary } from "../../solution/ScanOrder/utils";

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

@@ -47,6 +47,7 @@ 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;