@pisell/pisellos 2.3.28 → 2.3.29

package/dist/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -2,7 +2,7 @@
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
  * - 纯函数：不依赖任何运行时模块/插件，便于单测与 view-model 适配
- * - products 保留 tempOrder / 后端详情原字段，仅做浅拷贝，避免丢失 product_sku 等协议字段
+ * - products 保留 tempOrder / 后端详情原字段，仅规范化集合身份并浅拷贝，避免丢失 product_sku 等协议字段
  * - bookings 平铺保留服务端原顺序，同时输出 byProductUid 反查表与 rootBooking
  * - header 收敛"非数组顶层字段"，便于 ticketBooking view-model 直接消费
  *
@@ -130,7 +130,7 @@ export interface ISalesDetail {
     customer: ISalesDetailCustomer | null;
     /** 服务端 summary（仅输出） */
     summary: Record<string, any>;
-    /** 原始响应快照，方便 UI 兜底使用 */
+    /** 规范化后的响应快照，方便 UI 兜底使用 */
     raw: Record<string, any>;
 }
 /**
@@ -138,7 +138,7 @@ export interface ISalesDetail {
  *
  * 注意：
  * - 入参允许是 `{ data: OrderData }` 或直接 `OrderData`，自动识别。
- * - products 保留原字段；字段补齐由 OrderModule hydrate 负责。
+ * - products/bookings/payments 在此补齐集合身份；其余 runtime 字段由 OrderModule hydrate 负责。
  * - 不做远程请求；不修改入参；返回新对象。
  */
 export declare function parseSalesResponse(input: Record<string, any> | null | undefined): ISalesDetail;

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

@@ -11,7 +11,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
  * - 纯函数：不依赖任何运行时模块/插件，便于单测与 view-model 适配
- * - products 保留 tempOrder / 后端详情原字段，仅做浅拷贝，避免丢失 product_sku 等协议字段
+ * - products 保留 tempOrder / 后端详情原字段，仅规范化集合身份并浅拷贝，避免丢失 product_sku 等协议字段
  * - bookings 平铺保留服务端原顺序，同时输出 byProductUid 反查表与 rootBooking
  * - header 收敛"非数组顶层字段"，便于 ticketBooking view-model 直接消费
  *
@@ -23,6 +23,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  * - 不在此处发明等价关系；UI 侧（ticketBooking）若需要别的字段，由 view-model 适配层做转换
  */
 
+import { normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 /** OrderData 中除大数组外的"顶层 header 字段"白名单，按需扩展。 */
 var HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
 function pickHeader(raw) {
@@ -108,19 +109,16 @@ function indexBookingsByProductUid(bookings) {
  *
  * 注意：
  * - 入参允许是 `{ data: OrderData }` 或直接 `OrderData`，自动识别。
- * - products 保留原字段；字段补齐由 OrderModule hydrate 负责。
+ * - products/bookings/payments 在此补齐集合身份；其余 runtime 字段由 OrderModule hydrate 负责。
  * - 不做远程请求；不修改入参；返回新对象。
  */
 export function parseSalesResponse(input) {
-  var raw = input && _typeof(input) === 'object' && input.data && input.order_id == null ? input.data : input || {};
+  var sourceRaw = input && _typeof(input) === 'object' && input.data && input.order_id == null ? input.data : input || {};
+  var raw = normalizeOrderCollections(sourceRaw).order;
   var productsRaw = Array.isArray(raw === null || raw === void 0 ? void 0 : raw.products) ? raw.products : [];
-  var products = productsRaw.map(function (p, index) {
+  var products = productsRaw.map(function (p) {
     var row = _objectSpread({}, p || {});
     var metadata = row.metadata && _typeof(row.metadata) === 'object' ? _objectSpread({}, row.metadata) : {};
-    if (!metadata.unique_identification_number) {
-      var _row$product_id, _row$product_variant_;
-      metadata.unique_identification_number = "sales-product-".concat((_row$product_id = row.product_id) !== null && _row$product_id !== void 0 ? _row$product_id : 'unknown', "-").concat((_row$product_variant_ = row.product_variant_id) !== null && _row$product_variant_ !== void 0 ? _row$product_variant_ : 0, "-").concat(index);
-    }
     delete metadata.price_schema_version;
     delete row.identity_key;
     return _objectSpread(_objectSpread({}, row), {}, {

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

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

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -441,7 +441,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

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

@@ -83,6 +83,8 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

package/dist/solution/ShopDiscount/index.js

@@ -756,7 +756,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -777,7 +777,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 order_id: orderId
               } : {}));
             case 5:
-              goodPassList = _context9.sent;
+              prepareConfigResult = _context9.sent;
+              goodPassList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList) || [];
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -789,35 +790,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context9.next = 13;
+              _context9.next = 14;
               return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
-            case 13:
+            case 14:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context9.next = 20;
+                _context9.next = 21;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 20;
+              _context9.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 20:
-              _context9.next = 22;
+            case 21:
+              _context9.next = 23;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 22:
-              _context9.next = 27;
+            case 23:
+              _context9.next = 28;
               break;
-            case 24:
-              _context9.prev = 24;
+            case 25:
+              _context9.prev = 25;
               _context9.t0 = _context9["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
-            case 27:
+            case 28:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 24]]);
+        }, _callee9, this, [[0, 25]]);
       }));
       function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -0,0 +1,50 @@
