@pisell/pisellos 2.3.101 → 2.3.103

package/dist/model/strategy/adapter/dataVariant/type.d.ts

@@ -35,6 +35,10 @@ export interface DataVariantItem {
     module_data_id?: number;
     /** 关联策略模型 metadata.id / data_variant_rule.id */
     data_variant_rule_id: number | string;
+    /** 业务类型；多货币结算候选不会走普通字段覆盖 */
+    business_type?: 'multi_currency_settlement' | string;
+    /** 数据状态；多货币结算仅处理 enable 记录 */
+    status?: 'enable' | 'disable' | string;
     /** 命中策略后需要覆盖到商品上的字段 */
     data: Record<string, any>;
     created_at?: string | null;
@@ -53,11 +57,30 @@ export interface DataVariantProduct {
         id?: number | string;
         [key: string]: any;
     }>;
+    /**
+     * 商品接口已经完成规则计算时返回的命中结果。
+     * 数组按 Data Variant 优先级从高到低排列；空数组表示已计算但无命中。
+     */
+    metadata?: {
+        data_variant_ids?: Array<number | string>;
+        [key: string]: any;
+    };
     /** 后端 /product/query with dataVariants 返回的智能定价变体列表 */
     data_variants?: DataVariantItem[];
+    /** 当前上下文解析后的可选结算货币，不覆盖商品原始多货币配置 */
+    available_settlement_options?: AvailableSettlementOption[];
     _dataVariant?: DataVariantAppliedInfo;
     [key: string]: any;
 }
+export interface AvailableSettlementOption extends Record<string, any> {
+    settlement_type: 'legal_currency' | 'virtual_currency' | string;
+    currency_product_id?: number;
+    price: string;
+    data_variant_id?: number;
+    data_variant_rule_id: number | string;
+    available: boolean;
+    disabled_reason?: string;
+}
 /**
  * 餐牌商品配置项。
  */
