@pisell/pisellos 0.0.546 → 0.0.549

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

@@ -0,0 +1,115 @@
+import { ProductData } from '../Product/types';
+/**
+ * 商品 holder 配置
+ */
+export interface IHolderConfig {
+    required?: number;
+    resource_id: number;
+    status?: string;
+    [key: string]: any;
+}
+/**
+ * 表单记录
+ */
+export interface IFormRecord {
+    form_id: number;
+    form_record_id: number;
+    main_field: string;
+    customer_cover?: string;
+    created_at?: string;
+    customer_id?: number;
+    [key: string]: any;
+}
+/**
+ * 表单配置/定义
+ */
+export interface IFormInfo {
+    form_id: number;
+    name: string;
+    fields?: Record<string, any>[];
+    [key: string]: any;
+}
+/**
+ * 单个 form_id 下的数据结构
+ */
+export interface IFormItemData {
+    records: IFormRecord[];
+    form: IFormInfo | Record<string, any>;
+}
+/**
+ * form_id 为 key 的 map 结构，如 948: { records: [], form: {} }
+ */
+export type HolderFormMap = Record<string, IFormItemData>;
+/**
+ * Holder 模块 reactive store，仅 holderMap 会触发 changed 事件
+ */
+export interface HolderState {
+    holderMap: HolderFormMap;
+}
+export interface IFetchFormInfoParams {
+    url?: string;
+    query: {
+        form_id: string | number;
+    };
+    useCache?: boolean;
+}
+export interface IFetchFormRecordsParams {
+    url?: string;
+    query: {
+        customer_id?: number;
+        form_id: string | number;
+        shop_id: string | number;
+        num?: number;
+        skip?: number;
+        [key: string]: any;
+    };
+    useCache?: boolean;
+}
+export interface IAddFormRecordParams {
+    url?: string;
+    body: {
+        form_id: number | string;
+        shop_id: number | string;
+        customer_id?: number;
+        [key: string]: any;
+    };
+}
+/**
+ * UI 层自行调用添加接口后，将返回记录写入 holderMap
+ */
+export interface IAppendFormRecordParams {
+    /** 接口返回的 data，或完整响应 { data: {...} } */
+    record: IFormRecord | Record<string, any>;
+    /** 可选，未传则从 record.form_id 读取 */
+    form_id?: number | string;
+}
+export interface IEnsureFormDataParams {
+    form_id: number | string;
+    shop_id: number | string;
+    customer_id?: number;
+    useCache?: boolean;
+    forceRefresh?: boolean;
+    formInfoUrl?: string;
+    recordsUrl?: string;
+    skip?: number;
+    num?: number;
+}
+export interface IEnsureFormByProductParams {
+    product: ProductData | Record<string, any>;
+    customer_id?: number;
+    shop_id?: number | string;
+    useCache?: boolean;
+}
+export interface HolderModuleAPI {
+    getHolderFormMap: () => HolderFormMap;
+    getHolderFormData: (formId: number | string) => IFormItemData | undefined;
+    setFormData: (formId: number | string, data: Partial<IFormItemData>) => void;
+    fetchFormInfo: (params: IFetchFormInfoParams) => Promise<IFormInfo | IFormInfo[]>;
+    fetchRecords: (params: IFetchFormRecordsParams) => Promise<IFormRecord[]>;
+    ensureFormData: (params: IEnsureFormDataParams) => Promise<IFormItemData>;
+    ensureFormByProduct: (params: IEnsureFormByProductParams) => Promise<IFormItemData | null>;
+    addFormRecord: (params: IAddFormRecordParams) => Promise<IFormRecord>;
+    appendFormRecord: (params: IAppendFormRecordParams) => IFormRecord;
+    removeFormRecord: (formId: number | string, formRecordId: number) => void;
+    clearFormData: (formId?: number | string) => void;
+}

package/dist/modules/Holder/types.js

@@ -0,0 +1 @@
+export {};

package/dist/modules/Holder/utils.d.ts

@@ -0,0 +1,9 @@
+import { ProductData } from '../Product/types';
+import { IHolderConfig } from './types';
+export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
+export declare function getFormIdFromHolderConfig(config: IHolderConfig): string;
+export declare function normalizeFormId(formId: number | string): string;
+export declare function createEmptyFormItemData(): {
+    records: any[];
+    form: Record<string, any>;
+};

package/dist/modules/Holder/utils.js

