@pisell/pisellos 2.1.157 → 2.1.159

package/lib/modules/Holder/utils.js

@@ -0,0 +1,71 @@
+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/modules/Holder/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  createEmptyFormItemData: () => createEmptyFormItemData,
+  getFormIdFromHolderConfig: () => getFormIdFromHolderConfig,
+  getProductHolderConfig: () => getProductHolderConfig,
+  normalizeFormId: () => normalizeFormId,
+  resolveFormMetaFromHolderItem: () => resolveFormMetaFromHolderItem
+});
+module.exports = __toCommonJS(utils_exports);
+function getProductHolderConfig(product) {
+  var _a;
+  if (!product)
+    return null;
+  const config = (product == null ? void 0 : product.holder_config) ?? ((_a = product == null ? void 0 : product.origin) == null ? void 0 : _a.holder_config);
+  if ((config == null ? void 0 : config.status) && (config == null ? void 0 : config.status) !== "enable")
+    return null;
+  if (!(config == null ? void 0 : config.resource_id))
+    return null;
+  return config;
+}
+function getFormIdFromHolderConfig(config) {
+  return Number(config == null ? void 0 : config.resource_id);
+}
+function normalizeFormId(formId) {
+  return Number(formId);
+}
+function createEmptyFormItemData() {
+  return {
+    records: [],
+    form: {}
+  };
+}
+function resolveFormMetaFromHolderItem(mapKey, item) {
+  const formInfo = item.form || {};
+  const nestedForm = formInfo.form || {};
+  const form_id = normalizeFormId(
+    nestedForm.id ?? formInfo.form_id ?? formInfo.id ?? mapKey
+  );
+  const shop_id = nestedForm.shop_id ?? formInfo.shop_id;
+  if (shop_id === void 0 || shop_id === null || shop_id === "") {
+    return null;
+  }
+  return { form_id, shop_id };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createEmptyFormItemData,
+  getFormIdFromHolderConfig,
+  getProductHolderConfig,
+  normalizeFormId,
+  resolveFormMetaFromHolderItem
+});

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

@@ -57,6 +57,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private getTempOrderStorageKey;
     private restoreTempOrderFromStorage;
     persistTempOrder(): void;
+    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     ensureTempOrder(): ScanOrderTempOrder;
     restoreOrder(): ScanOrderTempOrder;

package/lib/modules/Order/index.js

@@ -325,6 +325,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return;
     this.window.localStorage.setItem(key, JSON.stringify(this.store.tempOrder));
   }
