@pisell/pisellos 2.1.154 → 2.1.156

package/lib/solution/ScanOrder/index.js

@@ -867,13 +867,13 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const ruleProduct = this.enabledReservationRuleProducts[0];
     const resourceState = this.store.resource;
     const resourceSelectType = resourceState == null ? void 0 : resourceState.resourceSelectType;
-    const resolveBookingCapacityValue = () => {
+    const resolveResourceCapacity = () => {
       var _a;
       if (resourceSelectType === "single") {
         const raw = (_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.capacity;
         const num = Number(raw);
         if (Number.isFinite(num) && num > 0)
-          return Math.max(1, Math.floor(num));
+          return num;
         return 1;
       }
       return 1;
@@ -892,8 +892,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         };
       }
       const rawCollectPax = (_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax;
-      const hasExplicitCollectPax = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
-      const bookingCapacityValue = resolveBookingCapacityValue();
+      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
+      const resourceCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
       const pickOriginal = (value) => {
         if (value && typeof value === "object" && !Array.isArray(value)) {
           const original = value.original;
@@ -909,42 +909,35 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: bookingCapacityValue,
+        capacity: resourceCapacityValue,
         metadata: this.buildScanOrderResourceMetadata({
           resourceState,
           resourceName: mainField
         })
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
+      const bookingCapacityValue = resourceCapacityValue;
       const bookingCapacityDimensionId = (0, import_utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
-      const nextBookings = (payload.bookings || []).map((booking, idx) => {
-        const metadata = { ...booking.metadata || {} };
-        if (hasExplicitCollectPax) {
-          metadata.collect_pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax);
-        } else {
-          delete metadata.collect_pax;
-        }
-        return {
-          ...booking,
-          number: bookingCapacityValue,
-          appointment_status: "started",
-          metadata: {
-            ...metadata,
-            ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
-            ...resourceSelectType ? {
-              capacity: [
-                {
-                  id: bookingCapacityDimensionId,
-                  value: bookingCapacityValue,
-                  name: ""
-                }
-              ]
-            } : {}
-          },
-          ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
-          ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
-        };
-      });
+      const nextBookings = (payload.bookings || []).map((booking, idx) => ({
+        ...booking,
+        number: bookingCapacityValue,
+        appointment_status: "started",
+        metadata: {
+          ...booking.metadata || {},
+          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
+          ...resourceSelectType ? {
+            capacity: [
+              {
+                id: bookingCapacityDimensionId,
+                value: bookingCapacityValue,
+                name: ""
+              }
+            ]
+          } : {}
+        },
+        ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
+        ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
+      }));
       const nextProducts = [...payload.products || []];
       if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
         const sellingPrice = String(ruleProduct.price ?? "0.00");
@@ -981,7 +974,10 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (!this.store.order) {
         throw new Error("scanOrder解决方案需要 order 模块支持");
       }
+      const pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(this.store.entryPaxNumber);
+      this.store.entryPaxNumber = pax;
       const tempOrderForSubmit = this.store.order.ensureTempOrder();
+      tempOrderForSubmit.metadata = { ...tempOrderForSubmit.metadata, collect_pax: pax };
       tempOrderForSubmit.delivery_type = "shop_service";
       const resourceTableName = (_b = (_a = this.store.resource) == null ? void 0 : _a.table_form_record) == null ? void 0 : _b.name;
       if (resourceTableName && typeof resourceTableName === "object") {
@@ -1528,8 +1524,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const matched = resources.find((r) => Number(r == null ? void 0 : r.id) === numericFormId);
     return matched == null ? void 0 : matched.type;
   }
-  async fetchResourceOccupyDetailsByResourceId(resourceId) {
-    var _a, _b, _c;
+  async fetchResourceOccupyDetailByResourceId(resourceId) {
+    var _a, _b, _c, _d;
     const formRecordId = Number(resourceId);
     if (!Number.isFinite(formRecordId) || formRecordId <= 0) {
       throw new Error(`[ScanOrder] 非法桌台 resourceId: ${resourceId}`);
@@ -1551,57 +1547,13 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     if (!(response == null ? void 0 : response.status)) {
       throw new Error((response == null ? void 0 : response.message) || "获取资源占用详情失败");
     }
-    return ((_c = response == null ? void 0 : response.data) == null ? void 0 : _c.occupy_details) ?? [];
-  }
-  resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType, allowAddItems) {
-    const currentOrderId = (0, import_utils.toPositiveString)(detail == null ? void 0 : detail.order_id);
-    if (currentOrderId) {
-      return {
-        matched: true,
-        order_id: currentOrderId
-      };
-    }
-    const orderListIds = (Array.isArray(detail == null ? void 0 : detail.order_list) ? (detail == null ? void 0 : detail.order_list) || [] : []).map((order) => (0, import_utils.toPositiveString)(order == null ? void 0 : order.id)).filter(Boolean);
-    if (resourceSelectType !== "single") {
-      return {
-        matched: false,
-        reason: "no_order"
-      };
-    }
-    if (!orderListIds.length) {
-      return {
-        matched: false,
-        reason: "no_order"
-      };
-    }
-    if (!allowAddItems) {
-      return {
-        matched: false,
-        reason: "add_items_disabled"
-      };
-    }
-    if (orderListIds.length === 1) {
-      return {
-        matched: true,
-        order_id: orderListIds[0]
-      };
-    }
-    if (orderListIds.length > 1) {
-      return {
-        matched: false,
-        reason: "multiple_orders"
-      };
-    }
-    return {
-      matched: false,
-      reason: "no_order"
-    };
+    return ((_d = (_c = response == null ? void 0 : response.data) == null ? void 0 : _c.occupy_details) == null ? void 0 : _d[0]) ?? null;
   }
   // 检测当前链接是否可用
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const normalizedResourceId = String(resourceId ?? "").trim();
     this.logMethodStart("checkResourceAvailable", {
       resourceId: normalizedResourceId
@@ -1717,54 +1669,15 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           cacheId: this.cacheId
         });
       }
-      const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
-      const occupyDetail = occupyDetails[0] ?? null;
+      const occupyDetail = await this.fetchResourceOccupyDetailByResourceId(normalizedResourceId);
       const resourceSelectType = this.resolveResourceSelectType(
         (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id)
       );
-      const allowAddItems = (0, import_utils.toBoolean)(dineInConfig == null ? void 0 : dineInConfig["sale.allow_add_items"]);
-      const additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(
-        occupyDetail,
-        resourceSelectType,
-        allowAddItems
-      );
-      if (additionalOrderResult.reason === "multiple_orders") {
-        const multipleOrdersState = {
-          ...this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId),
-          mode: "multiple_orders"
-        };
-        this.store.resource = multipleOrdersState;
-        const availabilityInfo2 = {
-          mode: "multiple_orders",
-          deskmate_valid: multipleOrdersState.deskmate_valid,
-          relation_id: multipleOrdersState.relationId,
-          table_form_id: multipleOrdersState.tableFormId,
-          table_form_record: multipleOrdersState.table_form_record
-        };
-        this.logMethodSuccess("checkResourceAvailable", {
-          resourceId: normalizedResourceId,
-          mode: availabilityInfo2.mode,
-          orderListCount: ((_e = occupyDetail == null ? void 0 : occupyDetail.order_list) == null ? void 0 : _e.length) || 0,
-          resourceSelectType
-        });
-        return availabilityInfo2;
-      }
       const resourceState = this.normalizeResourceState(
         occupyDetail,
         resourceSelectType,
         hasOrderId
       );
-      const additionalOrderId = additionalOrderResult.order_id;
-      if (additionalOrderId) {
-        resourceState.mode = "additional_order";
-        resourceState.order_id = additionalOrderId;
-      } else if (additionalOrderResult.reason === "add_items_disabled") {
-        resourceState.mode = "resource_busy";
-        resourceState.order_id = "0";
-      } else if (resourceSelectType === "multiple" && resourceState.isFull) {
-        resourceState.mode = "resource_busy";
-        resourceState.order_id = "0";
-      }
       this.store.resource = resourceState;
       if (pendingRequestEntryPax !== void 0) {
         this.store.resource.requestEntryPax = pendingRequestEntryPax;
@@ -1782,35 +1695,34 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         table_form_id: resourceState.tableFormId,
         deskmate_valid: resourceState.deskmate_valid,
         table_form_record: resourceState.table_form_record,
-        policy: (_f = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _f.policy,
-        partyroom_booking: (_g = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _g.partyroom_booking,
+        policy: (_e = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _e.policy,
+        partyroom_booking: (_f = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _f.partyroom_booking,
         ...this.store.resource.requestEntryPax !== void 0 ? { requestEntryPax: this.store.resource.requestEntryPax } : {},
         ...this.store.resource.requestPaxMin !== void 0 ? { requestPaxMin: this.store.resource.requestPaxMin } : {},
         ...this.store.resource.requestPaxMax !== void 0 ? { requestPaxMax: this.store.resource.requestPaxMax } : {}
       };
-      tempOrder.relation_id = normalizedResourceId || ((_h = this.otherParams) == null ? void 0 : _h.relation_id);
+      tempOrder.relation_id = normalizedResourceId || ((_g = this.otherParams) == null ? void 0 : _g.relation_id);
       tempOrder.table_form_id = resourceState.tableFormId;
       tempOrder.resource_id = normalizedResourceId;
-      (_i = this.store.order) == null ? void 0 : _i.persistTempOrder();
+      (_h = this.store.order) == null ? void 0 : _h.persistTempOrder();
       if (availabilityInfo.mode === "idle") {
         await this.addNewOrder();
       }
-      const isAdditionalOrderMode = availabilityInfo.mode === "additional_order" || availabilityInfo.mode === "additional_order_with_code";
-      if (isAdditionalOrderMode) {
-        tempOrder.order_id = additionalOrderId;
+      if (availabilityInfo.mode === "additional_order" || availabilityInfo.mode === "additional_order_with_code") {
+        tempOrder.order_id = resourceState.lastOrderId;
       }
       if (tempOrder.order_id) {
-        const res = await ((_j = this.store.order) == null ? void 0 : _j.getOrderInfoByRemote(tempOrder.order_id));
-        const entryPaxNumber = (_n = (_m = (_l = (_k = res == null ? void 0 : res.data) == null ? void 0 : _k.bookings) == null ? void 0 : _l.find((p) => {
+        const res = await ((_i = this.store.order) == null ? void 0 : _i.getOrderInfoByRemote(tempOrder.order_id));
+        const entryPaxNumber = (_m = (_l = (_k = (_j = res == null ? void 0 : res.data) == null ? void 0 : _j.bookings) == null ? void 0 : _k.find((p) => {
           var _a2;
           return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
-        })) == null ? void 0 : _m.metadata) == null ? void 0 : _n.collect_pax;
+        })) == null ? void 0 : _l.metadata) == null ? void 0 : _m.collect_pax;
         if (entryPaxNumber) {
           await this.setEntryPaxNumber(entryPaxNumber);
         }
       }
-      const lastOrderInfo = (_p = (_o = this.store.order) == null ? void 0 : _o.getLastOrderInfo) == null ? void 0 : _p.call(_o);
-      const historicalItems = isAdditionalOrderMode && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
+      const lastOrderInfo = (_o = (_n = this.store.order) == null ? void 0 : _n.getLastOrderInfo) == null ? void 0 : _o.call(_n);
+      const historicalItems = hasOrderId && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
         if (typeof (p == null ? void 0 : p.product_id) !== "number")
           return acc;
         acc.push({
@@ -1821,8 +1733,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         return acc;
       }, []) : [];
       await this.setItemRuleRuntimeConfig({
-        serviceType: (_q = this.otherParams) == null ? void 0 : _q.businessCode,
-        submissionIndex: isAdditionalOrderMode ? 1 : 0,
+        serviceType: (_p = this.otherParams) == null ? void 0 : _p.businessCode,
+        submissionIndex: hasOrderId ? 1 : 0,
         historicalItems
       });
       if (outsideOperatingHours && closedBehaviorValue === "show_menu_disabled") {
@@ -1995,83 +1907,6 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   getEntryPaxNumber() {
     return this.store.entryPaxNumber;
   }
-  async syncAdditionalOrderFromResource(resourceId) {
-    var _a, _b, _c, _d, _e, _f;
-    const tempOrder = this.ensureTempOrder();
-    const normalizedResourceId = String(
-      resourceId ?? tempOrder.resource_id ?? ((_a = this.store.resource) == null ? void 0 : _a.relationId) ?? ((_b = this.store.resource) == null ? void 0 : _b.relation_id) ?? ""
-    ).trim();
-    this.logMethodStart("syncAdditionalOrderFromResource", {
-      resourceId: normalizedResourceId
-    });
-    if (!normalizedResourceId) {
-      const result2 = {
-        matched: false,
-        reason: "missing_resource_id"
-      };
-      this.logMethodSuccess("syncAdditionalOrderFromResource", result2);
-      return result2;
-    }
-    const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
-    const occupyDetail = occupyDetails[0] ?? null;
-    const resourceSelectType = ((_c = this.store.resource) == null ? void 0 : _c.resourceSelectType) || this.resolveResourceSelectType((0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id));
-    const allowAddItems = (0, import_utils.toBoolean)(
-      (_e = (_d = this.otherParams) == null ? void 0 : _d.dineInConfig) == null ? void 0 : _e["sale.allow_add_items"]
-    );
-    const result = this.resolveAdditionalOrderFromOccupyDetail(
-      occupyDetail,
-      resourceSelectType,
-      allowAddItems
-    );
-    if (!result.matched || !result.order_id) {
-      this.logMethodSuccess("syncAdditionalOrderFromResource", {
-        ...result,
-        resourceId: normalizedResourceId,
-        resourceSelectType,
-        allowAddItems
-      });
-      return result;
-    }
-    tempOrder.order_id = result.order_id;
-    tempOrder.resource_id = normalizedResourceId;
-    tempOrder.relation_id = (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_record_id) || normalizedResourceId || tempOrder.relation_id;
-    tempOrder.table_form_id = (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id) || tempOrder.table_form_id;
-    (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
-    this.logMethodSuccess("syncAdditionalOrderFromResource", {
-      ...result,
-      resourceId: normalizedResourceId,
-      resourceSelectType,
-      allowAddItems
-    });
-    return result;
-  }
-  // 读取预约规则商品的资源选择类型：single=单个预约，multiple=多个预约，capacity=容量型预约
-  // 依赖 checkResourceAvailable 已根据预约规则商品与 occupy-detail 的 form_id 计算并缓存 store.resource
-  getReservationResourceSelectType() {
-    var _a;
-    this.logMethodStart("getReservationResourceSelectType");
-    const resourceSelectType = (_a = this.store.resource) == null ? void 0 : _a.resourceSelectType;
-    const result = {
-      ...resourceSelectType ? { resourceSelectType } : {},
-      isSingleReservation: resourceSelectType === "single",
-      isMultipleReservation: resourceSelectType === "multiple",
-      isCapacityReservation: resourceSelectType === "capacity"
-    };
-    this.logMethodSuccess("getReservationResourceSelectType", result);
-    return result;
-  }
-  // 判定后台是否开启允许加餐
-  // 依赖 checkResourceAvailable 已缓存的 dineInConfig
-  checkAllowAddItems() {
-    var _a;
-    this.logMethodStart("checkAllowAddItems");
-    const dineInConfig = ((_a = this.otherParams) == null ? void 0 : _a.dineInConfig) || {};
-    const result = {
-      enabled: (0, import_utils.toBoolean)(dineInConfig["sale.allow_add_items"])
-    };
-    this.logMethodSuccess("checkAllowAddItems", result);
-    return result;
-  }
   // 读取取餐/送餐开关
   // 依赖 checkResourceAvailable 已缓存的 dineInConfig
   getFulfillmentModes() {

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;
@@ -185,7 +186,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -228,10 +229,6 @@ export interface ScanOrderResourceOccupyDetail {
     form_id?: number | string | null;
     order_id?: number | string | null;
     last_order_id?: number | string | null;
-    order_list?: Array<{
-        id?: number | string | null;
-        [key: string]: any;
-    }> | null;
     resource_capacity?: ScanOrderResourceCapacity[] | null;
     form_record?: ScanOrderTableFormRecord | null;
     [key: string]: any;
@@ -245,21 +242,6 @@ export interface ScanOrderResourceOccupyDetailApiResponse {
     } | null;
 }
 export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
-export interface ScanOrderReservationResourceSelectInfo {
-    resourceSelectType?: ScanOrderResourceSelectType;
-    isSingleReservation: boolean;
-    isMultipleReservation: boolean;
-    isCapacityReservation: boolean;
-}
-export interface ScanOrderAllowAddItemsInfo {
-    enabled: boolean;
-}
-export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
-export interface ScanOrderSyncAdditionalOrderResult {
-    matched: boolean;
-    order_id?: string;
-    reason?: ScanOrderSyncAdditionalOrderReason;
-}
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     relationId?: string;
     tableFormId?: string;

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;