@pisell/pisellos 2.3.23 → 2.3.24

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

@@ -68,6 +68,10 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
+export interface DiscountPrepareConfigResult {
+    discountList: Discount[];
+    availableWalletIds: number[];
+}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -75,6 +75,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
+    getAvailableWalletIds(): number[];
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
@@ -464,7 +465,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/dist/modules/Order/index.js

@@ -295,14 +295,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!this.store.summary) {
                 this.store.summary = createEmptySummary();
               }
+              if (!Array.isArray(this.store.availableWalletIds)) {
+                this.store.availableWalletIds = [];
+              }
               this.request = this.core.getPlugin('request');
               appPlugin = this.core.getPlugin('app');
               if (appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('Order 模块需要 app 插件支持');
-            case 8:
+            case 9:
               app = appPlugin.getApp();
               this.logger = app.logger;
               this.window = this.core.getPlugin('window');
@@ -315,7 +318,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 20:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -492,7 +495,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
+        var orderId, prepareConfigResult, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -504,14 +507,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
+                with_available_wallet_flag: 1,
+                with_available_wallet_pass_flag: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
               } : {}));
             case 3:
-              discountList = _context3.sent;
+              prepareConfigResult = _context3.sent;
+              discountList = prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList;
+              this.store.availableWalletIds = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.availableWalletIds) || [];
               if (!discountList) {
-                _context3.next = 16;
+                _context3.next = 18;
                 break;
               }
               currentDiscountList = ((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || [];
@@ -532,17 +539,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return true;
               });
               mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(currentScanDiscounts), _toConsumableArray(runtimeDiscounts));
-              _context3.next = 14;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 14:
               _context3.next = 16;
-              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
             case 16:
+              _context3.next = 18;
+              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
+            case 18:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 18:
+            case 20:
             case "end":
               return _context3.stop();
           }
@@ -559,6 +566,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _this$store$discount5;
       return ((_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.getDiscountList()) || [];
     }
+  }, {
+    key: "getAvailableWalletIds",
+    value: function getAvailableWalletIds() {
+      return Array.isArray(this.store.availableWalletIds) ? _toConsumableArray(this.store.availableWalletIds) : [];
+    }
   }, {
     key: "ensureEditDiscountConfigForProductChange",
     value: function () {
@@ -3118,6 +3130,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextCustomerId = (_tempOrder$customer_i5 = tempOrder.customer_id) !== null && _tempOrder$customer_i5 !== void 0 ? _tempOrder$customer_i5 : null;
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
+        this.store.availableWalletIds = [];
         clearTempOrderHolderAssignments(tempOrder);
         this.clearCustomerBoundDiscounts(tempOrder);
         this.applyDiscount();
@@ -3162,6 +3175,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.email = '';
       tempOrder.customer = null;
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
+      this.store.availableWalletIds = [];
       this.clearCustomerBoundDiscounts(tempOrder);
       this.persistTempOrder();
       this.saveDraftInBackground();

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

@@ -309,6 +309,7 @@ export interface OrderState {
     lastOrderInfo?: Record<string, any>;
     syncState?: OrderSyncState;
     discountList: any[];
+    availableWalletIds?: number[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
@@ -775,6 +776,7 @@ export interface OrderModuleAPI {
         apply?: boolean;
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
+    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -9,6 +9,26 @@ export interface ProductCollection {
     /** 商品集合封面 */
     cover: string;
 }
+/**
+ * 商品 Data Variant 记录，结构与后端 data_variant 表对齐。
+ */
+export interface ProductDataVariant {
+    /** 变体记录 id */
+    id: number;
+    /** 店铺 id */
+    shop_id: number;
+    /** 所属模块，商品场景固定为 product */
+    module: string;
+    /** 模块数据 id，商品场景对应 product.id */
+    module_data_id: number;
+    /** 关联 data_variant_rule.id */
+    data_variant_rule_id: number;
+    /** 命中策略后覆盖到商品上的字段 */
+    data: Record<string, any>;
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 /**
  * 商品基本信息接口
  */
@@ -214,6 +234,8 @@ export interface ProductData {
     bundle_group_count: number;
     /** 选项组数量 */
     option_group_count: number;
+    /** 智能定价变体列表，/product/query with dataVariants 返回 */
+    data_variants?: ProductDataVariant[];
     /** 服务时长 */
     service_times?: any;
 }

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

@@ -26,7 +26,7 @@ export declare class ProductList extends BaseModule implements Module {
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
     getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/dist/modules/ProductList/index.js

@@ -152,6 +152,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           extension_type,
           _ref$status,
           status,
+          strategy_context,
           options,
           userPlugin,
           customer_id,
@@ -162,7 +163,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status;
+              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
               options = _args4.length > 1 ? _args4[1] : undefined;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
@@ -206,7 +207,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 is_eject: 1,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                extension_type: extension_type
+                extension_type: extension_type,
+                strategy_context: strategy_context
               }, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,

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

@@ -12,6 +12,8 @@ export interface ProductListLoadProductsParams {
     with_schedule?: number;
     extension_type?: string[];
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 export interface ProductListData {
     list: ProductData[];

package/dist/server/index.d.ts

@@ -47,6 +47,8 @@ declare class Server {
     private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
+    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
+    private productQueryScheduleTimers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -210,6 +212,48 @@ declare class Server {
      * 根据 subscriberId 移除商品查询订阅者
      */
     removeProductQuerySubscriber(subscriberId?: string): void;
+    /**
+     * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
+     */
+    private buildProductQueryResultPayload;
+    /**
+     * 是否启用商品 query 订阅的 schedule 时间点定时重算。
+     * strategy_context.enable_schedule_reload === false 时关闭。
+     */
+    private shouldScheduleProductQueryReload;
+    /**
+     * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
+     */
+    private clearSubscriberScheduleTimers;
+    /**
+     * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
+     */
+    private removeScheduleTimerRef;
+    /**
+     * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
+     */
+    private computeScheduleTimePointDelayMs;
+    /**
+     * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
+     */
+    private refreshSubscriberScheduleAtExecution;
+    /**
+     * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
+     * 必须先 clearSubscriberScheduleTimers，再调用本方法。
+     */
+    private scheduleSubscriberTimePointReloads;
+    /**
+     * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
+     */
+    private onScheduleTimePointTimerFire;
+    /**
+     * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
+     */
+    private recomputeAndNotifySubscriber;
+    /**
+     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
+     */
+    private syncProductQueryScheduleTimers;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -570,6 +614,12 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
+    /**
+     * 构建商品格式化上下文。
+     *
+     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
+     */
+    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发