@pisell/pisellos 2.2.172 → 2.2.174

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

@@ -99,6 +99,29 @@ function getFallbackPrice(params) {
 function getProductQuantity(product) {
   return toPositiveInt(product.num ?? product.quantity, 1);
 }
+function getBundleProductId(bundle) {
+  const productId = toFiniteNumber(
+    bundle.bundle_product_id ?? bundle._bundle_product_id,
+    NaN
+  );
+  if (!Number.isFinite(productId))
+    return null;
+  return productId;
+}
+function getBundleVariantId(bundle) {
+  const variantId = toFiniteNumber(
+    bundle.bundle_variant_id ?? bundle.variant_id,
+    0
+  );
+  if (!Number.isFinite(variantId) || variantId <= 0)
+    return void 0;
+  return variantId;
+}
+function getBundleFallbackPrice(bundle) {
+  return toPriceString(
+    bundle.bundle_selling_price ?? bundle.price ?? bundle.original_price ?? bundle.base_price ?? 0
+  );
+}
 function shouldSplitByDuration(duration, start, end) {
   if (!duration)
     return false;
@@ -162,37 +185,90 @@ function buildPriceSegment(params) {
     source: quotedPrice !== null ? "quotation" : "fallback"
   };
 }
-function calculateBaseSalesProductBookingPrice(params) {
+function calculatePriceForProduct(params) {
   var _a;
+  const segments = params.segments.map((segment) => buildPriceSegment({
+    quotation: params.quotation,
+    productId: params.productId,
+    variantId: params.variantId,
+    customerId: params.customerId,
+    fallbackPrice: params.fallbackPrice,
+    segment
+  }));
+  const unitPrice = segments.reduce(
+    (total, segment) => total.plus(segment.total_price),
+    new import_decimal.default(0)
+  );
+  const totalPrice = unitPrice.times(params.quantity);
+  const quotationShelfId = ((_a = segments.find((segment) => segment.quotation_shelf_id)) == null ? void 0 : _a.quotation_shelf_id) || 0;
+  return {
+    unitPrice,
+    totalPrice,
+    quotationShelfId,
+    segments
+  };
+}
+function calculateBundlePrices(params, segments) {
+  var _a;
+  const bundleList = ((_a = params.product) == null ? void 0 : _a.product_bundle) || [];
+  if (!bundleList.length)
+    return void 0;
+  return bundleList.map((bundle) => {
+    const productId = getBundleProductId(bundle);
+    const variantId = getBundleVariantId(bundle);
+    const quantity = getProductQuantity(bundle);
+    const price = calculatePriceForProduct({
+      quotation: params.quotation,
+      productId,
+      variantId,
+      customerId: params.customer_id,
+      quantity,
+      fallbackPrice: getBundleFallbackPrice(bundle),
+      segments
+    });
+    return {
+      bundle_id: bundle.bundle_id ?? bundle.id,
+      group_id: bundle.group_id,
+      bundle_group_id: bundle.bundle_group_id,
+      bundle_product_id: productId,
+      bundle_variant_id: variantId ?? 0,
+      unit_price: price.unitPrice.toDecimalPlaces(2).toFixed(2),
+      total_price: price.totalPrice.toDecimalPlaces(2).toFixed(2),
+      quantity,
+      quotation_shelf_id: price.quotationShelfId,
+      source: price.segments.some((segment) => segment.source === "quotation") ? "quotation" : "fallback",
+      segments: price.segments
+    };
+  });
+}
+function calculateBaseSalesProductBookingPrice(params) {
   const product = params.product || {};
   const productId = getProductId(product);
   const variantId = getProductVariantId(product);
   const productQuantity = getProductQuantity(product);
   const fallbackPrice = getFallbackPrice(params);
-  const segments = buildTimeSegments(params).map((segment) => buildPriceSegment({
+  const timeSegments = buildTimeSegments(params);
+  const price = calculatePriceForProduct({
     quotation: params.quotation,
     productId,
     variantId,
     customerId: params.customer_id,
+    quantity: productQuantity,
     fallbackPrice,
-    segment
-  }));
-  const unitPrice = segments.reduce(
-    (total, segment) => total.plus(segment.total_price),
-    new import_decimal.default(0)
-  );
-  const totalPrice = unitPrice.times(productQuantity);
-  const quotationShelfId = ((_a = segments.find((segment) => segment.quotation_shelf_id)) == null ? void 0 : _a.quotation_shelf_id) || 0;
+    segments: timeSegments
+  });
+  const bundlePrices = calculateBundlePrices(params, timeSegments);
   return {
     product_id: productId,
     product_variant_id: variantId ?? 0,
     customer_id: params.customer_id,
-    unit_price: unitPrice.toDecimalPlaces(2).toFixed(2),
-    total_price: totalPrice.toDecimalPlaces(2).toFixed(2),
+    unit_price: price.unitPrice.toDecimalPlaces(2).toFixed(2),
+    total_price: price.totalPrice.toDecimalPlaces(2).toFixed(2),
     quantity: productQuantity,
     duration: params.duration,
-    quotation_shelf_id: quotationShelfId,
-    segments
+    quotation_shelf_id: price.quotationShelfId,
+    segments: price.segments,
+    ...bundlePrices ? { product_bundle: bundlePrices } : {}
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -124,7 +124,7 @@ function transformBaseProductToOrderProduct(params) {
     payload.bundle ?? payload.product_bundle,
     hasPriceOverride
   );
-  const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
+  const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
   const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,

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 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -482,11 +482,17 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
   setOrderCustomer(customer) {
+    var _a;
     if (!customer) {
       this.clearOrderCustomer();
       return;
     }
+    const previousCustomerId = (_a = this.store.order.getOrderCustomer()) == null ? void 0 : _a.customer_id;
     const patch = (0, import_orderCustomer.formatOrderCustomerPatch)(customer);
+    if (Number(previousCustomerId || 0) !== Number(patch.customer_id || 0)) {
+      this.discountConfigCacheKey = null;
+      this.hasManualDiscountSelection = false;
+    }
     this.store.order.setOrderCustomer(patch, customer);
     const next = this.buildOrderCustomerPayload();
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
@@ -510,6 +516,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   clearOrderCustomer() {
     var _a, _b;
     this.store.order.clearOrderCustomer();
+    this.discountConfigCacheKey = null;
+    this.hasManualDiscountSelection = false;
     const orderStore = this.store.order.store || {};
     const discountModule = orderStore.discount;
     void ((_a = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _a.call(discountModule, []));

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.172",
+  "version": "2.2.174",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",