@pisell/pisellos 0.0.551 → 0.0.553

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/dist/model/strategy/adapter/promotion/index.js +0 -9
  2. package/dist/modules/Holder/index.d.ts +7 -1
  3. package/dist/modules/Holder/index.js +153 -14
  4. package/dist/modules/Holder/types.d.ts +9 -1
  5. package/dist/modules/Holder/utils.d.ts +7 -3
  6. package/dist/modules/Holder/utils.js +16 -2
  7. package/dist/modules/Order/index.js +5 -1
  8. package/dist/modules/Order/utils.d.ts +2 -1
  9. package/dist/modules/Order/utils.js +21 -17
  10. package/dist/solution/BookingByStep/index.d.ts +8 -2
  11. package/dist/solution/BookingByStep/index.js +251 -212
  12. package/dist/solution/ScanOrder/index.d.ts +1 -1
  13. package/dist/solution/ScanOrder/index.js +72 -29
  14. package/dist/solution/ScanOrder/types.d.ts +6 -1
  15. package/dist/solution/VenueBooking/index.d.ts +5 -2
  16. package/dist/solution/VenueBooking/index.js +684 -656
  17. package/lib/modules/Holder/index.d.ts +7 -1
  18. package/lib/modules/Holder/index.js +75 -3
  19. package/lib/modules/Holder/types.d.ts +9 -1
  20. package/lib/modules/Holder/utils.d.ts +7 -3
  21. package/lib/modules/Holder/utils.js +18 -4
  22. package/lib/modules/Order/index.js +4 -1
  23. package/lib/modules/Order/utils.d.ts +2 -1
  24. package/lib/modules/Order/utils.js +11 -7
  25. package/lib/solution/BookingByStep/index.d.ts +8 -2
  26. package/lib/solution/BookingByStep/index.js +22 -10
  27. package/lib/solution/ScanOrder/index.d.ts +1 -1
  28. package/lib/solution/ScanOrder/index.js +40 -8
  29. package/lib/solution/ScanOrder/types.d.ts +6 -1
  30. package/lib/solution/VenueBooking/index.d.ts +5 -2
  31. package/lib/solution/VenueBooking/index.js +37 -16
  32. package/package.json +1 -1
@@ -1,6 +1,6 @@
1
1
  import { Module, PisellCore, ModuleOptions } from '../../types';
2
2
  import { BaseModule } from '../BaseModule';
3
- import { IFormInfo, IFormRecord, IFormItemData, IFetchFormInfoParams, IFetchFormRecordsParams, IAddFormRecordParams, IAppendFormRecordParams, IEnsureFormDataParams, IEnsureFormByProductParams, HolderModuleAPI, HolderFormMap } from './types';
3
+ import { IFormInfo, IFormRecord, IFormItemData, IFetchFormInfoParams, IFetchFormRecordsParams, IAddFormRecordParams, IAppendFormRecordParams, IEnsureFormDataParams, IEnsureFormByProductParams, IRefreshAllFormRecordsParams, HolderModuleAPI, HolderFormMap } from './types';
4
4
  export * from './types';
5
5
  export * from './utils';
6
6
  export declare class HolderModule extends BaseModule implements Module, HolderModuleAPI {
@@ -15,6 +15,7 @@ export declare class HolderModule extends BaseModule implements Module, HolderMo
15
15
  private error;
16
16
  /** 已加载过表单数据的 form_id 缓存标记 */
17
17
  private loadedFormIds;
18
+ private window;
18
19
  constructor(name?: string, version?: string);
19
20
  initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
20
21
  /** 统一提交 formMap,仅此处触发 store changed */
@@ -38,5 +39,10 @@ export declare class HolderModule extends BaseModule implements Module, HolderMo
38
39
  appendFormRecord(params: IAppendFormRecordParams): IFormRecord;
39
40
  removeFormRecord(formId: number | string, formRecordId: number): void;
40
41
  clearFormData(formId?: number | string): void;
42
+ /**
43
+ * 登录后按当前 holderMap 批量刷新所有表单的 records。
44
+ * 遍历 holderMap,从 form.form 中读取 form_id、shop_id,结合 customer_id 重新拉取记录。
45
+ */
46
+ refreshAllFormRecords(params?: IRefreshAllFormRecordsParams): Promise<HolderFormMap>;
41
47
  storeChange(path?: string): void;
42
48
  }