@@ -0,0 +1,20 @@
+export function getProductHolderConfig(product) {
+  var _product$holder_confi, _product$origin;
+  if (!product) return null;
+  var config = (_product$holder_confi = product === null || product === void 0 ? void 0 : product.holder_config) !== null && _product$holder_confi !== void 0 ? _product$holder_confi : product === null || product === void 0 || (_product$origin = product.origin) === null || _product$origin === void 0 ? void 0 : _product$origin.holder_config;
+  if (config !== null && config !== void 0 && config.status && (config === null || config === void 0 ? void 0 : config.status) !== 'enable') return null;
+  if (!(config !== null && config !== void 0 && config.resource_id)) return null;
+  return config;
+}
+export function getFormIdFromHolderConfig(config) {
+  return String(config === null || config === void 0 ? void 0 : config.resource_id);
+}
+export function normalizeFormId(formId) {
+  return String(formId);
+}
+export function createEmptyFormItemData() {
+  return {
+    records: [],
+    form: {}
+  };
+}

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

@@ -210,6 +210,13 @@ export interface ProductData {
     option_group_count: number;
     /** 服务时长 */
     service_times?: any;
+    /** holder 表单配置 */
+    holder_config?: {
+        required?: number;
+        resource_id?: number;
+        status?: string;
+        [key: string]: any;
+    };
 }
 /**
  * 商品媒体信息接口

package/dist/modules/index.d.ts

@@ -16,3 +16,4 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './Holder';

package/dist/modules/index.js

@@ -15,4 +15,5 @@ export * from "./SalesSummary";
 export * from "./Schedule";
 export * from "./Quotation";
 export * from "./ScanOrderLogger";
-export * from "./OpenData";
+export * from "./OpenData";
+export * from "./Holder";

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

@@ -10,6 +10,7 @@ import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
+import { IAppendFormRecordParams } from '../../modules/Holder/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -126,6 +127,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
+    /**
+     * 获取 holder 表单 map
+     */
+    getHolderFormMap(): import("../../modules").HolderFormMap;
+    /**
+     * 添加表单记录
+     */
+    appendFormRecord(params: IAppendFormRecordParams): import("../../modules").IFormRecord;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;

package/dist/solution/BookingByStep/index.js

@@ -118,7 +118,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   this.otherData = ((_data$this$otherParam = data[this.otherParams.cacheId]) === null || _data$this$otherParam === void 0 || (_data$this$otherParam = _data$this$otherParam[this.name]) === null || _data$this$otherParam === void 0 ? void 0 : _data$this$otherParam['otherData']) || {};
                 }
               }
-              moduleArr = ['accountList', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order'];
+              moduleArr = ['accountList', 'holder', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order'];
               moduleArr.forEach(function (step) {
                 var targetModule = createModule(step, _this2.name);
                 if (targetModule) {
@@ -644,8 +644,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _fetchHolderAccountsAsync.apply(this, arguments);
       }
       return fetchHolderAccountsAsync;
-    }() // 设置日期范围,注入到日期模块中
+    }()
+    /**
+     * 获取 holder 表单 map
+     */
     )
+  }, {
+    key: "getHolderFormMap",
+    value: function getHolderFormMap() {
+      return this.store.holder.getHolderFormMap();
+    }
+
+    /**
+     * 添加表单记录
+     */
+  }, {
+    key: "appendFormRecord",
+    value: function appendFormRecord(params) {
+      return this.store.holder.appendFormRecord(params);
+    }
+
+    // 设置日期范围,注入到日期模块中
   }, {
     key: "setDateRange",
     value: function () {
@@ -1193,6 +1212,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           account = activeAccount;
         }
       }
+      try {
+        var _account;
+        this.store.holder.ensureFormByProduct({
+          product: productData,
+          customer_id: (_account = account) !== null && _account !== void 0 && _account.id ? Number(account.id) : 16121,
+          shop_id: (productData === null || productData === void 0 ? void 0 : productData.shop_id) || '',
+          useCache: true
+        });
+      } catch (error) {
+        console.error('[BookingByStep] 加载 holder 表单失败', error);
+      }
       var flag = this.store.cart.mergeCartItemByRowKey({
         rowKey: rowKey,
         quantity: quantity,

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, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult, 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';
@@ -69,7 +69,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    getTempOrder(): import("./types").ScanOrderTempOrder | null;
+    getTempOrder(): ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
         service_type: 'dine_in';
@@ -77,8 +77,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     setPickupRef(buzzer: string): string;
     private ensureTempOrder;
-    addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
-    restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
+    addNewOrder(): Promise<ScanOrderTempOrder>;
+    restoreOrder(): Promise<ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
     getDiscountList(): Discount[];
@@ -92,6 +92,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }): Promise<void>;
     private findReservationRuleResource;
     private buildScanOrderResourceMetadata;
+    private prepareRetailAvailability;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
@@ -118,7 +119,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private normalizeResourceState;
     private resolveResourceSelectType;
     private fetchResourceOccupyDetailByResourceId;
-    checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
+    checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';