@pisell/pisellos 2.2.170 → 2.2.171

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;
@@ -44,9 +42,6 @@ export interface BaseSalesOrderProductIdentity {
     product_option_item?: any[];
     product_bundle?: any[];
 }
-export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrderProductIdentity {
-    num: number;
-}
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
@@ -208,52 +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 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[];
-}
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {
     policy?: string | null;
@@ -332,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);

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

@@ -4,7 +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 { 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);
@@ -44,19 +43,9 @@ function normalizeOptionItems(optionItems) {
   });
 }
 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$quantity, _bundleItem$price2, _ref8, _ref9, _bundleItem$original_;
-    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);
     return _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: (_bundleItem$price2 = bundleItem.price) !== null && _bundleItem$price2 !== void 0 ? _bundleItem$price2 : 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,
       option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
     });
   });
@@ -75,53 +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, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref25, _ref26, _origin$base_price, _ref27, _ref28, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref29, _ref30, _payload$tax_fee, _ref31, _ref32, _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 = normalizeOptionItems((_ref24 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : 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);
+  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 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: (_ref25 = (_ref26 = (_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 && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref25 !== void 0 ? _ref25 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
-    quantity: resolvedQuantity
-  });
-  var sellingTotal = Number((_ref27 = (_ref28 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref28 !== void 0 ? _ref28 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total) !== null && _ref27 !== void 0 ? _ref27 : 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 || [];
-  var metadata = _objectSpread(_objectSpread({
+  var metadata = {
     unique: payload.unique,
     session: payload.session,
     form: payload.form,
@@ -132,15 +91,8 @@ export function transformBaseProductToOrderProduct(params) {
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
     origin: origin,
-    source_product_price: sourceProductPrice,
-    main_product_selling_price: sourceProductPrice,
-    main_product_original_price: sourceProductPrice
-  }, hasPriceOverride ? {
-    price_override: String(payload.price_override),
-    is_manual_discount: 1
-  } : {}), payload.bundle_edit !== undefined ? {
-    bundle_edit: payload.bundle_edit
-  } : {});
+    source_product_price: sourceProductPrice
+  };
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
@@ -148,15 +100,13 @@ export function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
-    num: resolvedQuantity,
+    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((_ref29 = (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref29 !== void 0 ? _ref29 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
-    is_charge_tax: toNumber((_ref31 = (_ref32 = (_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 && _ref32 !== void 0 ? _ref32 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref31 !== void 0 ? _ref31 : 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.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, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
-import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
+import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -107,42 +106,17 @@ export function isSkuOnlyDeleteIdentity(x) {
  * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export function normalizeOrderProduct(product) {
-  var _product$metadata, _metadata$origin, _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$price2;
-      if ((item === null || item === void 0 ? void 0 : item.id) == null) return;
-      var unit = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : 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, _ref2, _item$bundle_selling_, _ref3, _ref4, _item$price3, _ref5, _item$price_type, _ref6, _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: (_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$price3 = item.price) !== null && _item$price3 !== void 0 ? _item$price3 : item.custom_price) !== null && _ref4 !== void 0 ? _ref4 : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '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 : ''
     });
@@ -160,7 +134,7 @@ 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;
@@ -230,18 +204,6 @@ 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,
@@ -249,10 +211,10 @@ export function normalizeOrderProduct(product) {
     product_variant_id: product.product_variant_id,
     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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -1,16 +1,10 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketState, IGetCustomerListParams, ICustomer, ILoadProductsParams, ILoadProductDetailParams, IScanResult } from './types';
 import type { ProductData } from '../../modules';
-import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
 import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
-import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
-import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
-import { type BuildCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildCacheItemFromOrderLine';
-import { type BuildNormalProductCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine';
-import type { AddProductBookingInput, OrderProduct, OrderProductIdentity, UpdateOrderProductParams } from '../../modules/Order/types';
 export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -22,14 +16,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private platform;
     private scan;
     private productCatalog;
-    private orderCustomerDiscountRefreshInFlight;
-    private orderCustomerDiscountRefreshCustomerId;
     /**
-     * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
-     * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
+     * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer。
      */
     protected getRegisteredModuleNames(): readonly string[];
-    protected getSubmitOrderSalesChannel(): string;
     /**
      * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
      * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -44,14 +34,6 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 让现有 setActiveCustomer / getActiveCustomer 调用方零成本拿到详情态客户。
      */
     loadSalesDetail(orderIdOrParams: number | string | LoadSalesDetailParams): Promise<ISalesDetail>;
-    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
-    private hydrateOrderCustomerFromScanDiscounts;
-    private getDiscountCustomerId;
-    private resolveCustomerByDiscountCustomerId;
-    private findCustomerById;
-    private normalizeCustomer;
-    private getRawCustomerId;
-    private hasUsableCustomerDetails;
     /**
      * 更新当前预约的 appointment_status。
      *
@@ -204,19 +186,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 清空下单客户（协议字段 + snapshot）。
      */
     clearOrderCustomer(): void;
-    /**
-     * 重置 tempOrder，并同步清空下单客户运行态。
-     *
-     * OrderModule.restoreOrder 会重建空单（customer_id 已为 null），但不会：
-     *  - emit BookingTicket `onOrderCustomerChange`
-     *  - 重置 CustomerModule.selectedCustomer（老路 getActiveCustomer）
-     *
-     * 因此在 super.restoreOrder 之后显式清客户，保证 SalesSdk / ticketBooking 订阅方与 tempOrder 一致。
-     */
-    restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
-    private refreshDiscountConfigAfterOrderCustomerChange;
     /**
      * 获取客户分页信息
      * @returns 分页信息
@@ -320,109 +291,6 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * @returns 其他参数
      */
     getOtherParams(): Promise<Record<string, any>>;
-    /** 拉取 board config 并写入 BookingContext。 */
-    loadBookingConfig(params?: LoadBookingConfigParams): Promise<BookingContextConfig | null>;
-    /** 拉取资源全集并写入 BookingContext。 */
-    loadBookingResources(params?: LoadBookingResourcesParams): Promise<BookingContextResource[]>;
-    /** 初始化 BookingContext（date + config + resources）。 */
-    initBookingContext(params?: InitBookingContextParams): Promise<BookingContextState>;
-    /** 当前 store 是否已具备与入参等价的 config / resources（无需再请求接口）。 */
-    isBookingContextReady(params?: InitBookingContextParams): boolean;
-    /** 写入 booking config（来源：`/core/board/management/config`）。 */
-    setBookingConfig(config: BookingContextConfig | null): void;
-    /** 读取当前 booking config。 */
-    getBookingConfig(): BookingContextConfig | null;
-    /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
-    setResources(resources: BookingContextResource[] | null | undefined): void;
-    /** 读取资源全集（浅克隆）。 */
-    getResourcesOrigin(): BookingContextResource[];
-    /** 读取资源全集 map（id → resource）。 */
-    getResourcesOriginMap(): BookingContextResourceMap;
-    /** 写入当前选择的日期；支持 dayjs / Date / string。 */
-    setBookingDate(date: BookingContextDateInput): void;
-    /** 读取当前选择的日期（统一 string）。 */
-    getBookingDate(): string | null;
-    /** 读取 BookingContext 完整 store（调试 / 测试 / 透传给 SDK 使用）。 */
-    getBookingContextState(): BookingContextState;
-    /** 清空 BookingContext（切租户 / destroy 场景）。 */
-    clearBookingContext(): void;
-    /**
-     * 构造 BookingContext 计算上下文（供 getProductExtend / getResourceByIds 等读 API 复用）。
-     */
-    private buildBookingCalcContext;
-    /**
-     * 取商品当前可选资源列表（透传 OS BookingContext utils#getResourceByIds）。
-     * `extraResources` 用于把拖入未绑定的资源也展示出来。
-     */
-    getResourcesForProduct(product: any, options?: {
-        extraResources?: Array<{
-            form_id: number | string;
-            id: number;
-        }>;
-    }): any[];
-    /**
-     * 拼装 cacheItem 的 _extend / _data（资源 / 容量 / timeObj），与 info2 `getProductExtend` 等价。
-     */
-    getProductExtend(cacheItem: any, extra?: Partial<BookingCalcContext>): any;
-    /**
-     * 取资源不可用原因列表（结构化 enum + params，i18n 文案由 UI 渲染）。
-     */
-    getResourceErrors(resource: any, cacheItem: any): ResourceError[];
-    /**
-     * 拼装 addProductDecision 通用上下文（从 store 自取）。
-     */
-    private buildAddProductCtx;
-    /**
-     * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
-     * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
-     */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
-    /** 规格弹窗 callback 后的第二段决策。 */
-    decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
-    /**
-     * @deprecated 请用 `decideAddProduct`；`autoClose=true` 仅当 action=add。
-     */
-    decideAutoClose(item: any, options?: Partial<AddProductDecideContext>): {
-        autoClose: boolean;
-        cacheItem?: any;
-    };
-    /** 替代 info2 `getIsEject`：商品是否需要弹窗（0/1）。 */
-    getIsEject(item: any, type?: 'select' | 'detail'): 0 | 1;
-    /** 仅 session 商品（无 variant/option/package）→ true。 */
-    getIsOnlySession(item: any): boolean;
-    /**
-     * 拼装 requiresDetail payload（给 SDK 直接 return 给 UI 用）。
-     */
-    buildRequiresDetailPayload(item: any, options?: Partial<AddProductDecideContext>): AddProductRequiresDetailPayload;
-    /**
-     * 把 detail 弹窗回调结果（e, extension_type, detail）转换为 `(product, booking)` 入参。
-     * 内部会先拼 cacheItem，再走 cacheItemToBookingInput 严格协议对齐。
-     */
-    transformDetailToProductAndBooking(input: {
-        item: any;
-        cacheItem?: any;
-        detailResult?: {
-            e: any;
-            extension_type?: any;
-            detail?: any;
-        };
-        options?: Partial<AddProductDecideContext>;
-    }): {
-        product: Partial<OrderProduct> & OrderProductIdentity;
-        booking?: AddProductBookingInput;
-        cacheItem: any;
-    };
-    /**
-     * 从已加车的 order line + booking 反查资源编辑抽屉所需的 cacheItem。
-     * 供 SalesSdk「编辑资源」等场景使用；字段语义与 buildCacheItemFromDetail 产出对齐。
-     */
-    buildCacheItemFromOrderLine(input: BuildCacheItemFromOrderLineInput): Record<string, any>;
-    /**
-     * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
-     */
-    buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;
-    /** 文档别名：与 OrderModule.updateOrderProduct 一致。 */
-    updateProductInOrder(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。