+import type { EvaluationResult, RuntimeContext } from '../../type';
+import type { BusinessAdapter } from '../type';
+import type { DataVariantBusinessData, DataVariantProduct } from './type';
+/**
+ * Data Variant 适配器。
+ *
+ * 负责把智能定价运行态数据转换为 StrategyEngine 能识别的 attributes。
+ */
+export declare class DataVariantAdapter implements BusinessAdapter {
+    name: string;
+    version: string;
+    /**
+     * 准备批量全局上下文。
+     *
+     * 这里只放不依赖单个商品的字段，用于预计算 schedule/channel/orderType 等条件。
+     */
+    prepareContext(businessData: DataVariantBusinessData): RuntimeContext;
+    /**
+     * 准备全局预计算上下文。
+     */
+    prepareGlobalContext(businessData: DataVariantBusinessData): RuntimeContext;
+    /**
+     * 准备单商品上下文。
+     *
+     * 商品级条件只在当前商品 data_variants 引用到对应规则后才评估。
+     */
+    prepareProductContext(businessData: DataVariantBusinessData, product: DataVariantProduct): RuntimeContext;
+    transformResult(result: EvaluationResult): EvaluationResult;
+    formatConfig(result: EvaluationResult, businessData?: DataVariantBusinessData): {
+        result: EvaluationResult;
+        businessData?: DataVariantBusinessData;
+    };
+    /**
+     * 构建 menu_match 使用的轻量商品对象。
+     *
+     * collection_ids 来自商品 collection 字段，避免 operator 读取复杂商品对象。
+     */
+    buildProductValue(product: DataVariantProduct): {
+        id: number;
+        product_variant_id: number;
+        collection_ids: number[];
+    };
+    private toNumber;
+    /**
+     * 归一化客户 id：无效值返回 undefined，有效值统一为 number。
+     */
+    private normalizeCustomerId;
+    private normalizeNumberArray;
+}
+export default DataVariantAdapter;

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

@@ -0,0 +1,149 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/dataVariant/adapter.ts
+var adapter_exports = {};
+__export(adapter_exports, {
+  DataVariantAdapter: () => DataVariantAdapter,
+  default: () => adapter_default
+});
+module.exports = __toCommonJS(adapter_exports);
+var DataVariantAdapter = class {
+  constructor() {
+    this.name = "DataVariantAdapter";
+    this.version = "1.0.0";
+  }
+  /**
+   * 准备批量全局上下文。
+   *
+   * 这里只放不依赖单个商品的字段，用于预计算 schedule/channel/orderType 等条件。
+   */
+  prepareContext(businessData) {
+    return this.prepareGlobalContext(businessData);
+  }
+  /**
+   * 准备全局预计算上下文。
+   */
+  prepareGlobalContext(businessData) {
+    const {
+      products,
+      scheduleDateTime,
+      channel,
+      orderType,
+      businessCode,
+      customerId,
+      availableWalletIds,
+      custom
+    } = businessData;
+    const normalizedCustomerId = this.normalizeCustomerId(customerId);
+    const normalizedAvailableWalletIds = this.normalizeNumberArray(availableWalletIds ?? (custom == null ? void 0 : custom.available_wallet_ids));
+    const resolvedBusinessCode = businessCode || (custom == null ? void 0 : custom.business_code) || (custom == null ? void 0 : custom.businessCode) || "";
+    return {
+      entities: {
+        products
+      },
+      attributes: {
+        ...custom,
+        schedule: scheduleDateTime || "",
+        channel: channel || (custom == null ? void 0 : custom.channel) || "",
+        orderType: orderType || (custom == null ? void 0 : custom.orderType) || (custom == null ? void 0 : custom.order_type) || "",
+        // snake_case 与策略配置 field 对齐；customerId 保留兼容旧配置
+        customer_id: normalizedCustomerId,
+        customerId: normalizedCustomerId,
+        available_wallet_ids: normalizedAvailableWalletIds,
+        availableWalletIds: normalizedAvailableWalletIds,
+        business_code: resolvedBusinessCode
+      },
+      metadata: {
+        timestamp: Date.now()
+      }
+    };
+  }
+  /**
+   * 准备单商品上下文。
+   *
+   * 商品级条件只在当前商品 data_variants 引用到对应规则后才评估。
+   */
+  prepareProductContext(businessData, product) {
+    const base = this.prepareGlobalContext(businessData);
+    const productValue = this.buildProductValue(product);
+    return {
+      ...base,
+      entities: {
+        ...base.entities,
+        currentProduct: product
+      },
+      attributes: {
+        ...base.attributes,
+        product: productValue,
+        productIdAndVariantId: {
+          product_id: productValue.id,
+          product_variant_id: productValue.product_variant_id
+        }
+      }
+    };
+  }
+  transformResult(result) {
+    return result;
+  }
+  formatConfig(result, businessData) {
+    return { result, businessData };
+  }
+  /**
+   * 构建 menu_match 使用的轻量商品对象。
+   *
+   * collection_ids 来自商品 collection 字段，避免 operator 读取复杂商品对象。
+   */
+  buildProductValue(product) {
+    const productId = this.toNumber(product.id ?? product.product_id);
+    const variantId = this.toNumber(
+      product.product_variant_id ?? product.variant_id
+    );
+    const collectionIds = Array.isArray(product.collection) ? product.collection.map((item) => this.toNumber(item == null ? void 0 : item.id)).filter((id) => id > 0) : [];
+    return {
+      id: productId,
+      product_variant_id: variantId,
+      collection_ids: collectionIds
+    };
+  }
+  toNumber(value) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : 0;
+  }
+  /**
+   * 归一化客户 id：无效值返回 undefined，有效值统一为 number。
+   */
+  normalizeCustomerId(value) {
+    if (value === void 0 || value === null || value === "") {
+      return void 0;
+    }
+    const parsed = Number(value);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
+  }
+  normalizeNumberArray(value) {
+    if (!Array.isArray(value))
+      return [];
+    const ids = value.map((item) => Number(item)).filter((item) => Number.isFinite(item) && item > 0);
+    return Array.from(new Set(ids));
+  }
+};
+var adapter_default = DataVariantAdapter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DataVariantAdapter
+});

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

