@pisell/pisellos 2.1.173 → 2.1.175

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
@@ -23,6 +23,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'scanOrderLogger':
       return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'holder':
+      return new HolderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult, ScanOrderTempOrder } from './types';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderFulfillmentModes, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult, ScanOrderTempOrder } from './types';
 import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -75,6 +75,9 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
         service_type: 'dine_in' | '';
         pickup_reference_mode: 'counter_pickup' | 'table_service';
     };
+    setFulfillmentMode(mode: string): Record<string, any> & {
+        service_type?: string | undefined;
+    };
     setPickupRef(buzzer: string): string;
     private ensureTempOrder;
     addNewOrder(): Promise<ScanOrderTempOrder>;
@@ -147,10 +150,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     syncAdditionalOrderFromResource(resourceId?: string | null): Promise<ScanOrderSyncAdditionalOrderResult>;
     getReservationResourceSelectType(): ScanOrderReservationResourceSelectInfo;
     checkAllowAddItems(): ScanOrderAllowAddItemsInfo;
-    getFulfillmentModes(): {
-        enablePickup: boolean;
-        enableTableService: boolean;
-    };
+    getFulfillmentModes(): ScanOrderFulfillmentModes;
     checkManualPickupRef(): {
         enabled: boolean;
         manualInputType?: string;

package/dist/solution/ScanOrder/index.js

@@ -857,7 +857,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var tempOrder = this.store.order.ensureTempOrder();
         tempOrder.metadata = _objectSpread(_objectSpread({}, tempOrder.metadata || {}), {}, {
           shop_service_data: _objectSpread(_objectSpread({}, (tempOrder.metadata || {}).shop_service_data || {}), {}, {
-            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : 'take_away',
+            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : '',
             pickup_reference_mode: mode
           })
         });
@@ -874,6 +874,44 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       }
     }
 
+    // 新版履约方式直接保存配置值；旧取餐标识方式继续由 setPickupReferenceMode 处理。
+  }, {
+    key: "setFulfillmentMode",
+    value: function setFulfillmentMode(mode) {
+      this.logMethodStart('setFulfillmentMode', {
+        mode: mode
+      });
+      try {
+        var _this$getFulfillmentM = this.getFulfillmentModes(),
+          handoverModes = _this$getFulfillmentM.handoverModes;
+        var clearMode = mode === '' && (handoverModes === null || handoverModes === void 0 ? void 0 : handoverModes.length) === 0;
+        if (!clearMode && !(handoverModes !== null && handoverModes !== void 0 && handoverModes.includes(mode))) {
+          throw new Error('Fulfillment mode is not enabled');
+        }
+        if (!this.store.order) throw new Error('order 模块未初始化');
+        var tempOrder = this.store.order.ensureTempOrder();
+        var serviceData = _objectSpread({}, (tempOrder.metadata || {}).shop_service_data || {});
+        if (clearMode) {
+          delete serviceData.service_type;
+        } else {
+          serviceData.service_type = mode;
+        }
+        tempOrder.metadata = _objectSpread(_objectSpread({}, tempOrder.metadata || {}), {}, {
+          shop_service_data: serviceData
+        });
+        this.store.order.persistTempOrder();
+        this.logMethodSuccess('setFulfillmentMode', {
+          mode: mode
+        });
+        return tempOrder.metadata.shop_service_data;
+      } catch (error) {
+        this.logMethodError('setFulfillmentMode', error, {
+          mode: mode
+        });
+        throw error;
+      }
+    }
+
     // 存储用户自定义取餐标识到 tempOrder.buzzer
   }, {
     key: "setPickupRef",
@@ -3428,7 +3466,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       return result;
     }
 
-    // 读取取餐/送餐开关
+    // 新版履约方式配置存在时优先使用，缺失时保留旧取餐/送餐开关语义。
     // 依赖 checkResourceAvailable 已缓存的 dineInConfig
   }, {
     key: "getFulfillmentModes",
@@ -3436,10 +3474,25 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams20;
       this.logMethodStart('getFulfillmentModes');
       var dineInConfig = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.dineInConfig) || {};
-      var result = {
-        enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
-        enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
-      };
+      var configuredModes = dineInConfig['fulfillment.handover_mode'];
+      var result;
+      if (Object.prototype.hasOwnProperty.call(dineInConfig, 'fulfillment.handover_mode')) {
+        var handoverModes = Array.isArray(configuredModes) ? Array.from(new Set(configuredModes.filter(function (mode) {
+          return typeof mode === 'string';
+        }).map(function (mode) {
+          return mode.trim();
+        }).filter(Boolean))) : [];
+        result = {
+          enablePickup: handoverModes.includes('pick_up'),
+          enableTableService: handoverModes.includes('table_service'),
+          handoverModes: handoverModes
+        };
+      } else {
+        result = {
+          enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
+          enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
+        };
+      }
       this.logMethodSuccess('getFulfillmentModes', result);
       return result;
     }

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

@@ -27,6 +27,12 @@ export interface ScanOrderConfig {
         verifyResource: boolean;
     };
 }
+export interface ScanOrderFulfillmentModes {
+    enablePickup: boolean;
+    enableTableService: boolean;
+    /** Present only when fulfillment.handover_mode is configured, including an empty list. */
+    handoverModes?: string[];
+}
 export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
@@ -34,6 +40,7 @@ export interface ScanOrderOrderProductIdentity {
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
     product_option_item?: any[];
     product_bundle?: any[];
+    shop_id?: number | string;
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;

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

@@ -7,6 +7,7 @@ import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
+import type { IAppendFormRecordParams, IRefreshAllFormRecordsParams } from '../../modules/Holder/types';
 export * from './types';
 interface VenueBookingItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -52,6 +53,12 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
+    private resolveHolderCustomerId;
+    /**
+     * 按商品 holder_config 预加载表单数据到 holderMap。
+     * appointment_booking 在加购时触发；venueBooking 在商品加载后预加载，避免 getHolderFormMap 为空。
+     */
+    private preloadHolderForms;
     private clearLoginEffectListeners;
     private registerLoginEffect;
     private registerCustomerLoginListeners;
@@ -199,6 +206,18 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getUIState<T = any>(key: string): T | undefined;
     deleteUIState(key: string): void;
     setBookingHolder(bookingUid: string, holder: any): void;
+    /**
+     * 获取 holder 表单 map
+     */
+    getHolderFormMap(): import("../../modules/Holder").HolderFormMap;
+    /**
+     * UI 层触发：按当前 holderMap 批量刷新所有表单的 records
+     */
+    refreshAllHolderFormRecords(params?: Pick<IRefreshAllFormRecordsParams, 'customer_id' | 'useCache' | 'recordsUrl' | 'num' | 'skip'>): Promise<import("../../modules/Holder").HolderFormMap>;
+    /**
+     * 添加表单记录
+     */
+    appendFormRecord(params: IAppendFormRecordParams): import("../../modules/Holder").IFormRecord;
     checkOpenDataAvailability(): Promise<OpenDataAvailabilityResult>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;