@pisell/pisellos 2.3.38 → 2.3.39

package/dist/solution/VenueBooking/types.d.ts

@@ -1,5 +1,6 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, DateModule, ScheduleModule, QuotationModule, OpenDataModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import { HolderModule } from '../../modules/Holder';
 export type { ScanOrderOrderProductIdentity, ScanOrderOrderProduct, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder, ScanOrderSubmitPayload, } from '../ScanOrder/types';
 export declare enum VenueBookingHooks {
     onInited = "venueBooking:onInited",
@@ -96,6 +97,7 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
+    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;
@@ -144,6 +146,7 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

package/dist/solution/VenueBooking/utils/resource.js

@@ -93,6 +93,7 @@ export function buildResourceProductMap(products) {
               var mapping = {
                 productId: product.id,
                 productTitle: product.title,
+                formName: resource.title,
                 resourceName: resource.title,
                 formId: resource.id,
                 price: product.price || '0.00',

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -12,10 +12,6 @@ export declare function buildPriceBreakdown(params: {
         }) => number;
     };
 }): PriceBreakdownEntry[];
-export declare function buildVenueResourceMetadata(params: {
-    mapping: ResourceProductMapping;
-    rawResource: VenueResourceRawData | undefined;
-}): Record<string, any>;
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;
@@ -29,6 +25,10 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -90,13 +90,15 @@ export function buildPriceBreakdown(params) {
   return entries;
 }
 export function buildVenueResourceMetadata(params) {
-  var _rawResource$form_nam, _ref, _rawResource$main_fie, _rawResource$combined;
+  var _mapping$formName, _rawResource$main_fie;
   var mapping = params.mapping,
     rawResource = params.rawResource;
+  var combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource;
+  var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
   return {
-    form_name: (_rawResource$form_nam = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_name) !== null && _rawResource$form_nam !== void 0 ? _rawResource$form_nam : '',
-    resource_name: (_ref = (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName) !== null && _ref !== void 0 ? _ref : '',
-    combined_resource: (_rawResource$combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource) !== null && _rawResource$combined !== void 0 ? _rawResource$combined : null
+    form_name: (_mapping$formName = mapping.formName) !== null && _mapping$formName !== void 0 ? _mapping$formName : mapping.resourceName,
+    resource_name: (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName,
+    combined_resource: isCombined ? combined : null
   };
 }
 export function buildVenueBookingEntry(params) {
@@ -119,7 +121,10 @@ export function buildVenueBookingEntry(params) {
     form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: {}
+    metadata: buildVenueResourceMetadata({
+      mapping: mapping,
+      rawResource: rawResource
+    })
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map(function (child) {

package/dist/solution/index.d.ts

@@ -8,3 +8,4 @@ export * from './Sales';
 export * from './ScanOrder';
 export * from './BaseSales';
 export * from './VenueBooking';
+export * from './UnifiedBookingSales';

package/dist/solution/index.js

@@ -7,4 +7,5 @@ export * from "./Checkout";
 export * from "./Sales";
 export * from "./ScanOrder";
 export * from "./BaseSales";
-export * from "./VenueBooking";
+export * from "./VenueBooking";
+export * from "./UnifiedBookingSales";

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
+    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];
@@ -47,7 +48,6 @@ export interface PisellCore {
     getModule: <T extends Module>(name: string) => T | null;
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
-    getModuleNames: () => string[];
     effects: {
         on: (event: string, callback: (payload: any) => void) => () => void;
         once: (event: string, callback: (payload: any) => void) => () => void;

package/lib/core/index.d.ts

@@ -28,8 +28,6 @@ declare class PisellOSCore implements PisellCore {
     getModule<T extends Module>(name: string): T | null;
     getModuleExports<T = any>(name: string): T | null;
     hasModule(name: string): boolean;
-    /** 返回当前已注册模块名，供宿主在切换店铺等生命周期中定向清理运行态。 */
-    getModuleNames(): string[];
     destroy(): Promise<void>;
     setContext(ctx: Partial<BusinessContext>): void;
     /**

package/lib/core/index.js

@@ -210,10 +210,6 @@ var PisellOSCore = class {
   hasModule(name) {
     return this.modules.has(name);
   }
-  /** 返回当前已注册模块名，供宿主在切换店铺等生命周期中定向清理运行态。 */
-  getModuleNames() {
-    return Array.from(this.modules.keys());
-  }
   // 销毁方法
   async destroy() {
     for (const [name, module2] of this.modules.entries()) {

package/lib/model/strategy/adapter/promotion/adapter.d.ts

@@ -48,10 +48,6 @@ export declare class PromotionAdapter implements BusinessAdapter {
      * 解析 买X送Y Action
      */
     private parseBuyXGetYFreeAction;
-    /**
-     * 解析 商品奖励 Action
-     */
-    private parseItemRewardAction;
     /**
      * 获取适用的商品列表
      *

package/lib/model/strategy/adapter/promotion/adapter.js

@@ -134,8 +134,6 @@ var PromotionAdapter = class {
         return this.parseXItemsForYPriceAction(action);
       case import_type.PROMOTION_ACTION_TYPES.BUY_X_GET_Y_FREE:
         return this.parseBuyXGetYFreeAction(action);
-      case import_type.PROMOTION_ACTION_TYPES.ITEM_REWARD:
-        return this.parseItemRewardAction(action);
       default:
         return void 0;
     }
@@ -169,24 +167,6 @@ var PromotionAdapter = class {
       giftProducts: config.giftProducts || []
     };
   }
-  /**
-   * 解析 商品奖励 Action
-   */
-  parseItemRewardAction(action) {
-    const value = action.value || {};
-    const config = action.config || {};
-    return {
-      type: import_type.PROMOTION_ACTION_TYPES.ITEM_REWARD,
-      rewardMethod: value.rewardMethod || "free",
-      rewardValue: Number(value.rewardValue || 0),
-      quantityRule: value.quantityRule || "per_condition_quantity",
-      triggerQuantity: Number(value.triggerQuantity || 1),
-      rewardQuantity: Number(value.rewardQuantity || 1),
-      maxRewardQuantity: value.maxRewardQuantity === void 0 || value.maxRewardQuantity === null ? void 0 : Number(value.maxRewardQuantity),
-      rewardTargets: Array.isArray(config.rewardTargets) ? config.rewardTargets : [],
-      targetSelection: config.targetSelection || "consumer_best"
-    };
-  }
   /**
    * 获取适用的商品列表
    *

package/lib/model/strategy/adapter/promotion/evaluator.d.ts

@@ -169,21 +169,6 @@ export declare class PromotionEvaluator {
      * 支持 bundle 子商品的数量计算（主商品数量 × 子商品数量）
      */
     private processBuyXGetYFree;
-    /**
-     * 处理 商品奖励 促销
-     *
-     * 1. 使用 group.products 统计触发条件商品数量
-     * 2. 按 quantityRule 计算最多奖励的目标商品数量
-     * 3. 在全购物车商品中筛选 rewardTargets
-     * 4. 按消费者最优（可节省金额从高到低）选择目标单位
-     * 5. 对目标商品拆分并写入 finalPrice，触发商品本身不改价
-     */
-    private processItemReward;
-    private normalizePositiveInteger;
-    private getAvailablePromotionQuantity;
-    private buildItemRewardTargetUnits;
-    private resolveItemRewardFinalPrice;
-    private resolveItemRewardLimit;
     /**
      * 获取未参与任何促销的商品
      */
@@ -209,8 +194,6 @@ export declare class PromotionEvaluator {
      * 检查商品是否在策略的适用范围内
      */
     private isProductInStrategy;
-    private shouldSkipStrategyForProduct;
-    private hasActionType;
     /**
      * 查找商品匹配规则
      */

package/lib/model/strategy/adapter/promotion/evaluator.js

@@ -133,9 +133,6 @@ var PromotionEvaluator = class {
     for (const product of products) {
       const applicablePromotions = [];
       for (const config of configs) {
-        if (this.shouldSkipStrategyForProduct(product, config)) {
-          continue;
-        }
         const matchInfo = this.getProductMatchInfo(product, config);
         if (!matchInfo.isMatch) {
           continue;
@@ -299,16 +296,6 @@ var PromotionEvaluator = class {
         if (result.giftInfo) {
           gifts.push(result.giftInfo);
         }
-      } else if (actionType === import_type.PROMOTION_ACTION_TYPES.ITEM_REWARD) {
-        const result = this.processItemReward(
-          group,
-          processedQuantityMap,
-          products,
-          matchedBundleIndexMap
-        );
-        pricedProducts.push(...result.products);
-        totalOriginalAmount = totalOriginalAmount.plus(result.originalAmount);
-        totalFinalAmount = totalFinalAmount.plus(result.finalAmount);
       }
     }
     const remainingProducts = this.getRemainingProducts(
@@ -392,9 +379,6 @@ var PromotionEvaluator = class {
     for (const product of products) {
       const applicableStrategies = [];
       for (const config of configs) {
-        if (this.shouldSkipStrategyForProduct(product, config)) {
-          continue;
-        }
         let contextProduct = product;
         if (!matchVariant) {
           const productMatchRule = this.findProductMatchRule(config);
@@ -471,9 +455,6 @@ var PromotionEvaluator = class {
     } else if (actionType === "X_ITEMS_FOR_Y_PRICE") {
       const detail = actionDetail;
       requiredQuantity = detail.x || 0;
-    } else if (actionType === "ITEM_REWARD") {
-      const detail = actionDetail;
-      requiredQuantity = detail.triggerQuantity || 1;
     }
     const productMatchRule = this.findProductMatchRule(config);
     const eligibleProducts = (productMatchRule == null ? void 0 : productMatchRule.value) || [];
@@ -787,213 +768,6 @@ var PromotionEvaluator = class {
       giftInfo
     };
   }
-  /**
-   * 处理 商品奖励 促销
-   *
-   * 1. 使用 group.products 统计触发条件商品数量
-   * 2. 按 quantityRule 计算最多奖励的目标商品数量
-   * 3. 在全购物车商品中筛选 rewardTargets
-   * 4. 按消费者最优（可节省金额从高到低）选择目标单位
-   * 5. 对目标商品拆分并写入 finalPrice，触发商品本身不改价
-   */
-  processItemReward(group, processedQuantityMap, allProducts, matchedBundleIndexMap) {
-    const {
-      strategyId,
-      strategyMetadata,
-      actionDetail,
-      products: triggerProducts
-    } = group;
-    const detail = actionDetail;
-    const triggerQuantity = this.normalizePositiveInteger(detail.triggerQuantity, 1);
-    const rewardQuantity = this.normalizePositiveInteger(detail.rewardQuantity, 1);
-    const conditionQuantity = this.getAvailablePromotionQuantity(
-      triggerProducts,
-      processedQuantityMap,
-      matchedBundleIndexMap
-    );
-    if (conditionQuantity < triggerQuantity) {
-      return { products: [], originalAmount: 0, finalAmount: 0 };
-    }
-    const targetProducts = allProducts.filter(
-      (product) => this.isProductMatch(product, detail.rewardTargets || [])
-    );
-    const targetUnitCandidates = this.buildItemRewardTargetUnits(
-      targetProducts,
-      processedQuantityMap,
-      detail
-    );
-    if (targetUnitCandidates.length === 0) {
-      return { products: [], originalAmount: 0, finalAmount: 0 };
-    }
-    const rewardLimit = this.resolveItemRewardLimit(
-      detail,
-      conditionQuantity,
-      triggerQuantity,
-      rewardQuantity,
-      targetUnitCandidates.length
-    );
-    if (rewardLimit <= 0) {
-      return { products: [], originalAmount: 0, finalAmount: 0 };
-    }
-    const selectedUnits = [...targetUnitCandidates].sort((a, b) => {
-      const discountDiff = b.discountAmount.minus(a.discountAmount).toNumber();
-      if (discountDiff !== 0)
-        return discountDiff;
-      return b.originalPrice.minus(a.originalPrice).toNumber();
-    }).slice(0, rewardLimit);
-    const selectedByProductId = /* @__PURE__ */ new Map();
-    for (const unit of selectedUnits) {
-      const existing = selectedByProductId.get(unit.product.id);
-      if (existing) {
-        existing.quantity += 1;
-      } else {
-        selectedByProductId.set(unit.product.id, {
-          quantity: 1,
-          finalPrice: unit.finalPrice,
-          originalPrice: unit.originalPrice
-        });
-      }
-    }
-    const result = [];
-    let originalAmount = new import_decimal.default(0);
-    let finalAmount = new import_decimal.default(0);
-    for (const product of targetProducts) {
-      const key = this.getProductKey(product);
-      const processedQty = processedQuantityMap.get(key) || 0;
-      const availableQty = product.quantity - processedQty;
-      if (availableQty <= 0)
-        continue;
-      const selected = selectedByProductId.get(product.id);
-      const selectedQty = (selected == null ? void 0 : selected.quantity) || 0;
-      const remainingQty = availableQty - selectedQty;
-      if (selectedQty <= 0)
-        continue;
-      if (selectedQty > 0) {
-        result.push({
-          ...product,
-          id: selectedQty === availableQty ? product.id : this.generateRandomId(),
-          originalId: product.id,
-          quantity: selectedQty,
-          finalPrice: this.formatPrice(selected.finalPrice),
-          strategyId,
-          strategyMetadata,
-          inPromotion: true,
-          isSplit: selectedQty !== product.quantity
-        });
-        originalAmount = originalAmount.plus(
-          selected.originalPrice.mul(selectedQty)
-        );
-        finalAmount = finalAmount.plus(selected.finalPrice.mul(selectedQty));
-      }
-      if (remainingQty > 0) {
-        result.push({
-          ...product,
-          quantity: remainingQty,
-          finalPrice: this.formatPrice(product.price),
-          strategyId: void 0,
-          strategyMetadata: void 0,
-          inPromotion: false,
-          isSplit: selectedQty > 0
-        });
-        const remainingAmount = new import_decimal.default(product.price).mul(remainingQty);
-        originalAmount = originalAmount.plus(remainingAmount);
-        finalAmount = finalAmount.plus(remainingAmount);
-      }
-      processedQuantityMap.set(key, processedQty + availableQty);
-    }
-    return {
-      products: result,
-      originalAmount: originalAmount.toNumber(),
-      finalAmount: finalAmount.toNumber()
-    };
-  }
-  normalizePositiveInteger(value, fallback) {
-    const n = Math.floor(Number(value));
-    return Number.isFinite(n) && n > 0 ? n : fallback;
-  }
-  getAvailablePromotionQuantity(products, processedQuantityMap, matchedBundleIndexMap) {
-    let total = 0;
-    for (const product of products) {
-      const key = this.getProductKey(product);
-      const processedQty = processedQuantityMap.get(key) || 0;
-      const availableQty = product.quantity - processedQty;
-      if (availableQty <= 0)
-        continue;
-      const matchedBundleIndex = matchedBundleIndexMap == null ? void 0 : matchedBundleIndexMap.get(product.id);
-      if (matchedBundleIndex !== void 0 && product.bundle) {
-        const bundleItem = product.bundle[matchedBundleIndex];
-        total += availableQty * ((bundleItem == null ? void 0 : bundleItem.quantity) || 1);
-      } else {
-        total += availableQty;
-      }
-    }
-    return total;
-  }
-  buildItemRewardTargetUnits(products, processedQuantityMap, detail) {
-    const units = [];
-    for (const product of products) {
-      const key = this.getProductKey(product);
-      const processedQty = processedQuantityMap.get(key) || 0;
-      const availableQty = product.quantity - processedQty;
-      if (availableQty <= 0)
-        continue;
-      const originalPrice = new import_decimal.default(product.price || 0);
-      const finalPrice = this.resolveItemRewardFinalPrice(originalPrice, detail);
-      const discountAmount = originalPrice.minus(finalPrice);
-      if (discountAmount.lte(0))
-        continue;
-      for (let i = 0; i < availableQty; i++) {
-        units.push({
-          product,
-          originalPrice,
-          finalPrice,
-          discountAmount
-        });
-      }
-    }
-    return units;
-  }
-  resolveItemRewardFinalPrice(originalPrice, detail) {
-    const rewardValue = new import_decimal.default(Number(detail.rewardValue) || 0);
-    let finalPrice;
-    switch (detail.rewardMethod) {
-      case "percent_off": {
-        const percent = import_decimal.default.min(100, import_decimal.default.max(0, rewardValue));
-        finalPrice = originalPrice.mul(new import_decimal.default(100).minus(percent)).div(100);
-        break;
-      }
-      case "amount_off":
-        finalPrice = originalPrice.minus(import_decimal.default.max(0, rewardValue));
-        break;
-      case "fixed_price":
-        finalPrice = import_decimal.default.max(0, rewardValue);
-        break;
-      case "free":
-      default:
-        finalPrice = new import_decimal.default(0);
-        break;
-    }
-    return import_decimal.default.max(0, import_decimal.default.min(originalPrice, finalPrice)).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-  }
-  resolveItemRewardLimit(detail, conditionQuantity, triggerQuantity, rewardQuantity, targetUnitCount) {
-    let limit = 0;
-    switch (detail.quantityRule) {
-      case "all_targets":
-        limit = targetUnitCount;
-        break;
-      case "max_per_order":
-        limit = this.normalizePositiveInteger(
-          detail.maxRewardQuantity ?? detail.rewardQuantity,
-          rewardQuantity
-        );
-        break;
-      case "per_condition_quantity":
-      default:
-        limit = Math.floor(conditionQuantity / triggerQuantity) * rewardQuantity;
-        break;
-    }
-    return Math.min(Math.max(0, limit), targetUnitCount);
-  }
   /**
    * 获取未参与任何促销的商品
    */
@@ -1065,17 +839,8 @@ var PromotionEvaluator = class {
    * 检查商品是否在策略的适用范围内
    */
   isProductInStrategy(product, config) {
-    if (this.shouldSkipStrategyForProduct(product, config)) {
-      return false;
-    }
     return this.getProductMatchInfo(product, config).isMatch;
   }
-  shouldSkipStrategyForProduct(product, config) {
-    return Boolean(product._promotionOnlyForItemReward) && !this.hasActionType(config, import_type.PROMOTION_ACTION_TYPES.ITEM_REWARD);
-  }
-  hasActionType(config, actionType) {
-    return (config.actions || []).some((action) => (action == null ? void 0 : action.type) === actionType);
-  }
   /**
    * 查找商品匹配规则
    */

package/lib/model/strategy/adapter/promotion/examples.d.ts

@@ -136,89 +136,3 @@ export declare const BUY_X_GET_Y_FREE_STRATEGY: {
         };
     }[];
 };
-/**
- * ITEM_REWARD 策略配置示例：儿童票触发婴儿票免费
- *
- * 业务规则：
- * - 条件商品：儿童票（conditions.rules.productIdAndVariantId）
- * - 奖励商品：购物车/订单内已经存在的婴儿票（actions[0].config.rewardTargets）
- * - 本 action 不自动新增婴儿票；每次购物车变更后由统一促销链路重算
- *
- * 字段说明：
- * - type: "ITEM_REWARD" 表示商品奖励 action
- * - target: "product" 表示本期只奖励商品行
- * - config.rewardTargets: 奖励对象数组，支持 { product_id, product_variant_id }
- * - config.targetSelection: "consumer_best" 表示目标商品超额时选择节省金额最高的商品
- * - value.rewardMethod:
- *   - "free": 目标商品最终价为 0
- *   - "percent_off": 百分比折扣，rewardValue 为 0-100
- *   - "amount_off": 每个目标商品固定减免 rewardValue
- *   - "fixed_price": 目标商品最终单价为 rewardValue
- * - value.quantityRule:
- *   - "per_condition_quantity": 每满足 triggerQuantity 个条件商品，奖励 rewardQuantity 个目标商品
- *   - "all_targets": 满足条件后奖励全部目标商品
- *   - "max_per_order": 满足条件后每单最多奖励 maxRewardQuantity 个目标商品
- */
-export declare const ITEM_REWARD_STRATEGY: {
-    metadata: {
-        id: string;
-        name: {
-            en: string;
-            'zh-CN': string;
-            'zh-HK': string;
-        };
-        type: string;
-        custom: {
-            display: {
-                product_card: {
-                    text: {
-                        en: string;
-                        'zh-CN': string;
-                        'zh-HK': string;
-                    };
-                    type: string;
-                };
-            };
-        };
-    };
-    conditions: {
-        operator: string;
-        rules: ({
-            type: string;
-            field: string;
-            value: string;
-            operator: string;
-        } | {
-            type: string;
-            field: string;
-            value: {
-                product_id: number;
-                product_variant_id: number;
-            }[];
-            operator: string;
-        })[];
-        actionIds: string[];
-    };
-    actions: {
-        id: string;
-        type: string;
-        value: {
-            rewardMethod: string;
-            rewardValue: number;
-            quantityRule: string;
-            triggerQuantity: number;
-            rewardQuantity: number;
-            maxRewardQuantity: number;
-        };
-        valueType: string;
-        target: string;
-        priority: number;
-        config: {
-            rewardTargets: {
-                product_id: number;
-                product_variant_id: number;
-            }[];
-            targetSelection: string;
-        };
-    }[];
-};