@pisell/pisellos 2.2.243 → 2.2.244

package/dist/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/dist/solution/BaseSales/types.js

@@ -7,9 +7,7 @@ export var BaseSalesHookNames = {
   onDestroy: 'onDestroy',
   onRetryInit: 'onRetryInit',
   onRefresh: 'onRefresh',
-  onCartValidationChanged: 'onCartValidationChanged',
-  onPaymentSyncStart: 'onPaymentSyncStart',
-  onPaymentSyncEnd: 'onPaymentSyncEnd'
+  onCartValidationChanged: 'onCartValidationChanged'
 };
 export function createBaseSalesHook(moduleName, hookName) {
   return "".concat(moduleName, ":").concat(hookName);
@@ -19,8 +17,9 @@ export function createBaseSalesHook(moduleName, hookName) {
  * 出站 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 显示、加购合并、指纹、持久化）与提交边界统一消费字段名

package/dist/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/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -4,8 +4,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); }
-import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
-import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
   var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var parsedValue = Number(value);
@@ -33,49 +31,23 @@ function toPriceString(value) {
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(function (optionItem) {
-    var _optionItem$option_gr, _ref, _optionItem$price, _optionItem$num;
-    var optionGroupItemId = toNumber((_optionItem$option_gr = optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id) !== null && _optionItem$option_gr !== void 0 ? _optionItem$option_gr : optionItem === null || optionItem === void 0 ? void 0 : optionItem.id);
+    var _ref, _optionItem$price, _optionItem$num;
+    var optionGroupItemId = toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id);
     var price = (_ref = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref !== void 0 ? _ref : 0;
-    return _objectSpread(_objectSpread({}, optionItem), {}, {
+    return {
       option_group_item_id: optionGroupItemId,
       option_group_id: toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_id),
       num: toSafePositiveInt((_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity, 1),
-      add_price: toNumber(price, 0),
-      price: undefined
-    });
+      price: toNumber(price, 0)
+    };
   });
 }
 function normalizeBundleItems(bundleItems) {
-  var preferPriceField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(function (bundleItem) {
-    var _ref2, _ref3, _ref4, _bundleItem$price, _ref5, _ref6, _ref7, _bundleItem$bundle_se, _bundleItem$num, _bundleItem$price2, _bundleItem$quantity, _bundleItem$price3, _ref8, _ref9, _bundleItem$original_, _normalizedItem$price;
-    var unitSelling = preferPriceField ? (_ref2 = (_ref3 = (_ref4 = (_bundleItem$price = bundleItem.price) !== null && _bundleItem$price !== void 0 ? _bundleItem$price : bundleItem.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : bundleItem.custom_price) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_price) !== null && _ref2 !== void 0 ? _ref2 : '0' : (_ref5 = (_ref6 = (_ref7 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref7 !== void 0 ? _ref7 : bundleItem.custom_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.product_price) !== null && _ref5 !== void 0 ? _ref5 : '0';
-    var unitStr = toPriceString(unitSelling, '0.00');
-    var num = toSafePositiveInt((_bundleItem$num = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.quantity, 1);
-    var magnitudeSource = _objectSpread(_objectSpread({}, bundleItem), {}, {
-      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
-      bundle_selling_price: unitStr,
-      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
-      price: (_bundleItem$price2 = bundleItem.price) !== null && _bundleItem$price2 !== void 0 ? _bundleItem$price2 : bundleItem.custom_price
-    });
-    var normalizedItem = _objectSpread(_objectSpread({}, bundleItem), {}, {
-      num: num,
-      quantity: (_bundleItem$quantity = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.quantity) !== null && _bundleItem$quantity !== void 0 ? _bundleItem$quantity : num,
-      // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
-      price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
-      bundle_selling_price: unitStr,
-      original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
+    return _objectSpread(_objectSpread({}, bundleItem), {}, {
       option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
     });
-    // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
-    normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);
-    if (((_normalizedItem$price = normalizedItem.price_type) !== null && _normalizedItem$price !== void 0 ? _normalizedItem$price : normalizedItem.custom_price_type) === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
-      var _normalizedItem$custo;
-      normalizedItem.custom_price = (_normalizedItem$custo = normalizedItem.custom_price) !== null && _normalizedItem$custo !== void 0 ? _normalizedItem$custo : normalizedItem.price;
-      normalizedItem.price = normalizedItem.bundle_selling_price;
-    }
-    return normalizedItem;
   });
 }
 function findVariantById(origin, variantId) {
@@ -92,65 +64,23 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref2, _ref3, _ref4, _payload$product_id, _ref5, _ref6, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref7, _findVariantById, _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _ref14, _payload$price, _ref15, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _ref16, _ref17, _payload$tax_fee, _ref18, _ref19, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
   if (!payload || _typeof(payload) !== 'object') return null;
   var sourceProduct = params.sourceProduct || params.sourceItem || {};
-  var productId = toProductId((_ref10 = (_ref11 = (_ref12 = (_payload$product_id = payload.product_id) !== null && _payload$product_id !== void 0 ? _payload$product_id : payload.id) !== null && _ref12 !== void 0 ? _ref12 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_id) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id) !== null && _ref10 !== void 0 ? _ref10 : fallbackProductId);
+  var productId = toProductId((_ref2 = (_ref3 = (_ref4 = (_payload$product_id = payload.product_id) !== null && _payload$product_id !== void 0 ? _payload$product_id : payload.id) !== null && _ref4 !== void 0 ? _ref4 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_id) !== null && _ref3 !== void 0 ? _ref3 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id) !== null && _ref2 !== void 0 ? _ref2 : fallbackProductId);
   if (productId === null) return null;
-  var productVariantId = toNumber((_ref13 = (_ref14 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref14 !== void 0 ? _ref14 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
+  var productVariantId = toNumber((_ref5 = (_ref6 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref6 !== void 0 ? _ref6 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref5 !== void 0 ? _ref5 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
-  var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
-  var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
-  var lineCompositeTotal = toPriceString((_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total, sourceProductPrice);
-  var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
-  var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
-  var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
-  // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
-  // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
-  var uniqueIdentificationNumber = payload.unique_identification_number;
-  var resolvedQuantity = toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1);
-  var originTotal = resolveManualDiscountOriginTotal({
-    originTotal: payload.origin_total,
-    extendOriginTotal: (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.origin_total,
-    originExtendOriginTotal: origin === null || origin === void 0 || (_extend = origin._extend) === null || _extend === void 0 ? void 0 : _extend.origin_total,
-    sourceExtendOriginTotal: sourceProduct === null || sourceProduct === void 0 || (_extend2 = sourceProduct._extend) === null || _extend2 === void 0 ? void 0 : _extend2.origin_total,
-    catalogUnitPrice: (_ref26 = (_ref27 = (_origin$base_price = origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _origin$base_price !== void 0 ? _origin$base_price : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref27 !== void 0 ? _ref27 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
-    quantity: resolvedQuantity
-  });
-  var sellingTotal = Number((_ref28 = (_ref29 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref29 !== void 0 ? _ref29 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total) !== null && _ref28 !== void 0 ? _ref28 : lineCompositeTotal);
-  var discountReason = resolveManualDiscountReasonFromSources({
-    discountReason: payload.discount_reason,
-    extendDiscountReason: (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.discount_reason,
-    originExtendDiscountReason: origin === null || origin === void 0 || (_extend3 = origin._extend) === null || _extend3 === void 0 ? void 0 : _extend3.discount_reason
-  });
-  var lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
-  var manualDiscountList = shouldBuildManualProductDiscount({
-    hasPriceOverride: hasPriceOverride,
-    originTotal: originTotal,
-    sellingTotal: sellingTotal
-  }) ? mergeManualProductDiscountIntoList(payload.discount_list, buildManualProductDiscountItem({
-    originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
-    sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
-    quantity: resolvedQuantity,
-    message: discountReason,
-    discountway: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discountway,
-    discount_per: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discount_per
-  })) : payload.discount_list || [];
-
-  // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
-  var optionSum = sumOptionUnitPrice(productOptionItem).toNumber();
-  var mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
-  var bundleOnlyComposite = composeLinePrice({
-    mainPrice: 0,
-    bundle: productBundle
-  });
-  var derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
-  var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
-  var metadata = _objectSpread(_objectSpread({
+  var matchedVariant = (_ref7 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref7 !== void 0 ? _ref7 : findVariantById(origin, productVariantId);
+  var sourceProductPrice = toPriceString((_ref8 = (_ref9 = (_ref10 = (_ref11 = (_ref12 = (_ref13 = (_ref14 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref14 !== void 0 ? _ref14 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref13 !== void 0 ? _ref13 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref12 !== void 0 ? _ref12 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref11 !== void 0 ? _ref11 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref10 !== void 0 ? _ref10 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref9 !== void 0 ? _ref9 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref8 !== void 0 ? _ref8 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
+  var productOptionItem = normalizeOptionItems((_ref15 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : payload.options) !== null && _ref15 !== void 0 ? _ref15 : payload.product_option_item);
+  var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle);
+  var uniqueIdentificationNumber = (_payload$unique_ident = payload.unique_identification_number) !== null && _payload$unique_ident !== void 0 ? _payload$unique_ident : payload.unique;
+  var metadata = {
     unique: payload.unique,
     session: payload.session,
     form: payload.form,
@@ -160,16 +90,9 @@ export 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 !== undefined ? {
-    bundle_edit: payload.bundle_edit
-  } : {});
+    origin: origin,
+    source_product_price: sourceProductPrice
+  };
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
@@ -177,17 +100,13 @@ export function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
-    num: resolvedQuantity,
-    product_sku: _objectSpread(_objectSpread({}, payload.product_sku && _typeof(payload.product_sku) === 'object' ? payload.product_sku : {}), {}, {
-      option: productOptionItem
-    }),
+    num: toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _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,
-    tax_fee: toPriceString((_ref30 = (_ref31 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref31 !== void 0 ? _ref31 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref30 !== void 0 ? _ref30 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
-    is_charge_tax: toNumber((_ref32 = (_ref33 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref33 !== void 0 ? _ref33 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref32 !== void 0 ? _ref32 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
+    selling_price: sourceProductPrice,
+    original_price: sourceProductPrice,
+    tax_fee: toPriceString((_ref16 = (_ref17 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref17 !== void 0 ? _ref17 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
+    is_charge_tax: toNumber((_ref18 = (_ref19 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
     _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {

package/dist/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/dist/solution/BaseSales/utils.js

@@ -5,8 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import Decimal from 'decimal.js';
-import { composeLinePrice, createUuidV4, ensureProductSku, normalizeProductSkuOptions, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
-import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
+import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -39,12 +38,12 @@ export function createEmptySummary() {
 export function buildProductLineFingerprint(productOptionItem, productBundle) {
   var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
   var normalizedOpts = optArr.map(function (item) {
-    var _ref, _item$add_price;
+    var _item$price;
     return {
       option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
       option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
+      price: String((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
     };
   }).sort(function (p, q) {
     if (p.option_group_item_id !== q.option_group_item_id) {
@@ -56,9 +55,9 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
   });
   var bundleArr = Array.isArray(productBundle) ? productBundle : [];
   var normalizedBundles = bundleArr.map(function (item) {
-    var _ref2, _item$bundle_id;
+    var _ref, _item$bundle_id;
     return {
-      bundle_id: Number((_ref2 = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref2 !== void 0 ? _ref2 : 0) || 0,
+      bundle_id: Number((_ref = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref !== void 0 ? _ref : 0) || 0,
       product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
     };
@@ -77,11 +76,11 @@ export function getSafeProductNum(num) {
 
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
  */
 export 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);
 }
 
 /**
@@ -107,51 +106,23 @@ export function isSkuOnlyDeleteIdentity(x) {
  * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export function normalizeOrderProduct(product) {
-  var _product$metadata, _metadata$origin, _product$product_sku, _metadata$origin2, _variantList$find, _product$is_charge_ta;
+  var _product$metadata, _metadata$origin, _variantList$find, _product$is_charge_ta;
   var metadata = _objectSpread({}, product.metadata || {});
   // 不透明 identity 契约：每条订单行必须带 identity_key。
   // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
   var resolvedIdentityKey = (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.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) : createUuidV4();
   metadata.unique_identification_number = resolvedIdentityKey;
-  var priceOverride = metadata.price_override;
-  var originOtherBundle = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin.other) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.bundle;
-  var bundleInput = product.product_bundle || [];
-  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
-    var priceById = new Map();
-    originOtherBundle.forEach(function (item) {
-      var _item$price;
-      if ((item === null || item === void 0 ? void 0 : item.id) == null) return;
-      var unit = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : item.bundle_selling_price;
-      if (unit === undefined || unit === null) return;
-      priceById.set(String(item.id), String(unit));
-    });
-    var base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
-    bundleInput = base.map(function (item) {
-      var unit = priceById.get(String(item === null || item === void 0 ? void 0 : item.id));
-      if (unit === undefined) return item;
-      return _objectSpread(_objectSpread({}, item), {}, {
-        price: unit,
-        bundle_selling_price: unit
-      });
-    });
-  }
-  var normalizedBundle = bundleInput.map(function (item) {
-    var _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref3, _item$bundle_selling_, _ref4, _ref5, _item$price2, _ref6, _item$price_type, _ref7, _item$price_type_ext;
+  var normalizedBundle = (product.product_bundle || []).map(function (item) {
+    var _ref2, _item$bundle_selling_, _ref3, _ref4, _item$price2, _ref5, _item$price_type, _ref6, _item$price_type_ext;
     return _objectSpread(_objectSpread({}, item), {}, {
-      bundle_id: (_item$bundle_id2 = item.bundle_id) !== null && _item$bundle_id2 !== void 0 ? _item$bundle_id2 : item.id,
-      bundle_product_id: (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id,
-      bundle_group_id: (_item$bundle_group_id = item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item.group_id,
-      bundle_selling_price: (_ref3 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00',
-      price: (_ref4 = (_ref5 = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price) !== null && _ref5 !== void 0 ? _ref5 : item.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : '0.00',
-      price_type: (_ref6 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref6 !== void 0 ? _ref6 : '',
-      price_type_ext: (_ref7 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref7 !== void 0 ? _ref7 : ''
+      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00',
+      price: (_ref3 = (_ref4 = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price) !== null && _ref4 !== void 0 ? _ref4 : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '0.00',
+      price_type: (_ref5 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref5 !== void 0 ? _ref5 : '',
+      price_type_ext: (_ref6 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref6 !== void 0 ? _ref6 : ''
     });
   });
-  var normalizedOptions = normalizeProductSkuOptions((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option);
+  var normalizedOptions = product.product_option_item || [];
   var optionSum = sumOptionUnitPrice(normalizedOptions);
-  var productSku = _objectSpread(_objectSpread({}, ensureProductSku(product)), {}, {
-    option: normalizedOptions
-  });
 
   // 1) 解析 source_product_price。
   // 优先级：
@@ -163,11 +134,11 @@ export function normalizeOrderProduct(product) {
   //   6) 入参 selling_price（最末兜底，新添加路径 caller 只给 selling_price）
   var isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
   var variantId = Number(product.product_variant_id || 0);
-  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin2 = metadata.origin) === null || _metadata$origin2 === void 0 ? void 0 : _metadata$origin2.variant : null;
+  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.variant : null;
   var variantPrice = Array.isArray(variantList) ? (_variantList$find = variantList.find(function (v) {
     return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
   })) === null || _variantList$find === void 0 ? void 0 : _variantList$find.price : undefined;
-  var resolvedSource = function (_product$_origin, _product$_origin2, _ref8, _product$original_pri) {
+  var resolvedSource = function (_product$_origin, _product$_origin2, _ref7, _product$original_pri) {
     if (metadata.source_product_price !== undefined) {
       return String(metadata.source_product_price);
     }
@@ -185,7 +156,7 @@ export function normalizeOrderProduct(product) {
     if (!isV2 && metadata.main_product_original_price !== undefined) {
       return String(metadata.main_product_original_price);
     }
-    return (_ref8 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref8 !== void 0 ? _ref8 : '0.00';
+    return (_ref7 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref7 !== void 0 ? _ref7 : '0.00';
   }();
 
   // 2) 派生 main_product_original_price（含 option、不含折扣）
@@ -233,29 +204,17 @@ export function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
-  var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
-    num: product.num,
-    metadata: metadata,
-    lineOriginalPrice: product.original_price
-  }, composedOriginalPrice);
-  var discountList = ensureManualProductDiscountList({
-    discountList: product.discount_list,
-    metadata: 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_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-    discount_list: discountList,
+    discount_list: product.discount_list || [],
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''

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