@@ -0,0 +1,89 @@
+import type { ConditionRule, StrategyConfig } from '../../type';
+import type { ConditionScope, DataVariantBusinessData, DataVariantMenu, DataVariantRuleMetadata, MenuScope, ResolvedDataVariantResult } from './type';
+/**
+ * Data Variant 评估器。
+ *
+ * 当前阶段只提供策略模型能力和示例验证，不接入 ProductList 业务链路。
+ */
+export declare class DataVariantEvaluator {
+    private adapter;
+    private strategyConfigs;
+    constructor();
+    /**
+     * 设置策略配置列表，仅保留 metadata.type === 'data_variant' 的策略。
+     */
+    setStrategyConfigs(configs: StrategyConfig[]): void;
+    getStrategyConfigs(): StrategyConfig<DataVariantRuleMetadata>[];
+    /**
+     * 批量解析商品 Data Variant。
+     *
+     * 先执行全局预计算，再只针对商品自身 data_variants 引用到的规则做商品级判断。
+     */
+    resolveProducts(businessData: DataVariantBusinessData): ResolvedDataVariantResult;
+    /**
+     * 根据 operator/field 判断条件是否依赖当前商品。
+     */
+    getConditionScope(rule: ConditionRule): ConditionScope;
+    /**
+     * 将餐牌 partyroom_package 预构建为 Map/Set 索引。
+     */
+    buildMenuScopeMap(menuList: DataVariantMenu[]): Map<number, MenuScope>;
+    /**
+     * 从当前策略中所有 schedule_match.value 绑定的 schedule_id 提取时间点。
+     *
+     * 这里不依赖餐牌，只读取策略配置和调用方传入的 scheduleList。
+     */
+    buildScheduleTimePoints(strategyConfigs: StrategyConfig<DataVariantRuleMetadata>[], scheduleList: NonNullable<DataVariantBusinessData['scheduleList']>): string[];
+    private buildGlobalEffectiveRuleMap;
+    private resolveProduct;
+    /**
+     * 解析套餐子商品上的 Data Variant 覆盖。
+     *
+     * bundle_item 以 bundle_product_id / bundle_variant_id 作为商品身份参与 product_match 等条件判断。
+     */
+    private resolveProductBundleItems;
+    /**
+     * 将 bundle_item 转为 DataVariantProduct 并评估 data_variants。
+     */
+    private resolveBundleItem;
+    /**
+     * bundle_item 的商品身份映射：bundle_product_id + bundle_variant_id。
+     */
+    private toBundleItemDataVariantProduct;
+    /**
+     * 仅回写命中的字段，避免污染 bundle_item 的结构字段。
+     */
+    private mergeBundleItemResolvedData;
+    private evaluateProductRules;
+    /**
+     * 拆分策略条件。
+     *
+     * 当前 MVP 支持顶层 and 原子条件拆分；复杂条件保守地放到商品级完整判断。
+     */
+    private splitStrategyConfig;
+    private createEngine;
+    private evaluateScheduleMatch;
+    private evaluateMenuMatch;
+    private evaluateArrayIntersects;
+    private collectScheduleIdsFromStrategies;
+    private extractTimePointsFromSchedules;
+    private addDateTimePoint;
+    private addRawTimePoint;
+    private extractTimeFromDateTime;
+    private normalizeTime;
+    private timeToMinutes;
+    private isProductInMenuScope;
+    private mergeMatchedVariants;
+    private getProductDataVariants;
+    private normalizeStrategyConfigs;
+    private isStrategyActive;
+    private getStrategyPriority;
+    private createAlwaysTrueConditions;
+    private flattenConditionRules;
+    private isConditionGroup;
+    private normalizeNumberArray;
+    private normalizeComparableArray;
+    private buildProductKey;
+    private toNumber;
+}
+export default DataVariantEvaluator;