@pisell/pisellos 2.2.243 → 2.2.244

package/lib/solution/BaseSales/types.d.ts

@@ -1,4 +1,4 @@
-import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
+import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 /**
@@ -11,8 +11,6 @@ export declare const BaseSalesHookNames: {
     readonly onRetryInit: "onRetryInit";
     readonly onRefresh: "onRefresh";
     readonly onCartValidationChanged: "onCartValidationChanged";
-    readonly onPaymentSyncStart: "onPaymentSyncStart";
-    readonly onPaymentSyncEnd: "onPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
@@ -41,20 +39,13 @@ export interface BaseSalesOrderProductIdentity {
     identity_key?: string;
     unique_identification_number?: string;
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
-    product_sku?: BaseSalesProductSku;
+    product_option_item?: any[];
     product_bundle?: any[];
 }
-export interface BaseSalesProductSku {
-    option: any[];
-    [key: string]: any;
-}
-export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrderProductIdentity {
-    num: number;
-}
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
-    product_sku: BaseSalesProductSku;
+    product_option_item: any[];
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
      *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
@@ -100,8 +91,9 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `BaseSalesOrderProduct` 的字段差异：
- * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
- *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
+ *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
  * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
@@ -126,7 +118,6 @@ export interface BaseSalesSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
-    surcharges?: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {
@@ -212,66 +203,6 @@ export interface BaseSalesSubmitPayload extends Omit<BaseSalesTempOrder, 'platfo
     }>;
     products: BaseSalesSubmitProduct[];
 }
-export interface BaseSalesQuotationDurationConfig {
-    type: string;
-    value: number;
-    flexible_config?: {
-        is_enable_minimum_duration?: 0 | 1;
-        warning_threshold?: number;
-        block_threshold?: number;
-    };
-}
-export interface BaseSalesCalculateProductBookingPriceParams {
-    product: Record<string, any>;
-    booking?: {
-        start_date?: string;
-        start_time?: string;
-        end_date?: string;
-        end_time?: string;
-        [key: string]: any;
-    };
-    duration?: BaseSalesQuotationDurationConfig;
-    customer_id?: number | string;
-    fallback_price?: number | string;
-    datetime?: string;
-    channel?: string;
-}
-export type BaseSalesProductBookingPriceSegmentSource = 'quotation' | 'fallback';
-export interface BaseSalesProductBookingPriceSegment {
-    start_datetime: string;
-    end_datetime?: string;
-    time_point: string;
-    unit_price: string;
-    quantity: number;
-    total_price: string;
-    quotation_shelf_id: number;
-    source: BaseSalesProductBookingPriceSegmentSource;
-}
-export interface BaseSalesBundleProductBookingPriceResult {
-    bundle_id?: number;
-    group_id?: number;
-    bundle_group_id?: number;
-    bundle_product_id: number | null;
-    bundle_variant_id: number;
-    unit_price: string;
-    total_price: string;
-    quantity: number;
-    quotation_shelf_id: number;
-    source: BaseSalesProductBookingPriceSegmentSource;
-    segments: BaseSalesProductBookingPriceSegment[];
-}
-export interface BaseSalesProductBookingPriceResult {
-    product_id: number | null;
-    product_variant_id: number;
-    customer_id?: number | string;
-    unit_price: string;
-    total_price: string;
-    quantity: number;
-    duration?: BaseSalesQuotationDurationConfig;
-    quotation_shelf_id: number;
-    segments: BaseSalesProductBookingPriceSegment[];
-    product_bundle?: BaseSalesBundleProductBookingPriceResult[];
-}
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {
     policy?: string | null;
@@ -350,7 +281,6 @@ export interface BaseSalesState {
     error: string | null;
     products?: ProductList;
     order?: OrderModule;
-    quotation?: QuotationModule;
     salesSummary?: SalesSummaryModule;
     baseSalesLogger?: BaseSalesLoggerModule;
     schedule?: ScheduleModule;

package/lib/solution/BaseSales/types.js

@@ -28,9 +28,7 @@ var BaseSalesHookNames = {
   onDestroy: "onDestroy",
   onRetryInit: "onRetryInit",
   onRefresh: "onRefresh",
-  onCartValidationChanged: "onCartValidationChanged",
-  onPaymentSyncStart: "onPaymentSyncStart",
-  onPaymentSyncEnd: "onPaymentSyncEnd"
+  onCartValidationChanged: "onCartValidationChanged"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -23,7 +23,6 @@ export interface BaseProductDetailPayload {
     option?: BaseProductDetailOptionItem[];
     options?: BaseProductDetailOptionItem[];
     product_option_item?: BaseProductDetailOptionItem[];
-    product_sku?: Record<string, any>;
     bundle?: BaseProductDetailBundleItem[];
     product_bundle?: BaseProductDetailBundleItem[];
     unique?: string;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -22,8 +22,6 @@ __export(transformBaseProductToOrderProduct_exports, {
   transformBaseProductToOrderProduct: () => transformBaseProductToOrderProduct
 });
 module.exports = __toCommonJS(transformBaseProductToOrderProduct_exports);
-var import_utils = require("../../../modules/Order/utils");
-var import_manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
   if (!Number.isFinite(parsedValue))
@@ -54,49 +52,23 @@ function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
   return optionItems.map((optionItem) => {
-    const optionGroupItemId = toNumber((optionItem == null ? void 0 : optionItem.option_group_item_id) ?? (optionItem == null ? void 0 : optionItem.id));
+    const optionGroupItemId = toNumber(optionItem == null ? void 0 : optionItem.option_group_item_id);
     const price = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
     return {
-      ...optionItem,
       option_group_item_id: optionGroupItemId,
       option_group_id: toNumber(optionItem == null ? void 0 : optionItem.option_group_id),
       num: toSafePositiveInt((optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity), 1),
-      add_price: toNumber(price, 0),
-      price: void 0
+      price: toNumber(price, 0)
     };
   });
 }
-function normalizeBundleItems(bundleItems, preferPriceField = false) {
+function normalizeBundleItems(bundleItems) {
   if (!Array.isArray(bundleItems))
     return [];
-  return bundleItems.map((bundleItem) => {
-    const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? "0" : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? "0";
-    const unitStr = toPriceString(unitSelling, "0.00");
-    const num = toSafePositiveInt((bundleItem == null ? void 0 : bundleItem.num) ?? (bundleItem == null ? void 0 : bundleItem.quantity), 1);
-    const magnitudeSource = {
-      ...bundleItem,
-      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option),
-      bundle_selling_price: unitStr,
-      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
-      price: bundleItem.price ?? bundleItem.custom_price
-    };
-    const normalizedItem = {
-      ...bundleItem,
-      num,
-      quantity: (bundleItem == null ? void 0 : bundleItem.quantity) ?? num,
-      // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
-      price: bundleItem.price ?? unitStr,
-      bundle_selling_price: unitStr,
-      original_price: bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? unitStr,
-      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
-    };
-    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
-    if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
-      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
-      normalizedItem.price = normalizedItem.bundle_selling_price;
-    }
-    return normalizedItem;
-  });
+  return bundleItems.map((bundleItem) => ({
+    ...bundleItem,
+    option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
+  }));
 }
 function findVariantById(origin, variantId) {
   if (!origin || !variantId || variantId <= 0)
@@ -105,7 +77,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -129,61 +101,13 @@ function transformBaseProductToOrderProduct(params) {
     payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
     "0.00"
   );
-  const lineCompositeTotal = toPriceString(
-    payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total),
-    sourceProductPrice
-  );
-  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
-  const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
-    normalizeOptionItems(
-      ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item
-    )
+  const productOptionItem = normalizeOptionItems(
+    payload.option ?? payload.options ?? payload.product_option_item
   );
   const productBundle = normalizeBundleItems(
-    payload.bundle ?? payload.product_bundle,
-    hasPriceOverride
-  );
-  const uniqueIdentificationNumber = payload.unique_identification_number;
-  const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
-    originTotal: payload.origin_total,
-    extendOriginTotal: (_e = payload._extend) == null ? void 0 : _e.origin_total,
-    originExtendOriginTotal: (_f = origin == null ? void 0 : origin._extend) == null ? void 0 : _f.origin_total,
-    sourceExtendOriginTotal: (_g = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _g.origin_total,
-    catalogUnitPrice: (origin == null ? void 0 : origin.base_price) ?? (origin == null ? void 0 : origin.price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price),
-    quantity: resolvedQuantity
-  });
-  const sellingTotal = Number(
-    payload.line_total ?? payload.total ?? ((_h = payload._extend) == null ? void 0 : _h.total) ?? lineCompositeTotal
-  );
-  const discountReason = (0, import_manualProductDiscount.resolveManualDiscountReasonFromSources)({
-    discountReason: payload.discount_reason,
-    extendDiscountReason: (_i = payload._extend) == null ? void 0 : _i.discount_reason,
-    originExtendDiscountReason: (_j = origin == null ? void 0 : origin._extend) == null ? void 0 : _j.discount_reason
-  });
-  const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
-  const manualDiscountList = (0, import_manualProductDiscount.shouldBuildManualProductDiscount)({
-    hasPriceOverride,
-    originTotal,
-    sellingTotal
-  }) ? (0, import_manualProductDiscount.mergeManualProductDiscountIntoList)(
-    payload.discount_list,
-    (0, import_manualProductDiscount.buildManualProductDiscountItem)({
-      originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
-      sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
-      quantity: resolvedQuantity,
-      message: discountReason,
-      discountway: (_k = payload._extend) == null ? void 0 : _k.discountway,
-      discount_per: (_l = payload._extend) == null ? void 0 : _l.discount_per
-    })
-  ) : payload.discount_list || [];
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
-  const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
-  const bundleOnlyComposite = (0, import_utils.composeLinePrice)({ mainPrice: 0, bundle: productBundle });
-  const derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
-  const mainProductSellingPrice = toPriceString(
-    Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
+    payload.bundle ?? payload.product_bundle
   );
+  const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -194,15 +118,8 @@ function transformBaseProductToOrderProduct(params) {
     duration: payload.duration,
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
-    source_product_price: sourceProductPrice,
-    main_product_selling_price: mainProductSellingPrice,
-    main_product_original_price: mainProductOriginalPrice,
-    price_schema_version: 2,
-    ...hasPriceOverride ? {
-      price_override: String(payload.price_override),
-      is_manual_discount: 1
-    } : {},
-    ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {}
+    origin,
+    source_product_price: sourceProductPrice
   };
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
@@ -211,16 +128,11 @@ function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : void 0,
-    num: resolvedQuantity,
-    product_sku: {
-      ...payload.product_sku && typeof payload.product_sku === "object" ? payload.product_sku : {},
-      option: productOptionItem
-    },
+    num: toSafePositiveInt(payload.quantity ?? payload.num, 1),
+    product_option_item: productOptionItem,
     product_bundle: productBundle,
-    discount_list: manualDiscountList,
-    // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
-    selling_price: lineCompositeTotal,
-    original_price: lineOriginalPrice,
+    selling_price: sourceProductPrice,
+    original_price: sourceProductPrice,
     tax_fee: toPriceString(
       payload.tax_fee ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (origin == null ? void 0 : origin.tax_fee) ?? (sourceProduct == null ? void 0 : sourceProduct.tax_fee),
       "0.00"

package/lib/solution/BaseSales/utils.d.ts

@@ -12,7 +12,7 @@ export declare function buildProductLineFingerprint(productOptionItem?: unknown,
 export declare function getSafeProductNum(num?: number): number;
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
  */
 export declare function isSkuOnlyDeleteIdentity(x: BaseSalesOrderProductIdentity): boolean;
 /**

package/lib/solution/BaseSales/utils.js

@@ -38,7 +38,6 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
-var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -65,7 +64,7 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
     option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
     option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
     num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    price: String((item == null ? void 0 : item.price) ?? "")
   })).sort((p, q) => {
     if (p.option_group_item_id !== q.option_group_item_id) {
       return p.option_group_item_id - q.option_group_item_id;
@@ -100,58 +99,26 @@ function getSafeProductNum(num) {
 function isSkuOnlyDeleteIdentity(x) {
   if (x.identity_key)
     return false;
-  return !("product_sku" in x) && !("product_bundle" in x);
+  return !("product_option_item" in x) && !("product_bundle" in x);
 }
 function normalizeOrderProduct(product) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c;
   const metadata = { ...product.metadata || {} };
   const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
-  const priceOverride = metadata.price_override;
-  const originOtherBundle = (_d = (_c = (_b = metadata.origin) == null ? void 0 : _b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle;
-  let bundleInput = product.product_bundle || [];
-  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "" && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
-    const priceById = /* @__PURE__ */ new Map();
-    originOtherBundle.forEach((item) => {
-      if ((item == null ? void 0 : item.id) == null)
-        return;
-      const unit = item.price ?? item.bundle_selling_price;
-      if (unit === void 0 || unit === null)
-        return;
-      priceById.set(String(item.id), String(unit));
-    });
-    const base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
-    bundleInput = base.map((item) => {
-      const unit = priceById.get(String(item == null ? void 0 : item.id));
-      if (unit === void 0)
-        return item;
-      return {
-        ...item,
-        price: unit,
-        bundle_selling_price: unit
-      };
-    });
-  }
-  const normalizedBundle = bundleInput.map((item) => ({
+  const normalizedBundle = (product.product_bundle || []).map((item) => ({
     ...item,
-    bundle_id: item.bundle_id ?? item.id,
-    bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
-    bundle_group_id: item.bundle_group_id ?? item.group_id,
     bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
     price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
     price_type: item.price_type ?? item.custom_price_type ?? "",
     price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
   }));
-  const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
+  const normalizedOptions = product.product_option_item || [];
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
-  const productSku = {
-    ...(0, import_utils.ensureProductSku)(product),
-    option: normalizedOptions
-  };
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_f = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _f.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_g = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _g.price : void 0;
+  const variantList = variantId ? (_b = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _b.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_c = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _c.price : void 0;
   const resolvedSource = (() => {
     var _a2, _b2;
     if (metadata.source_product_price !== void 0) {
@@ -207,28 +174,17 @@ function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
-  const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
-    { num: product.num, metadata, lineOriginalPrice: product.original_price },
-    composedOriginalPrice
-  );
-  const discountList = (0, import_manualProductDiscount.ensureManualProductDiscountList)({
-    discountList: product.discount_list,
-    metadata,
-    originalPrice: finalOriginalPrice,
-    sellingPrice: composedSellingPrice,
-    quantity: getSafeProductNum(product.num)
-  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    product_sku: productSku,
+    product_option_item: normalizedOptions,
     selling_price: composedSellingPrice,
-    original_price: finalOriginalPrice,
+    original_price: composedOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: discountList,
+    discount_list: product.discount_list || [],
     product_bundle: normalizedBundle,
     metadata,
     note: product.note != null ? String(product.note) : ""

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;