@@ -131,6 +154,8 @@ export interface MatchedDataVariant {
  */
 export interface DataVariantAppliedInfo {
     appliedRuleIds: string[];
+    /** 本地策略实际应用的 Data Variant ID，按优先级从高到低排列。 */
+    appliedVariantIds?: Array<number | string>;
     appliedFields: string[];
     original: DataVariantProduct;
 }

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -192,10 +192,11 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref11, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref12, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref13, _booking$id;
+  var _ref11, _sourceProduct$holder, _sourceProduct$origin, _product$metadata, _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref12, _product$note, _booking$detail2, _product$metadata2, _product$metadata3, _ref13, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref14, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
+  var holderConfig = (_ref11 = (_sourceProduct$holder = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config) !== null && _sourceProduct$holder !== void 0 ? _sourceProduct$holder : sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$origin = sourceProduct.origin) === null || _sourceProduct$origin === void 0 ? void 0 : _sourceProduct$origin.holder_config) !== null && _ref11 !== void 0 ? _ref11 : (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.holder_config;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
   var selling = Number((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
@@ -229,7 +230,7 @@ export function buildCacheItemFromOrderLine(input) {
     quantity: (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : 1,
     product_name: productTitle,
     product_cover: productCover,
-    note: (_ref11 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref11 !== void 0 ? _ref11 : '',
+    note: (_ref12 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref12 !== void 0 ? _ref12 : '',
     price: mainProductPrice,
     total: selling,
     origin_total: original,
@@ -238,7 +239,7 @@ export function buildCacheItemFromOrderLine(input) {
     holder_id: holderId,
     other: other,
     like_status: booking.like_status || 'common',
-    discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_reason) || undefined
+    discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.product_discount_reason) || undefined
   }, bundleEdit !== undefined ? {
     bundle_edit: bundleEdit
   } : {}), productOptionString ? {
@@ -254,7 +255,7 @@ export function buildCacheItemFromOrderLine(input) {
       extend.origin_total = selling + manualAmount;
     }
   }
-  if (((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.price_override) != null || manualDiscount) {
+  if (((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.price_override) != null || manualDiscount) {
     extend.priceOverride = selling;
   }
   if (booking.holder !== undefined) {
@@ -263,10 +264,12 @@ export function buildCacheItemFromOrderLine(input) {
   if (Array.isArray(booking.relation_forms)) {
     extend.relation_forms = booking.relation_forms;
   }
-  var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), holderConfig !== undefined && holderConfig !== null ? {
+    holder_config: holderConfig
+  } : {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (_ref12 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref12 !== void 0 ? _ref12 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
+    extension_type: (_ref13 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
     title: productTitle || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || (booking === null || booking === void 0 || (_booking$product3 = booking.product) === null || _booking$product3 === void 0 ? void 0 : _booking$product3.title),
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
@@ -280,7 +283,7 @@ export function buildCacheItemFromOrderLine(input) {
     new: 0,
     autoClose: false,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    booking_id: (_ref13 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref13 !== void 0 ? _ref13 : 0
+    booking_id: (_ref14 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref14 !== void 0 ? _ref14 : 0
   });
   if ((sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.capacity) !== undefined) {
     base.capacity = sourceProduct.capacity;

package/dist/modules/Discount/index.d.ts

@@ -25,9 +25,11 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_wallet_pass_holder: 0 | 1;
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
+        with_virtual_currency?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
+    private normalizeVirtualCurrencyList;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/dist/modules/Discount/index.js

@@ -165,8 +165,8 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _params$with_availabl, _params$with_availabl2, _prepareConfig$data, _prepareConfig$data2, _prepareConfig$data3, _prepareConfig$data4, _prepareConfig$data5;
-        var prepareConfig, rawDiscountList, availableWalletList, availableWalletPassList, availableWalletIds, goodPassList;
+        var _params$with_availabl, _params$with_availabl2, _params$with_virtual_, _prepareConfig$data, _prepareConfig$data2, _prepareConfig$data3, _prepareConfig$data4, _prepareConfig$data5, _prepareConfig$data6;
+        var prepareConfig, rawDiscountList, availableWalletList, availableWalletPassList, availableWalletIds, virtualCurrencyList, goodPassList;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -176,7 +176,8 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               _context4.next = 3;
               return this.request.post("/order/prepare/config", _objectSpread(_objectSpread({}, params), {}, {
                 with_available_wallet_flag: (_params$with_availabl = params.with_available_wallet_flag) !== null && _params$with_availabl !== void 0 ? _params$with_availabl : 1,
-                with_available_wallet_pass_flag: (_params$with_availabl2 = params.with_available_wallet_pass_flag) !== null && _params$with_availabl2 !== void 0 ? _params$with_availabl2 : 1
+                with_available_wallet_pass_flag: (_params$with_availabl2 = params.with_available_wallet_pass_flag) !== null && _params$with_availabl2 !== void 0 ? _params$with_availabl2 : 1,
+                with_virtual_currency: (_params$with_virtual_ = params.with_virtual_currency) !== null && _params$with_virtual_ !== void 0 ? _params$with_virtual_ : 1
               }));
             case 3:
               prepareConfig = _context4.sent;
@@ -188,12 +189,14 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               })), _toConsumableArray(availableWalletPassList.map(function (item) {
                 return item === null || item === void 0 ? void 0 : item.product_id;
               }))));
+              virtualCurrencyList = this.normalizeVirtualCurrencyList(prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data6 = prepareConfig.data) === null || _prepareConfig$data6 === void 0 ? void 0 : _prepareConfig$data6.virtual_currency_list);
               goodPassList = this.filterEnabledDiscountList(rawDiscountList) || []; // this.setDiscountList(goodPassList);
               return _context4.abrupt("return", {
                 discountList: goodPassList,
-                availableWalletIds: availableWalletIds
+                availableWalletIds: availableWalletIds,
+                virtualCurrencyList: virtualCurrencyList
               });
-            case 10:
+            case 11:
             case "end":
               return _context4.stop();
           }
@@ -204,6 +207,36 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return loadPrepareConfig;
     }()
+  }, {
+    key: "normalizeVirtualCurrencyList",
+    value: function normalizeVirtualCurrencyList(value) {
+      if (!Array.isArray(value)) return [];
+      return value.flatMap(function (item) {
+        var _item$balance;
+        var id = Number(item === null || item === void 0 ? void 0 : item.id);
+        var productId = Number(item === null || item === void 0 ? void 0 : item.product_id);
+        if (!Number.isFinite(id) || id <= 0 || !Number.isFinite(productId) || productId <= 0) {
+          return [];
+        }
+        var displayExtension = Array.isArray(item === null || item === void 0 ? void 0 : item.extension_data) ? item.extension_data.find(function (extension) {
+          return (extension === null || extension === void 0 ? void 0 : extension.field_key) === 'virtual_currency_display';
+        }) : undefined;
+        var display = displayExtension === null || displayExtension === void 0 ? void 0 : displayExtension.value;
+        if (typeof display === 'string') {
+          try {
+            display = JSON.parse(display);
+          } catch (_unused) {
+            display = {};
+          }
+        }
+        return [_objectSpread(_objectSpread({}, item), {}, {
+          id: id,
+          product_id: productId,
+          balance: String((_item$balance = item === null || item === void 0 ? void 0 : item.balance) !== null && _item$balance !== void 0 ? _item$balance : '0'),
+          virtual_currency_display: display && _typeof(display) === 'object' && !Array.isArray(display) ? display : {}
+        })];
+      });
+    }
   }, {
     key: "batchSearch",
     value: function () {

package/dist/modules/Discount/types.d.ts

@@ -71,6 +71,17 @@ export interface DiscountWithReason {
 export interface DiscountPrepareConfigResult {
     discountList: Discount[];
     availableWalletIds: number[];
+    virtualCurrencyList?: VirtualCurrencyAsset[];
+}
+export interface VirtualCurrencyAsset extends Record<string, any> {
+    id: number;
+    product_id: number;
+    balance: string;
+    product_name?: string;
+    format_title?: Record<string, any>;
+    code?: string;
+    encoded?: string;
+    virtual_currency_display?: Record<string, any>;
 }
 interface ExtensionData {
     id: number;

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

@@ -29,8 +29,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private promotionEvaluator;
     /** 赠品选择 resolver；由 SDK host bridge 注入 */
     private giftSelectResolver;
-    /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
+    /** 促销评估递归保护 flag（写路径同步评估促销，禁止重入） */
     private isApplyingPromotion;
+    /** 保持旧事件语义：同步事件监听器内触发的订单写入不得递归评估促销。 */
+    private isEmittingPromotionApplied;
     /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
     private hasActiveCustomerBoundDiscount;
     /** 最近一次 applyPromotion 的未满足促销提示 */
@@ -60,6 +62,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * orderModule.updateOtherParams({ cacheId: 'cache-2', channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /** PC/H5 属于在线店铺；其它或缺失平台统一沿用 POS 行为。 */
+    isOnlineStorePlatform(): boolean;
     /**
      * 记录信息日志
      */
@@ -82,6 +86,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
     getAvailableWalletIds(): number[];
+    getVirtualCurrencyList(): import("../Discount/types").VirtualCurrencyAsset[];
     private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
@@ -121,7 +126,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     appendPromotionTags<T extends Record<string, any>>(products: T[]): T[];
     /**
-     * 应用购物车促销：计算 → 差异化赠品 → 写回 tempOrder.products → emit onPromotionApplied。
+     * 只执行购物车促销评估与赠品写回，不发布稳定态事件。
      *
      * 调用时机：写路径（add/update/remove/clear/setCustomer）末尾自动触发；外部一般无需手动调。
      *
@@ -129,8 +134,13 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * - 不调用任何公开 CRUD API（如 removeProductFromOrder），全部内部 mutate tempOrder.products，避免事件风暴；
      * - 用 `isApplyingPromotion` 防递归；
      * - 多选项赠品依赖 giftSelectResolver，未注入则跳过且 console.warn；
-     * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
+     * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进；
+     * - 返回的 payload 只能在 applyDiscount（商品写路径还需 summary/persist）完成后发布。
      */
+    private evaluatePromotion;
+    /** 发布促销稳定态；products 必须读取折扣计算后的当前数组。 */
+    private emitPromotionApplied;
+    /** 公开入口：促销、折扣、summary 与持久化完成后发布稳定态事件。 */
     applyPromotion(): Promise<void>;
     /** 最近一次 applyPromotion 输出的未满足促销列表 */
     getUnfulfilledPromotions(): OrderUnfulfilledPromotion[];
@@ -400,6 +410,13 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * this.hasLinkedBookingUid({ metadata: { booking_uid: 'booking-1' } });
      */
     private hasLinkedBookingUid;
+    private isMultiCurrencySettlementEnabled;
+    private isActiveVirtualSettlementOrder;
+    private shouldUseVirtualSettlementSummary;
+    private normalizeVirtualSettlementProductIfEnabled;
+    private assertAndLockProductSettlement;
+    private syncTempOrderSettlementState;
+    private prepareVirtualSettlementTempOrder;
     /**
      * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
      *
@@ -420,6 +437,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * if (pending) await pending;
      */
     private appendProductLineToTempOrder;
+    /**
+     * booking 数量拆行时，若 Holder 数量与拆行数严格一致，则按下标分配。
+     * 数量不一致时保持旧数据，避免猜测 Holder 与商品份数的对应关系。
+     */
+    private createSplitBookingLine;
     /**
      * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
      *
@@ -472,6 +494,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 普通整单 note 保持不变；以商品行为主体的 Sales Notes 同步删除。
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
+    /**
+     * 切换购物车结算单位时清理所有会影响新币种的订单状态，但保留当前客户。
+     */
+    clearOrderForSettlementSwitch(): Promise<OrderTempOrder>;
     buildCurrentSubmitPayloadForLocalPrint(params?: {
         cacheId?: string;
         platform?: string;