@pisell/pisellos 0.10.57 → 0.10.58

package/lib/modules/Order/index.d.ts

@@ -592,7 +592,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -121,8 +121,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -131,8 +132,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）

package/lib/modules/Order/utils.js

@@ -633,8 +633,9 @@ function getBundleSellingMagnitude(bundle) {
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -643,8 +644,9 @@ function getBundleSellingMagnitude(bundle) {
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
@@ -843,6 +845,14 @@ function createDefaultOrderRulesHooks(getBookings) {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new _decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+
+  // optionDiscountAmount 已是每件主商品内的单规格优惠合计，不再乘商品数量。
+  const getOptionDiscountAmount = discountList => {
+    return (discountList || []).reduce((total, discount) => {
+      if (discount?.metadata?.custom_product_bundle_map_id) return total;
+      return total.plus(Number(discount?.metadata?.optionDiscountAmount) || 0);
+    }, new _decimal.default(0));
+  };
   const getBundleIdentity = bundle => {
     return [bundle.bundle_id ?? bundle.id ?? '', bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? '', bundle.bundle_variant_id ?? bundle.variant_id ?? bundle.product_variant_id ?? 0, bundle.bundle_group_id ?? bundle.group_id ?? ''].join('|');
   };
@@ -885,12 +895,14 @@ function createDefaultOrderRulesHooks(getBookings) {
     getProduct: product => {
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       const metadataAny = product.metadata || {};
-      const optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
+      const productOptions = getProductSkuOptions(product);
+      const optionSum = sumOptionUnitPrice(productOptions);
+      const optionSellingSum = optionSum.minus(getOptionDiscountAmount(product.discount_list));
       let sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
       } else if (metadataAny.main_product_selling_price !== undefined) {
-        sourcePrice = new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
+        sourcePrice = new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString();
       } else {
         sourcePrice = String(product.selling_price ?? 0);
       }
@@ -920,6 +932,11 @@ function createDefaultOrderRulesHooks(getBookings) {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
+        // 仅在 Rules 入参中映射 price，避免折后价污染订单的 add_price。
+        options: productOptions.map(option => ({
+          ...option,
+          price: option.add_price
+        })),
         booking_id: product.metadata?.booking_id || null,
         isClient: false,
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
@@ -927,7 +944,7 @@ function createDefaultOrderRulesHooks(getBookings) {
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: product.metadata?.holder_id,
         startDate: getProductStartDate(product),
-        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
+        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: metadataAny._promotion?.inPromotion === true,
         _promotion: metadataAny._promotion
       };
@@ -938,8 +955,10 @@ function createDefaultOrderRulesHooks(getBookings) {
       const existedSource = metadataAny.source_product_price ?? product.selling_price ?? '0';
       const nextOptions = getProductSkuOptions(product);
       const optionSum = sumOptionUnitPrice(nextOptions);
+      const nextDiscountList = values.discount_list ?? product.discount_list;
+      const optionSellingSum = optionSum.minus(getOptionDiscountAmount(nextDiscountList));
 
-      // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
+      // Rules 返回的 main_product_selling_price / price 为不含 option 的主商品价。
       // 优先级：main_product_selling_price（per-unit 券后 source）> price（还原/good_pass 分支）>
       // total/num（仅当 Rules 只给 total 时的兜底）> 保留当前 source。
       const nextSourceSellingPrice = values.main_product_selling_price !== undefined ? String(values.main_product_selling_price) : values.price !== undefined ? String(values.price) : values.total !== undefined ? toUnitPriceString(values.total, nextNum) : String(existedSource);
@@ -948,8 +967,8 @@ function createDefaultOrderRulesHooks(getBookings) {
       // 缺省时保留现有 source（券前 = 当前 source）。
       const nextSourceOriginalPrice = values.original_price !== undefined ? String(values.original_price) : String(existedSource);
 
-      // 含 option 的 main_product_*
-      const nextMainSellingPrice = new _decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+      // 成交价只加回 option 折后合计；原价仍使用订单中保存的 option 原价。
+      const nextMainSellingPrice = new _decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSellingSum).toDecimalPlaces(2).toFixed(2);
       const nextMainOriginalPrice = new _decimal.default(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       const nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       const composedSellingPrice = composeLinePrice({
@@ -970,7 +989,7 @@ function createDefaultOrderRulesHooks(getBookings) {
         ...product,
         selling_price: composedSellingPrice,
         original_price: finalOriginalPrice,
-        discount_list: values.discount_list ?? product.discount_list,
+        discount_list: nextDiscountList,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
         metadata: {

package/lib/modules/ProductList/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ProductListLoadProductsParams, ProductListStoreQueryParams } from './types';
+import { ProductListLoadProductsParams, ProductListStoreQueryParams, ProductEnrichmentContext } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -19,6 +19,8 @@ export declare class ProductList extends BaseModule implements Module {
      * productList.updateOtherParams({ channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    enrichProducts(products: ProductData[], context: ProductEnrichmentContext): Promise<ProductData[]>;
+    private enrichCatalog;
     storeChange(path?: string, value?: any): Promise<void>;
     /**
      * 获取加时商品列表。

package/lib/modules/ProductList/index.js

@@ -68,6 +68,30 @@ class ProductList extends _BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
+  async enrichProducts(products, context) {
+    const enrich = this.otherParams.enrichProducts;
+    if (!enrich) return products;
+    if (context.signal?.aborted) throw new Error('Product enrichment cancelled');
+    const result = await enrich((0, _lodashEs.cloneDeep)(products), {
+      businessCode: this.otherParams.businessCode,
+      channel: this.otherParams.channel,
+      ...context
+    });
+    if (context.signal?.aborted) throw new Error('Product enrichment cancelled');
+    if (!Array.isArray(result)) throw new Error('Product enrichment must return an array');
+    return result;
+  }
+  async enrichCatalog(products, reason) {
+    try {
+      return await this.enrichProducts(products, {
+        reason
+      });
+    } catch {
+      // An unavailable supplementary source is not zero stock or an empty catalog.
+      console.warn('[ProductList] Supplementary product data could not be refreshed');
+      return products;
+    }
+  }
   async storeChange(path, value) {
     // No longer needed - products are stored as plain objects instead of Product instances
   }
@@ -197,12 +221,13 @@ class ProductList extends _BaseModule.BaseModule {
         queryPayload,
         handledByOsServer
       });
-      await this.addProduct(resolvedCallbackList);
-      originalCallback(resolvedCallbackList === callbackList ? result : {
+      const enrichedCallbackList = await this.enrichCatalog(resolvedCallbackList, 'catalog-update');
+      await this.addProduct(enrichedCallbackList);
+      originalCallback(enrichedCallbackList === callbackList ? result : {
         ...result,
         data: {
           ...result.data,
-          list: resolvedCallbackList
+          list: enrichedCallbackList
         }
       });
     } : undefined;
@@ -222,7 +247,8 @@ class ProductList extends _BaseModule.BaseModule {
       queryPayload,
       handledByOsServer
     });
-    const sortedList = resolvedList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    const enrichedList = await this.enrichCatalog(resolvedList, 'catalog');
+    const sortedList = enrichedList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
     // if (sortedList.length) {
     //   sortedList.forEach((n: any) => {
     //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
@@ -230,7 +256,7 @@ class ProductList extends _BaseModule.BaseModule {
     //     }
     //   })
     // }
-    this.addProduct(sortedList);
+    await this.addProduct(sortedList);
     return sortedList;
   }
   async loadProductsPrice({

package/lib/modules/ProductList/types.d.ts

@@ -1,4 +1,12 @@
 import { ProductData } from '../Product/types';
+/** Runtime-only enrichment; never serialized into a product query. */
+export interface ProductEnrichmentContext {
+    reason: 'catalog' | 'catalog-update' | 'detail-open';
+    businessCode?: string;
+    channel?: string;
+    signal?: AbortSignal;
+}
+export type ProductEnricher = (products: ProductData[], context: ProductEnrichmentContext) => Promise<ProductData[]>;
 export interface ProductListLoadProductsParams {
     category_ids?: number[];
     product_ids?: number[];

package/lib/modules/ProductList/types.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProductListHooks = void 0;
+/** Runtime-only enrichment; never serialized into a product query. */
 let ProductListHooks = exports.ProductListHooks = /*#__PURE__*/function (ProductListHooks) {
   ProductListHooks["onGetProducts"] = "productList:onGetProducts";
   ProductListHooks["onGetProduct"] = "productList:onGetProduct";

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

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

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

@@ -2,7 +2,7 @@ import type { Module, ModuleOptions, PisellCore } from '../../types';
 import type { ProductData } from '../../modules';
 import { type InvoiceLayoutConfig, type InvoiceTemplateSettings, type OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
-import type { ProductListLoadProductsParams, ProductListStoreQueryParams } from '../../modules/ProductList';
+import type { ProductListLoadProductsParams, ProductListStoreQueryParams, ProductEnrichmentContext } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
 import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesResolveProductAllergyRequirementParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
 import type { BusinessAvailability } from '../../modules/BusinessAvailability';
@@ -205,6 +205,12 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     getProductCatalog(): {
         products: ProductData[];
     };
+    /** Detail reads share the catalog adapter, including when basic detail is cached. */
+    enrichProducts(products: ProductData[], context: ProductEnrichmentContext): Promise<ProductData[]>;
+    /** Apply only enrichment changes, never the cart's selection/price snapshot. */
+    applyProductEnrichment(before: ProductData, after: ProductData, context?: {
+        signal?: AbortSignal;
+    }): Promise<void>;
     /**
      * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
      * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.

package/lib/solution/UnifiedBookingSales/index.js

@@ -2033,7 +2033,17 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       schedule_date,
       schedule_datetime,
       cacheId: this.cacheId
-    }, options);
+    }, options?.callback && typeof this.otherParams.enrichProducts === 'function' ? {
+      ...options,
+      callback: response => {
+        const updates = response?.data?.list;
+        if (Array.isArray(updates)) {
+          // Subscription responses are the current query's complete visible list.
+          this.unifiedProductCatalog = [...updates];
+        }
+        options.callback?.(response);
+      }
+    } : options);
     this.unifiedProductCatalog = Array.isArray(result) ? [...result] : [];
     await this.core.effects.emit(`${this.name}:onProductsLoaded`, result);
     return result;
@@ -2114,6 +2124,75 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     };
   }
 
+  /** Detail reads share the catalog adapter, including when basic detail is cached. */
+  async enrichProducts(products, context) {
+    if (!this.store.products) throw new Error('Products module is not ready');
+    return this.store.products.enrichProducts(products, context);
+  }
+
+  /** Apply only enrichment changes, never the cart's selection/price snapshot. */
+  async applyProductEnrichment(before, after, context = {}) {
+    const id = String(before.id ?? before.product_id);
+    if (id !== String(after.id ?? after.product_id)) {
+      throw new Error('Product enrichment changed product identity');
+    }
+    const patch = {};
+    Object.keys(after).forEach(key => {
+      if (['id', 'product_id', '_extend'].includes(key)) return;
+      if (!(0, _lodashEs.isEqual)(before[key], after[key])) patch[key] = (0, _lodashEs.cloneDeep)(after[key]);
+    });
+    if (!Object.keys(patch).length) return;
+    const cached = (await this.store.products?.queryProducts({
+      includeIds: [id]
+    })) || [];
+    if (context.signal?.aborted) return;
+    const applyPatch = product => {
+      const next = {
+        ...product,
+        ...patch
+      };
+      // A detail can contain only the selected variants; keep the catalog's other SKUs
+      // and update only fields that the adapter actually changed.
+      if (Array.isArray(patch.variant) && Array.isArray(product.variant)) {
+        const variantId = variant => {
+          const value = variant?.id ?? variant?.product_variant_id;
+          return value == null ? null : String(value);
+        };
+        next.variant = product.variant.map(variant => {
+          if (variantId(variant) === null) return variant;
+          const previous = before.variant?.find(item => variantId(item) === variantId(variant));
+          const enriched = after.variant?.find(item => variantId(item) === variantId(variant));
+          if (!previous || !enriched) return variant;
+          const variantPatch = {};
+          Object.keys(enriched).forEach(key => {
+            if (key !== 'id' && key !== 'product_variant_id' && !(0, _lodashEs.isEqual)(previous[key], enriched[key])) {
+              variantPatch[key] = (0, _lodashEs.cloneDeep)(enriched[key]);
+            }
+          });
+          return {
+            ...variant,
+            ...variantPatch
+          };
+        });
+      }
+      return next;
+    };
+    const catalogUpdates = [];
+    this.unifiedProductCatalog = this.unifiedProductCatalog.map(product => {
+      if (String(product.id ?? product.product_id) !== id) return product;
+      const next = applyPatch(product);
+      catalogUpdates.push(next);
+      return next;
+    });
+    // A cart product may no longer be in the visible menu but still have a shared cache entry.
+    const updates = cached.length ? cached.map(applyPatch) : catalogUpdates;
+    if (updates.length) {
+      await this.store.products?.addProduct(updates);
+      if (context.signal?.aborted) return;
+      await this.core.effects.emit(`${this.name}:onProductsLoaded`, this.getProductCatalog().products);
+    }
+  }
+
   /**
    * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
    * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.

package/package.json

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