@@ -136,18 +136,22 @@ var HolderModule = class extends import_BaseModule.BaseModule {
136
136
  }
137
137
  }
138
138
  async fetchRecords(params) {
139
- var _a;
139
+ var _a, _b, _c;
140
140
  const url = params.url || "/form/data/v1";
141
141
  const { form_id, shop_id, num, skip, customer_id, ...rest } = params.query || {};
142
142
  const formId = (0, import_utils.normalizeFormId)(form_id);
143
143
  const useCache = params.useCache !== false;
144
+ const customer = JSON.parse(((_b = (_a = this.window) == null ? void 0 : _a.getLocalStorage) == null ? void 0 : _b.call(_a, "customer")) || "{}");
145
+ const customerId = customer_id ?? customer.id;
146
+ if (!customerId)
147
+ return [];
144
148
  this.isLoading = true;
145
149
  this.error = null;
146
150
  try {
147
151
  const res = await this.request.get(
148
152
  url,
149
153
  {
150
- customer_id,
154
+ customer_id: customerId,
151
155
  form_id,
152
156
  shop_id,
153
157
  num: num || 100,
@@ -157,7 +161,7 @@ var HolderModule = class extends import_BaseModule.BaseModule {
157
161
  },
158
162
  { useCache }
159
163
  );
160
- const records = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [];
164
+ const records = ((_c = res == null ? void 0 : res.data) == null ? void 0 : _c.list) || [];
161
165
  const nextFormMap = { ...this.store.holderMap };
162
166
  this.patchFormMap(nextFormMap, formId, { records });
163
167
  this.commitFormMap(nextFormMap);
@@ -306,6 +310,74 @@ var HolderModule = class extends import_BaseModule.BaseModule {
306
310
  this.commitFormMap({});
307
311
  }
308
312
  }
313
+ /**
314
+ * 登录后按当前 holderMap 批量刷新所有表单的 records。
315
+ * 遍历 holderMap,从 form.form 中读取 form_id、shop_id,结合 customer_id 重新拉取记录。
316
+ */
317
+ async refreshAllFormRecords(params = {}) {
318
+ const { customer_id, recordsUrl, num, skip } = params;
319
+ const useCache = params.useCache ?? false;
320
+ if (!customer_id) {
321
+ return this.getHolderFormMap();
322
+ }
323
+ const entries = Object.entries(this.store.holderMap);
324
+ if (!entries.length) {
325
+ return this.getHolderFormMap();
326
+ }
327
+ const url = recordsUrl || "/form/data/v1";
328
+ this.isLoading = true;
329
+ this.error = null;
330
+ try {
331
+ const results = await Promise.all(
332
+ entries.map(async ([mapKey, item]) => {
333
+ var _a;
334
+ const meta = (0, import_utils.resolveFormMetaFromHolderItem)(mapKey, item);
335
+ if (!meta)
336
+ return null;
337
+ try {
338
+ const res = await this.request.get(
339
+ url,
340
+ {
341
+ customer_id,
342
+ form_id: meta.form_id,
343
+ shop_id: meta.shop_id,
344
+ num: num || 100,
345
+ skip: skip || 1,
346
+ front_end_cache_id: useCache && this.cacheId
347
+ },
348
+ { useCache }
349
+ );
350
+ return {
351
+ formId: meta.form_id,
352
+ records: ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || []
353
+ };
354
+ } catch (error) {
355
+ console.error(
356
+ `[HolderModule] refreshAllFormRecords failed for form ${meta.form_id}`,
357
+ error
358
+ );
359
+ return null;
360
+ }
361
+ })
362
+ );
363
+ const nextFormMap = { ...this.store.holderMap };
364
+ results.forEach((result) => {
365
+ if (!result)
366
+ return;
367
+ this.patchFormMap(nextFormMap, result.formId, {
368
+ records: result.records
369
+ });
370
+ this.loadedFormIds.add(result.formId);
371
+ });
372
+ this.commitFormMap(nextFormMap);
373
+ return (0, import_lodash_es.cloneDeep)(nextFormMap);
374
+ } catch (error) {
375
+ this.error = error instanceof Error ? error.message : String(error);
376
+ throw error;
377
+ } finally {
378
+ this.isLoading = false;
379
+ }
380
+ }
309
381
  storeChange(path) {
310
382
  if (path !== "holderMap" && path !== void 0) {
311
383
  return;
@@ -68,7 +68,7 @@ export interface IFetchFormRecordsParams {
68
68
  export interface IAddFormRecordParams {
69
69
  url?: string;
70
70
  body: {
71
- form_id: number | string;
71
+ form_id: number;
72
72
  shop_id: number | string;
73
73
  customer_id?: number;
74
74
  [key: string]: any;
@@ -100,6 +100,13 @@ export interface IEnsureFormByProductParams {
100
100
  shop_id?: number | string;
101
101
  useCache?: boolean;
102
102
  }
103
+ export interface IRefreshAllFormRecordsParams {
104
+ customer_id?: number;
105
+ useCache?: boolean;
106
+ recordsUrl?: string;
107
+ num?: number;
108
+ skip?: number;
109
+ }
103
110
  export interface HolderModuleAPI {
104
111
  getHolderFormMap: () => HolderFormMap;
105
112
  getHolderFormData: (formId: number | string) => IFormItemData | undefined;
@@ -112,4 +119,5 @@ export interface HolderModuleAPI {
112
119
  appendFormRecord: (params: IAppendFormRecordParams) => IFormRecord;
113
120
  removeFormRecord: (formId: number | string, formRecordId: number) => void;
114
121
  clearFormData: (formId?: number | string) => void;
122
+ refreshAllFormRecords: (params?: IRefreshAllFormRecordsParams) => Promise<HolderFormMap>;
115
123
  }
@@ -1,9 +1,13 @@
1
1
  import { ProductData } from '../Product/types';
2
- import { IHolderConfig } from './types';
2
+ import { IFormItemData, IHolderConfig } from './types';
3
3
  export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
4
- export declare function getFormIdFromHolderConfig(config: IHolderConfig): string;
5
- export declare function normalizeFormId(formId: number | string): string;
4
+ export declare function getFormIdFromHolderConfig(config: IHolderConfig): number;
5
+ export declare function normalizeFormId(formId: number | string): number;
6
6
  export declare function createEmptyFormItemData(): {
7
7
  records: any[];
8
8
  form: Record<string, any>;
9
9
  };
10
+ export declare function resolveFormMetaFromHolderItem(mapKey: string, item: IFormItemData): {
11
+ form_id: string | number;
12
+ shop_id: number | string;
13
+ } | null;
@@ -22,7 +22,8 @@ __export(utils_exports, {
22
22
  createEmptyFormItemData: () => createEmptyFormItemData,
23
23
  getFormIdFromHolderConfig: () => getFormIdFromHolderConfig,
24
24
  getProductHolderConfig: () => getProductHolderConfig,
25
- normalizeFormId: () => normalizeFormId
25
+ normalizeFormId: () => normalizeFormId,
26
+ resolveFormMetaFromHolderItem: () => resolveFormMetaFromHolderItem
26
27
  });
27
28
  module.exports = __toCommonJS(utils_exports);
28
29
  function getProductHolderConfig(product) {
@@ -37,10 +38,10 @@ function getProductHolderConfig(product) {
37
38
  return config;
38
39
  }
39
40
  function getFormIdFromHolderConfig(config) {
40
- return String(config == null ? void 0 : config.resource_id);
41
+ return Number(config == null ? void 0 : config.resource_id);
41
42
  }
42
43
  function normalizeFormId(formId) {
43
- return String(formId);
44
+ return Number(formId);
44
45
  }
45
46
  function createEmptyFormItemData() {
46
47
  return {
@@ -48,10 +49,23 @@ function createEmptyFormItemData() {
48
49
  form: {}
49
50
  };
50
51
  }
52
+ function resolveFormMetaFromHolderItem(mapKey, item) {
53
+ const formInfo = item.form || {};
54
+ const nestedForm = formInfo.form || {};
55
+ const form_id = normalizeFormId(
56
+ nestedForm.id ?? formInfo.form_id ?? formInfo.id ?? mapKey
57
+ );
58
+ const shop_id = nestedForm.shop_id ?? formInfo.shop_id;
59
+ if (shop_id === void 0 || shop_id === null || shop_id === "") {
60
+ return null;
61
+ }
62
+ return { form_id, shop_id };
63
+ }
51
64
  // Annotate the CommonJS export names for ESM import in node:
52
65
  0 && (module.exports = {
53
66
  createEmptyFormItemData,
54
67
  getFormIdFromHolderConfig,
55
68
  getProductHolderConfig,
56
- normalizeFormId
69
+ normalizeFormId,
70
+ resolveFormMetaFromHolderItem
57
71
  });
@@ -608,6 +608,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
608
608
  let is_deposit = 0;
609
609
  if (params.cartItems.length > 0) {
610
610
  params.cartItems.forEach((item) => {
611
+ var _a2;
611
612
  if (!item._origin.duration) {
612
613
  const { duration, durationType } = (0, import_utils.generateDuration)(item);
613
614
  item._origin.duration = duration;
@@ -615,7 +616,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
615
616
  }
616
617
  const discountList = (0, import_utils.getAllDiscountList)(item);
617
618
  item._origin.product.discount_list = discountList;
618
- (0, import_utils.ensureCartItemOriginHolder)(item);
619
+ if ((_a2 = params == null ? void 0 : params.extraData) == null ? void 0 : _a2.is_add_holder_info) {
620
+ (0, import_utils.ensureCartItemOriginHolder)(item, this.window);
621
+ }
619
622
  if ((0, import_utils2.isNormalProduct)(item._origin)) {
620
623
  order.relation_products.push(item._origin.product);
621
624
  const relationForms = item._origin.relation_forms || [];
@@ -2,6 +2,7 @@ import Decimal from 'decimal.js';
2
2
  import { CartItem } from "../Cart";
3
3
  import type { ScanOrderSubmitPayload, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
4
4
  import type { RulesParamsHooks } from '../Rules/types';
5
+ import type { WindowPlugin } from '../../plugins';
5
6
  /**
6
7
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
7
8
  *
@@ -94,7 +95,7 @@ export interface CartOrderHolder {
94
95
  /**
95
96
  * 为购物车行补齐订单所需的 holder 信息(与 cartAccount 结构保持一致)
96
97
  */
97
- export declare function ensureCartItemOriginHolder(cartItem: CartItem): void;
98
+ export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
98
99
  export declare const getAllDiscountList: (cartItem: CartItem) => any;
99
100
  export declare function createUuidV4(): string;
100
101
  export declare function isTempOrder(data: any): data is ScanOrderTempOrder;
@@ -198,13 +198,17 @@ var mergeRelationForms = (relationForms) => {
198
198
  }, {})
199
199
  ).filter((item) => item.form_record_ids.length > 0);
200
200
  };
201
- function resolveCartItemHolderCustomerId(cartItem) {
202
- var _a, _b, _c;
203
- const origin = cartItem._origin;
204
- const account = (_a = origin == null ? void 0 : origin.metadata) == null ? void 0 : _a.account;
205
- return ((_b = origin == null ? void 0 : origin.holder) == null ? void 0 : _b.customer_id) ?? ((_c = account == null ? void 0 : account._origin) == null ? void 0 : _c.customer_id) ?? (account == null ? void 0 : account.customer_id);
201
+ function getCustomerIdFromStorage(window) {
202
+ var _a;
203
+ try {
204
+ const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
205
+ const customerId = Number(customer == null ? void 0 : customer.id);
206
+ return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
207
+ } catch {
208
+ return void 0;
209
+ }
206
210
  }
207
- function ensureCartItemOriginHolder(cartItem) {
211
+ function ensureCartItemOriginHolder(cartItem, window) {
208
212
  var _a;
209
213
  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
210
214
  return;
@@ -217,7 +221,7 @@ function ensureCartItemOriginHolder(cartItem) {
217
221
  return;
218
222
  }
219
223
  cartItem._origin.holder = {
220
- customer_id: resolveCartItemHolderCustomerId(cartItem),
224
+ customer_id: getCustomerIdFromStorage(window),
221
225
  form_id: holderConfig.resource_id,
222
226
  form_record: [formRecordId]
223
227
  };
@@ -131,6 +131,12 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
131
131
  * 获取 holder 表单 map
132
132
  */
133
133
  getHolderFormMap(): import("../../modules").HolderFormMap;
134
+ /**
135
+ * 登录后或外部触发时,按当前 holderMap 批量刷新所有表单的 records
136
+ */
137
+ refreshAllHolderFormRecords(params?: {
138
+ customer_id?: number;
139
+ }): Promise<import("../../modules").HolderFormMap>;
134
140
  /**
135
141
  * 添加表单记录
136
142
  */
@@ -320,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
320
326
  date: string;
321
327
  status: string;
322
328
  week: string;
323
- weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
329
+ weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
324
330
  }[]>;
325
331
  submitTimeSlot(timeSlots: TimeSliceItem): void;
326
332
  private getScheduleDataByIds;
@@ -367,7 +373,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
367
373
  };
368
374
  setOtherData(key: string, value: any): void;
369
375
  getOtherData(key: string): any;
370
- getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
376
+ getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
371
377
  /**
372
378
  * 提供给 UI 的方法,减轻 UI 层的计算压力,UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
373
379
  *
@@ -386,6 +386,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
386
386
  getHolderFormMap() {
387
387
  return this.store.holder.getHolderFormMap();
388
388
  }
389
+ /**
390
+ * 登录后或外部触发时,按当前 holderMap 批量刷新所有表单的 records
391
+ */
392
+ async refreshAllHolderFormRecords(params) {
393
+ return this.store.holder.refreshAllFormRecords({
394
+ customer_id: params == null ? void 0 : params.customer_id,
395
+ useCache: false
396
+ });
397
+ }
389
398
  /**
390
399
  * 添加表单记录
391
400
  */
@@ -499,6 +508,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
499
508
  date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
500
509
  }
501
510
  this.updateQuotationPriceAndCart(date);
511
+ try {
512
+ const customerId = Number(accountInfo.id);
513
+ await this.refreshAllHolderFormRecords({
514
+ customer_id: customerId
515
+ });
516
+ } catch (error) {
517
+ console.error("[BookingByStep] 登录后刷新 holder 表单失败", error);
518
+ }
502
519
  }
503
520
  } else {
504
521
  throw new Error(`没有找到${accountId}账户`);
@@ -612,7 +629,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
612
629
  date,
613
630
  account
614
631
  }) {
615
- var _a, _b;
616
632
  const {
617
633
  bundle,
618
634
  options,
@@ -645,15 +661,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
645
661
  }
646
662
  }
647
663
  try {
648
- const customer = JSON.parse(((_b = (_a = this.window) == null ? void 0 : _a.getLocalStorage) == null ? void 0 : _b.call(_a, "customer")) || "{}");
649
- if (customer == null ? void 0 : customer.id) {
650
- this.store.holder.ensureFormByProduct({
651
- product: productData,
652
- customer_id: Number(customer.id),
653
- shop_id: (productData == null ? void 0 : productData.shop_id) || "",
654
- useCache: true
655
- });
656
- }
664
+ this.store.holder.ensureFormByProduct({
665
+ product: productData,
666
+ shop_id: (productData == null ? void 0 : productData.shop_id) || "",
667
+ useCache: true
668
+ });
657
669
  } catch (error) {
658
670
  console.error("[BookingByStep] 加载 holder 表单失败", error);
659
671
  }
@@ -118,7 +118,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
118
118
  setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
119
119
  private normalizeResourceState;
120
120
  private resolveResourceSelectType;
121
- private fetchResourceOccupyDetailByResourceId;
121
+ private fetchResourceOccupyDetailsByResourceId;
122
122
  checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
123
123
  getAdditionalOrderInfo(): Promise<{
124
124
  orderId: string;
@@ -1524,8 +1524,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
1524
1524
  const matched = resources.find((r) => Number(r == null ? void 0 : r.id) === numericFormId);
1525
1525
  return matched == null ? void 0 : matched.type;
1526
1526
  }
1527
- async fetchResourceOccupyDetailByResourceId(resourceId) {
1528
- var _a, _b, _c, _d;
1527
+ async fetchResourceOccupyDetailsByResourceId(resourceId) {
1528
+ var _a, _b, _c;
1529
1529
  const formRecordId = Number(resourceId);
1530
1530
  if (!Number.isFinite(formRecordId) || formRecordId <= 0) {
1531
1531
  throw new Error(`[ScanOrder] 非法桌台 resourceId: ${resourceId}`);
@@ -1547,7 +1547,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
1547
1547
  if (!(response == null ? void 0 : response.status)) {
1548
1548
  throw new Error((response == null ? void 0 : response.message) || "获取资源占用详情失败");
1549
1549
  }
1550
- return ((_d = (_c = response == null ? void 0 : response.data) == null ? void 0 : _c.occupy_details) == null ? void 0 : _d[0]) ?? null;
1550
+ return ((_c = response == null ? void 0 : response.data) == null ? void 0 : _c.occupy_details) ?? [];
1551
1551
  }
1552
1552
  // 检测当前链接是否可用
1553
1553
  // 通过 resource_id + 店铺配置
@@ -1669,7 +1669,30 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
1669
1669
  cacheId: this.cacheId
1670
1670
  });
1671
1671
  }
1672
- const occupyDetail = await this.fetchResourceOccupyDetailByResourceId(normalizedResourceId);
1672
+ const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
1673
+ const occupyDetail = occupyDetails[0] ?? null;
1674
+ const currentOrderId = (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.order_id);
1675
+ const orderListIds = (Array.isArray(occupyDetail == null ? void 0 : occupyDetail.order_list) ? (occupyDetail == null ? void 0 : occupyDetail.order_list) || [] : []).map((order) => (0, import_utils.toPositiveString)(order == null ? void 0 : order.id)).filter(Boolean);
1676
+ if (!currentOrderId && orderListIds.length > 1) {
1677
+ const multipleOrdersState = {
1678
+ ...this.normalizeResourceState(occupyDetail, void 0, hasOrderId),
1679
+ mode: "multiple_orders"
1680
+ };
1681
+ this.store.resource = multipleOrdersState;
1682
+ const availabilityInfo2 = {
1683
+ mode: "multiple_orders",
1684
+ deskmate_valid: multipleOrdersState.deskmate_valid,
1685
+ relation_id: multipleOrdersState.relationId,
1686
+ table_form_id: multipleOrdersState.tableFormId,
1687
+ table_form_record: multipleOrdersState.table_form_record
1688
+ };
1689
+ this.logMethodSuccess("checkResourceAvailable", {
1690
+ resourceId: normalizedResourceId,
1691
+ mode: availabilityInfo2.mode,
1692
+ orderListCount: orderListIds.length
1693
+ });
1694
+ return availabilityInfo2;
1695
+ }
1673
1696
  const resourceSelectType = this.resolveResourceSelectType(
1674
1697
  (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id)
1675
1698
  );
@@ -1678,6 +1701,14 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
1678
1701
  resourceSelectType,
1679
1702
  hasOrderId
1680
1703
  );
1704
+ const additionalOrderId = currentOrderId || orderListIds[0];
1705
+ if (additionalOrderId) {
1706
+ resourceState.mode = "additional_order";
1707
+ resourceState.order_id = additionalOrderId;
1708
+ } else if (!currentOrderId && orderListIds.length === 0) {
1709
+ resourceState.mode = "idle";
1710
+ resourceState.order_id = void 0;
1711
+ }
1681
1712
  this.store.resource = resourceState;
1682
1713
  if (pendingRequestEntryPax !== void 0) {
1683
1714
  this.store.resource.requestEntryPax = pendingRequestEntryPax;
@@ -1708,8 +1739,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
1708
1739
  if (availabilityInfo.mode === "idle") {
1709
1740
  await this.addNewOrder();
1710
1741
  }
1711
- if (availabilityInfo.mode === "additional_order" || availabilityInfo.mode === "additional_order_with_code") {
1712
- tempOrder.order_id = resourceState.lastOrderId;
1742
+ const isAdditionalOrderMode = availabilityInfo.mode === "additional_order" || availabilityInfo.mode === "additional_order_with_code";
1743
+ if (isAdditionalOrderMode) {
1744
+ tempOrder.order_id = additionalOrderId;
1713
1745
  }
1714
1746
  if (tempOrder.order_id) {
1715
1747
  const res = await ((_i = this.store.order) == null ? void 0 : _i.getOrderInfoByRemote(tempOrder.order_id));
@@ -1722,7 +1754,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
1722
1754
  }
1723
1755
  }
1724
1756
  const lastOrderInfo = (_o = (_n = this.store.order) == null ? void 0 : _n.getLastOrderInfo) == null ? void 0 : _o.call(_n);
1725
- const historicalItems = hasOrderId && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
1757
+ const historicalItems = isAdditionalOrderMode && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
1726
1758
  if (typeof (p == null ? void 0 : p.product_id) !== "number")
1727
1759
  return acc;
1728
1760
  acc.push({
@@ -1734,7 +1766,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
1734
1766
  }, []) : [];
1735
1767
  await this.setItemRuleRuntimeConfig({
1736
1768
  serviceType: (_p = this.otherParams) == null ? void 0 : _p.businessCode,
1737
- submissionIndex: hasOrderId ? 1 : 0,
1769
+ submissionIndex: isAdditionalOrderMode ? 1 : 0,
1738
1770
  historicalItems
1739
1771
  });
1740
1772
  if (outsideOperatingHours && closedBehaviorValue === "show_menu_disabled") {
@@ -34,6 +34,7 @@ export interface ScanOrderOrderProductIdentity {
34
34
  /** 参与合并/匹配;与 remove 通配语义见 isSkuOnlyDeleteIdentity */
35
35
  product_option_item?: any[];
36
36
  product_bundle?: any[];
37
+ shop_id?: number | string;
37
38
  }
38
39
  export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
39
40
  order_detail_id: number | null;
@@ -185,7 +186,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
185
186
  }>;
186
187
  products: ScanOrderSubmitProduct[];
187
188
  }
188
- export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
189
+ export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
189
190
  export interface ScanOrderTableFormRecord {
190
191
  policy?: string | null;
191
192
  partyroom_booking?: string | null;
@@ -228,6 +229,10 @@ export interface ScanOrderResourceOccupyDetail {
228
229
  form_id?: number | string | null;
229
230
  order_id?: number | string | null;
230
231
  last_order_id?: number | string | null;
232
+ order_list?: Array<{
233
+ id?: number | string | null;
234
+ [key: string]: any;
235
+ }> | null;
231
236
  resource_capacity?: ScanOrderResourceCapacity[] | null;
232
237
  form_record?: ScanOrderTableFormRecord | null;
233
238
  [key: string]: any;
@@ -7,7 +7,7 @@ import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
7
7
  import type { ProductData } from '../../modules/Product/types';
8
8
  import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
9
9
  import type { StrategyConfig } from '../../model/strategy/type';
10
- import type { IAppendFormRecordParams } from '../../modules/Holder/types';
10
+ import type { IAppendFormRecordParams, IRefreshAllFormRecordsParams } from '../../modules/Holder/types';
11
11
  export * from './types';
12
12
  interface VenueBookingItemRuleRuntimeConfig {
13
13
  strategyConfigs?: StrategyConfig[];
@@ -54,7 +54,6 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
54
54
  private normalizeCustomerId;
55
55
  private resolveCustomerIdFromLoginPayload;
56
56
  private resolveHolderCustomerId;
57
- private ensureProductHolderForm;
58
57
  /**
59
58
  * 按商品 holder_config 预加载表单数据到 holderMap。
60
59
  * appointment_booking 在加购时触发;venueBooking 在商品加载后预加载,避免 getHolderFormMap 为空。
@@ -206,6 +205,10 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
206
205
  * 获取 holder 表单 map
207
206
  */
208
207
  getHolderFormMap(): import("../../modules/Holder").HolderFormMap;
208
+ /**
209
+ * UI 层触发:按当前 holderMap 批量刷新所有表单的 records
210
+ */
211
+ refreshAllHolderFormRecords(params?: Pick<IRefreshAllFormRecordsParams, 'customer_id' | 'useCache' | 'recordsUrl' | 'num' | 'skip'>): Promise<import("../../modules/Holder").HolderFormMap>;
209
212
  /**
210
213
  * 添加表单记录
211
214
  */