+  notifyTempOrderChanged() {
+    if (!this.store.tempOrder)
+      return;
+    this.store.tempOrder = {
+      ...this.store.tempOrder,
+      products: [...this.store.tempOrder.products],
+      bookings: this.store.tempOrder.bookings ? [...this.store.tempOrder.bookings] : []
+    };
+    this.persistTempOrder();
+  }
   // ─── TempOrder: 创建 & 获取 ───
   createDefaultTempOrderInstance() {
     return (0, import_utils.createDefaultTempOrder)({
@@ -595,6 +605,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
+        var _a2;
         if (!item._origin.duration) {
           const { duration, durationType } = (0, import_utils.generateDuration)(item);
           item._origin.duration = duration;
@@ -602,6 +613,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         }
         const discountList = (0, import_utils.getAllDiscountList)(item);
         item._origin.product.discount_list = discountList;
+        if ((_a2 = params == null ? void 0 : params.extraData) == null ? void 0 : _a2.is_add_holder_info) {
+          (0, import_utils.ensureCartItemOriginHolder)(item, this.window);
+        }
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

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

@@ -235,6 +235,8 @@ export interface OrderModuleAPI {
     updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder: (identity: ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
     persistTempOrder: () => void;
+    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
+    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

package/lib/modules/Order/utils.d.ts

@@ -2,6 +2,7 @@ import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
 import type { ScanOrderSubmitPayload, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
 import type { RulesParamsHooks } from '../Rules/types';
+import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -86,6 +87,15 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export interface CartOrderHolder {
+    customer_id?: number;
+    form_id: number | string;
+    form_record: (number | string)[] | null;
+}
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export declare function createUuidV4(): string;
 export declare function isTempOrder(data: any): data is ScanOrderTempOrder;

package/lib/modules/Order/utils.js

@@ -33,8 +33,9 @@ __export(utils_exports, {
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils2.createEmptySummary,
+  createEmptySummary: () => import_utils3.createEmptySummary,
   createUuidV4: () => createUuidV4,
+  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
   filterProductsForScanOrderMore: () => filterProductsForScanOrderMore,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
@@ -50,8 +51,9 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../../solution/ScanOrder/utils");
+var import_utils = require("../Holder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_utils3 = require("../../solution/ScanOrder/utils");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
   let total = new import_decimal.default(Number(mainPrice) || 0);
@@ -113,7 +115,7 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证 identity_key 必存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
+        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils2.buildProductLineFingerprint)(
           product.product_option_item,
           product.product_bundle
         )}`,
@@ -196,6 +198,34 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
+function getCustomerIdFromStorage(window) {
+  var _a;
+  try {
+    const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
+    const customerId = Number(customer == null ? void 0 : customer.id);
+    return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function ensureCartItemOriginHolder(cartItem, window) {
+  var _a;
+  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
+    return;
+  }
+  const holderConfig = (0, import_utils.getProductHolderConfig)(
+    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
+  );
+  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
+  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
+    return;
+  }
+  cartItem._origin.holder = {
+    customer_id: getCustomerIdFromStorage(window),
+    form_id: holderConfig.resource_id,
+    form_record: [formRecordId]
+  };
+}
 var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
@@ -378,7 +408,7 @@ function resolveSubmitCollectPax(tempOrder) {
   return normalizeSubmitCollectPaxValue((_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax);
 }
 function createDefaultTempOrder(params) {
-  const summary = params.summary || (0, import_utils.createEmptySummary)();
+  const summary = params.summary || (0, import_utils2.createEmptySummary)();
   return {
     order_id: null,
     relation_id: void 0,
@@ -437,7 +467,7 @@ function buildSubmitPayload(params) {
     enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
-  const summary = tempOrder.summary || (0, import_utils.createEmptySummary)();
+  const summary = tempOrder.summary || (0, import_utils2.createEmptySummary)();
   const relationId = tempOrder.relation_id;
   const tableFormId = tempOrder.table_form_id;
   const bookingUuid = createUuidV4();
@@ -540,6 +570,7 @@ function formatV1Product(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  ensureCartItemOriginHolder,
   filterProductsForScanOrderMore,
   formatDateTime,
   formatV1Product,

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

@@ -189,6 +189,13 @@ export interface ProductData {
     };
     /** 购物车行键，用于唯一标识购物车中的商品，用于相同 SKU商品合并 */
     rowKey?: string;
+    /** holder 表单配置 */
+    holder_config?: {
+        required?: number;
+        resource_id?: number;
+        status?: string;
+        [key: string]: any;
+    };
 }
 /**
  * 商品媒体信息接口

package/lib/modules/index.d.ts

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

package/lib/modules/index.js

@@ -34,6 +34,7 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
 __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
 __reExport(modules_exports, require("./OpenData"), module.exports);
+__reExport(modules_exports, require("./Holder"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -53,5 +54,6 @@ __reExport(modules_exports, require("./OpenData"), module.exports);
   ...require("./Schedule"),
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
-  ...require("./OpenData")
+  ...require("./OpenData"),
+  ...require("./Holder")
 });

package/lib/plugins/window.d.ts

@@ -14,6 +14,7 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
+    getLocalStorage?: (key: string) => string | null;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/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,20 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
+    /**
+     * 获取 holder 表单 map
+     */
+    getHolderFormMap(): import("../../modules").HolderFormMap;
+    /**
+     * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
+     */
+    refreshAllHolderFormRecords(params?: {
+        customer_id?: number;
+    }): Promise<import("../../modules").HolderFormMap>;
+    /**
+     * 添加表单记录
+     */
+    appendFormRecord(params: IAppendFormRecordParams): import("../../modules").IFormRecord;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;

package/lib/solution/BookingByStep/index.js

@@ -89,6 +89,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const moduleArr = [
       "accountList",
+      "holder",
       "cart",
       "schedule",
       "summary",
@@ -379,6 +380,27 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     return this.store.accountList.fetchHolderAccounts(params);
   }
+  /**
+   * 获取 holder 表单 map
+   */
+  getHolderFormMap() {
+    return this.store.holder.getHolderFormMap();
+  }
+  /**
+   * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
+   */
+  async refreshAllHolderFormRecords(params) {
+    return this.store.holder.refreshAllFormRecords({
+      customer_id: params == null ? void 0 : params.customer_id,
+      useCache: false
+    });
+  }
+  /**
+   * 添加表单记录
+   */
+  appendFormRecord(params) {
+    return this.store.holder.appendFormRecord(params);
+  }
   // 设置日期范围,注入到日期模块中
   async setDateRange(dateRange) {
     this.store.date.setDateRange(dateRange);
@@ -486,6 +508,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
         }
         this.updateQuotationPriceAndCart(date);
+        try {
+          const customerId = Number(accountInfo.id);
+          await this.refreshAllHolderFormRecords({
+            customer_id: customerId
+          });
+        } catch (error) {
+          console.error("[BookingByStep] 登录后刷新 holder 表单失败", error);
+        }
       }
     } else {
       throw new Error(`没有找到${accountId}账户`);
@@ -631,6 +661,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         account = activeAccount;
       }
     }
+    try {
+      this.store.holder.ensureFormByProduct({
+        product: productData,
+        shop_id: (productData == null ? void 0 : productData.shop_id) || "",
+        useCache: true
+      });
+    } catch (error) {
+      console.error("[BookingByStep] 加载 holder 表单失败", error);
+    }
     const flag = this.store.cart.mergeCartItemByRowKey({
       rowKey,
       quantity,

package/lib/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/lib/solution/BookingByStep/types.js

@@ -81,6 +81,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "holder":
+      return new import_modules.HolderModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

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

@@ -72,7 +72,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     getTempOrder(): ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
-        service_type: 'dine_in';
+        service_type: 'dine_in' | '';
         pickup_reference_mode: 'counter_pickup' | 'table_service';
     };
     setPickupRef(buzzer: string): string;

package/lib/solution/ScanOrder/index.js

@@ -553,6 +553,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 存储 UI 层选择的取餐方式到 tempOrder.metadata.shop_service_data
   // service_type 在扫码点餐场景固定为 dine_in
   setPickupReferenceMode(mode) {
+    var _a;
     this.logMethodStart("setPickupReferenceMode", { mode });
     try {
       if (!this.store.order)
@@ -562,7 +563,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         ...tempOrder.metadata || {},
         shop_service_data: {
           ...(tempOrder.metadata || {}).shop_service_data || {},
-          service_type: "dine_in",
+          service_type: ((_a = this.otherParams) == null ? void 0 : _a.businessCode) === "dine_in" ? "dine_in" : "take_away",
           pickup_reference_mode: mode
         }
       };

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

@@ -34,6 +34,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/lib/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;
@@ -194,6 +201,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;