@pisell/pisellos 2.2.323 → 2.2.325
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.
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/inventory/index.d.ts +92 -0
- package/dist/inventory/index.js +509 -0
- package/dist/model/strategy/adapter/promotion/index.js +9 -0
- package/dist/modules/BookingContext/index.d.ts +2 -2
- package/dist/modules/BookingContext/index.js +55 -25
- package/dist/modules/BookingContext/types.d.ts +2 -0
- package/dist/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/dist/modules/BookingContext/utils/calendarBooking.js +207 -0
- package/dist/modules/BookingContext/utils/index.d.ts +1 -0
- package/dist/modules/BookingContext/utils/index.js +1 -0
- package/dist/modules/BookingContext/utils/productExtend.d.ts +20 -1
- package/dist/modules/BookingContext/utils/productExtend.js +122 -29
- package/dist/modules/Date/index.d.ts +1 -1
- package/dist/modules/Date/index.js +60 -14
- package/dist/modules/Date/types.d.ts +5 -0
- package/dist/modules/Discount/index.js +1 -0
- package/dist/modules/OpenData/index.d.ts +1 -0
- package/dist/modules/OpenData/index.js +1 -0
- package/dist/modules/OpenData/salesSettings.d.ts +32 -0
- package/dist/modules/OpenData/salesSettings.js +80 -0
- package/dist/modules/OpenData/types.d.ts +16 -0
- package/dist/modules/OpenData/utils.d.ts +1 -1
- package/dist/modules/OpenData/utils.js +3 -2
- package/dist/modules/Order/index.d.ts +55 -12
- package/dist/modules/Order/index.js +2699 -1411
- package/dist/modules/Order/types.d.ts +43 -5
- package/dist/modules/Order/types.js +4 -0
- package/dist/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/dist/modules/Order/unpaidAmountGap.js +72 -0
- package/dist/modules/Order/utils/discountProductLineIdentity.js +2 -2
- package/dist/modules/Order/utils/productVoucherGroups.d.ts +15 -0
- package/dist/modules/Order/utils/productVoucherGroups.js +115 -0
- package/dist/modules/Order/utils.d.ts +3 -1
- package/dist/modules/Order/utils.js +6 -2
- package/dist/modules/Product/index.d.ts +1 -1
- package/dist/modules/ProductList/clientDataVariants.js +6 -2
- package/dist/modules/ProductList/index.d.ts +2 -0
- package/dist/modules/ProductList/index.js +161 -51
- package/dist/modules/ResourcePlanner/planner.js +58 -2
- package/dist/modules/ResourcePlanner/types.d.ts +13 -0
- package/dist/modules/Rules/index.d.ts +2 -0
- package/dist/modules/Rules/index.js +58 -39
- package/dist/modules/Schedule/index.d.ts +7 -1
- package/dist/modules/Schedule/index.js +155 -39
- package/dist/modules/Schedule/types.d.ts +2 -0
- package/dist/modules/bookingReadValidation.d.ts +6 -0
- package/dist/modules/bookingReadValidation.js +72 -0
- package/dist/plugins/request.d.ts +2 -0
- package/dist/server/index.d.ts +8 -0
- package/dist/server/index.js +1458 -1166
- package/dist/server/modules/order/index.js +2 -1
- package/dist/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/dist/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/dist/shared/receipt/small-ticket.d.ts +4 -0
- package/dist/shared/receipt/small-ticket.js +70 -12
- package/dist/solution/BaseSales/index.d.ts +39 -5
- package/dist/solution/BaseSales/index.js +1828 -1462
- package/dist/solution/BaseSales/types.d.ts +1 -0
- package/dist/solution/BaseSales/types.js +1 -0
- package/dist/solution/BookingByStep/index.d.ts +16 -2
- package/dist/solution/BookingByStep/index.js +676 -361
- package/dist/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/dist/solution/BookingByStep/utils/resources.js +117 -76
- package/dist/solution/BookingTicket/index.d.ts +15 -3
- package/dist/solution/BookingTicket/index.js +249 -135
- package/dist/solution/BookingTicket/types.d.ts +14 -2
- package/dist/solution/BookingTicket/utils/addProductDecision.d.ts +3 -1
- package/dist/solution/BookingTicket/utils/addProductDecision.js +39 -11
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.js +188 -0
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +8 -0
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +88 -0
- package/dist/solution/BookingTicket/utils/scan/cloudSearch.js +1 -0
- package/dist/solution/BookingTicket/utils/scan/handleScan.js +2 -1
- package/dist/solution/OrderInvoicePreview/index.js +14 -8
- package/dist/solution/ScanOrder/index.d.ts +2 -0
- package/dist/solution/ScanOrder/index.js +166 -67
- package/dist/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/dist/solution/ScanOrder/menuAvailability.js +363 -0
- package/dist/solution/UnifiedBookingSales/catalogQueryBatch.d.ts +21 -0
- package/dist/solution/UnifiedBookingSales/catalogQueryBatch.js +202 -0
- package/dist/solution/UnifiedBookingSales/index.d.ts +96 -4
- package/dist/solution/UnifiedBookingSales/index.js +3374 -1177
- package/dist/solution/UnifiedBookingSales/remoteOccupancyCache.d.ts +2 -0
- package/dist/solution/UnifiedBookingSales/remoteOccupancyCache.js +4 -0
- package/dist/solution/UnifiedBookingSales/salesSettings.d.ts +16 -0
- package/dist/solution/UnifiedBookingSales/salesSettings.js +81 -0
- package/dist/solution/UnifiedBookingSales/sessionResourceCache.d.ts +27 -0
- package/dist/solution/UnifiedBookingSales/sessionResourceCache.js +271 -0
- package/dist/solution/UnifiedBookingSales/types.d.ts +71 -2
- package/dist/solution/UnifiedBookingSales/types.js +7 -1
- package/dist/solution/UnifiedBookingSales/venueCatalogSession.d.ts +32 -0
- package/dist/solution/UnifiedBookingSales/venueCatalogSession.js +283 -0
- package/dist/utils/platform.d.ts +2 -0
- package/dist/utils/platform.js +6 -0
- package/dist/utils/pos-receipt-auto-print.d.ts +4 -0
- package/dist/utils/pos-receipt-auto-print.js +14 -0
- package/lib/index.d.ts +1 -0
- package/lib/index.js +12 -0
- package/lib/inventory/index.d.ts +92 -0
- package/lib/inventory/index.js +287 -0
- package/lib/model/strategy/adapter/promotion/index.js +46 -1
- package/lib/modules/BookingContext/index.d.ts +2 -2
- package/lib/modules/BookingContext/index.js +42 -10
- package/lib/modules/BookingContext/types.d.ts +2 -0
- package/lib/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/lib/modules/BookingContext/utils/calendarBooking.js +156 -0
- package/lib/modules/BookingContext/utils/index.d.ts +1 -0
- package/lib/modules/BookingContext/utils/index.js +11 -0
- package/lib/modules/BookingContext/utils/productExtend.d.ts +20 -1
- package/lib/modules/BookingContext/utils/productExtend.js +96 -7
- package/lib/modules/Date/index.d.ts +1 -1
- package/lib/modules/Date/index.js +28 -5
- package/lib/modules/Date/types.d.ts +5 -0
- package/lib/modules/Discount/index.js +1 -0
- package/lib/modules/OpenData/index.d.ts +1 -0
- package/lib/modules/OpenData/index.js +12 -0
- package/lib/modules/OpenData/salesSettings.d.ts +32 -0
- package/lib/modules/OpenData/salesSettings.js +70 -0
- package/lib/modules/OpenData/types.d.ts +16 -0
- package/lib/modules/OpenData/utils.d.ts +1 -1
- package/lib/modules/OpenData/utils.js +3 -2
- package/lib/modules/Order/index.d.ts +55 -12
- package/lib/modules/Order/index.js +659 -80
- package/lib/modules/Order/types.d.ts +43 -5
- package/lib/modules/Order/types.js +2 -0
- package/lib/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/lib/modules/Order/unpaidAmountGap.js +60 -0
- package/lib/modules/Order/utils/discountProductLineIdentity.js +1 -1
- package/lib/modules/Order/utils/productVoucherGroups.d.ts +15 -0
- package/lib/modules/Order/utils/productVoucherGroups.js +64 -0
- package/lib/modules/Order/utils.d.ts +3 -1
- package/lib/modules/Order/utils.js +6 -2
- package/lib/modules/Product/index.d.ts +1 -1
- package/lib/modules/ProductList/clientDataVariants.js +6 -2
- package/lib/modules/ProductList/index.d.ts +2 -0
- package/lib/modules/ProductList/index.js +74 -0
- package/lib/modules/ResourcePlanner/planner.js +52 -1
- package/lib/modules/ResourcePlanner/types.d.ts +13 -0
- package/lib/modules/Rules/index.d.ts +2 -0
- package/lib/modules/Rules/index.js +25 -9
- package/lib/modules/Schedule/index.d.ts +7 -1
- package/lib/modules/Schedule/index.js +68 -4
- package/lib/modules/Schedule/types.d.ts +2 -0
- package/lib/modules/bookingReadValidation.d.ts +6 -0
- package/lib/modules/bookingReadValidation.js +56 -0
- package/lib/plugins/request.d.ts +2 -0
- package/lib/server/index.d.ts +8 -0
- package/lib/server/index.js +194 -19
- package/lib/server/modules/order/index.js +2 -1
- package/lib/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/lib/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/lib/shared/receipt/small-ticket.d.ts +4 -0
- package/lib/shared/receipt/small-ticket.js +63 -8
- package/lib/solution/BaseSales/index.d.ts +39 -5
- package/lib/solution/BaseSales/index.js +212 -18
- package/lib/solution/BaseSales/types.d.ts +1 -0
- package/lib/solution/BaseSales/types.js +1 -0
- package/lib/solution/BookingByStep/index.d.ts +16 -2
- package/lib/solution/BookingByStep/index.js +222 -14
- package/lib/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/lib/solution/BookingByStep/utils/resources.js +25 -15
- package/lib/solution/BookingTicket/index.d.ts +15 -3
- package/lib/solution/BookingTicket/index.js +47 -4
- package/lib/solution/BookingTicket/types.d.ts +14 -2
- package/lib/solution/BookingTicket/utils/addProductDecision.d.ts +3 -1
- package/lib/solution/BookingTicket/utils/addProductDecision.js +37 -6
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.js +136 -0
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +8 -0
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +54 -0
- package/lib/solution/BookingTicket/utils/scan/cloudSearch.js +1 -0
- package/lib/solution/BookingTicket/utils/scan/handleScan.js +2 -1
- package/lib/solution/OrderInvoicePreview/index.js +7 -1
- package/lib/solution/ScanOrder/index.d.ts +2 -0
- package/lib/solution/ScanOrder/index.js +72 -2
- package/lib/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/lib/solution/ScanOrder/menuAvailability.js +203 -0
- package/lib/solution/UnifiedBookingSales/catalogQueryBatch.d.ts +21 -0
- package/lib/solution/UnifiedBookingSales/catalogQueryBatch.js +109 -0
- package/lib/solution/UnifiedBookingSales/index.d.ts +96 -4
- package/lib/solution/UnifiedBookingSales/index.js +1316 -73
- package/lib/solution/UnifiedBookingSales/remoteOccupancyCache.d.ts +2 -0
- package/lib/solution/UnifiedBookingSales/remoteOccupancyCache.js +2 -0
- package/lib/solution/UnifiedBookingSales/salesSettings.d.ts +16 -0
- package/lib/solution/UnifiedBookingSales/salesSettings.js +72 -0
- package/lib/solution/UnifiedBookingSales/sessionResourceCache.d.ts +27 -0
- package/lib/solution/UnifiedBookingSales/sessionResourceCache.js +199 -0
- package/lib/solution/UnifiedBookingSales/types.d.ts +71 -2
- package/lib/solution/UnifiedBookingSales/types.js +4 -1
- package/lib/solution/UnifiedBookingSales/venueCatalogSession.d.ts +32 -0
- package/lib/solution/UnifiedBookingSales/venueCatalogSession.js +155 -0
- package/lib/utils/platform.d.ts +2 -0
- package/lib/utils/platform.js +7 -0
- package/lib/utils/pos-receipt-auto-print.d.ts +4 -0
- package/lib/utils/pos-receipt-auto-print.js +13 -0
- package/package.json +1 -1
|
@@ -33,14 +33,90 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
33
33
|
shopStore;
|
|
34
34
|
store;
|
|
35
35
|
otherParams = {};
|
|
36
|
+
scheduleRuntimeParams = {};
|
|
36
37
|
cacheId;
|
|
37
38
|
otherData = {}; // 提供给 UI 层的临时数据存储,会进缓存
|
|
38
39
|
platform; // 平台类型,用于判断是 PC / H5
|
|
40
|
+
productDetailGeneration = 0;
|
|
41
|
+
sessionAvailabilityRequestVersion = 0;
|
|
42
|
+
lifecycleGeneration = 0;
|
|
43
|
+
disposed = false;
|
|
44
|
+
resourcePreparation;
|
|
45
|
+
staleSelection() {
|
|
46
|
+
return Object.assign(new Error('Booking selection changed'), {
|
|
47
|
+
name: 'AbortError'
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
resourceSelectionKey() {
|
|
51
|
+
const items = this.store.cart.getItems();
|
|
52
|
+
const sessionDates = items.filter(item => (0, _products.isSessionProduct)(item._productOrigin)).flatMap(item => [item.start_date, item.end_date]).filter(Boolean);
|
|
53
|
+
return JSON.stringify({
|
|
54
|
+
lifecycle: this.lifecycleGeneration,
|
|
55
|
+
dates: sessionDates.length ? [...new Set(sessionDates)].sort() : (this.store.date.getDateRange() || []).map(date => date.date).sort(),
|
|
56
|
+
cart: items.map(item => ({
|
|
57
|
+
id: item._id,
|
|
58
|
+
num: item.num,
|
|
59
|
+
holder: item.holder_id,
|
|
60
|
+
start: [item.start_date, item.start_time],
|
|
61
|
+
end: [item.end_date, item.end_time],
|
|
62
|
+
resources: item._origin?.resources,
|
|
63
|
+
capacity: (0, _capacity.getCapacityInfoByCartItem)(item).currentCapacity,
|
|
64
|
+
product: {
|
|
65
|
+
id: item._productOrigin?.id,
|
|
66
|
+
schedules: item._productOrigin?.['schedule.ids'],
|
|
67
|
+
resources: item._productOrigin?.product_resource?.resources?.map(resource => ({
|
|
68
|
+
id: resource.id,
|
|
69
|
+
resource_type_id: resource.resource_type_id,
|
|
70
|
+
status: resource.status,
|
|
71
|
+
code: resource.code,
|
|
72
|
+
type: resource.type,
|
|
73
|
+
default_resource: resource.default_resource || [],
|
|
74
|
+
// Resource rendering removes required IDs from the optional list in place.
|
|
75
|
+
// Compare the same effective inputs before and after that normalization.
|
|
76
|
+
optional_resource: (resource.optional_resource || []).filter(id => !(resource.default_resource || []).includes(id)),
|
|
77
|
+
select_type: resource.select_type && {
|
|
78
|
+
type: resource.select_type.type,
|
|
79
|
+
min: resource.select_type.min,
|
|
80
|
+
max: resource.select_type.max
|
|
81
|
+
}
|
|
82
|
+
})),
|
|
83
|
+
duration: item._productOrigin?.duration,
|
|
84
|
+
cutoff: item._productOrigin?.cut_off_time
|
|
85
|
+
},
|
|
86
|
+
bundle: item._bundleOrigin,
|
|
87
|
+
options: item._optionsOrigin
|
|
88
|
+
}))
|
|
89
|
+
});
|
|
90
|
+
}
|
|
39
91
|
|
|
92
|
+
/** Semantic selection token for async UI transitions. */
|
|
93
|
+
getBookingSelectionKey() {
|
|
94
|
+
return this.resourceSelectionKey();
|
|
95
|
+
}
|
|
96
|
+
refreshCurrentProductSchedule() {
|
|
97
|
+
const product = this.store.currentProduct;
|
|
98
|
+
if (!product?.['schedule.ids'] || !this.store.schedule.isScheduleListLoaded()) return;
|
|
99
|
+
const version = this.store.schedule.getScheduleCatalogVersion();
|
|
100
|
+
const meta = this.store.currentProductMeta || {};
|
|
101
|
+
if (meta.scheduleCatalogVersion !== version) {
|
|
102
|
+
this.store.currentProductMeta = {
|
|
103
|
+
...meta,
|
|
104
|
+
schedule: this.getScheduleDataByIds(product['schedule.ids']),
|
|
105
|
+
scheduleCatalogVersion: version,
|
|
106
|
+
timeSlotBySchedule: undefined
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
}
|
|
40
110
|
async initialize(core, options) {
|
|
111
|
+
this.disposed = false;
|
|
112
|
+
this.lifecycleGeneration += 1;
|
|
113
|
+
this.productDetailGeneration += 1;
|
|
41
114
|
this.core = core;
|
|
42
115
|
this.store = options.store || {};
|
|
43
116
|
this.otherParams = options.otherParams || {};
|
|
117
|
+
this.scheduleRuntimeParams = {
|
|
118
|
+
...this.otherParams
|
|
119
|
+
};
|
|
44
120
|
// 获取依赖的插件
|
|
45
121
|
this.request = core.getPlugin('request');
|
|
46
122
|
this.window = core.getPlugin('window');
|
|
@@ -78,14 +154,20 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
78
154
|
...this.otherParams,
|
|
79
155
|
fatherModule: this.name,
|
|
80
156
|
openCache: this.otherParams?.cacheId ? true : false,
|
|
81
|
-
cacheId: this.otherParams?.cacheId
|
|
157
|
+
cacheId: this.otherParams?.cacheId,
|
|
158
|
+
...(step === 'schedule' ? {
|
|
159
|
+
scheduleCatalogCache: 'memory',
|
|
160
|
+
bookingRead: true
|
|
161
|
+
} : {})
|
|
82
162
|
}
|
|
83
163
|
});
|
|
84
164
|
} else {
|
|
85
165
|
throw new Error(`模块 ${step} 不存在`);
|
|
86
166
|
}
|
|
87
167
|
});
|
|
88
|
-
this.store.schedule.
|
|
168
|
+
this.store.schedule.ensureScheduleReady().catch(error => {
|
|
169
|
+
if (error?.name !== 'AbortError') console.error('[BookingByStep] Schedule preload failed', error);
|
|
170
|
+
});
|
|
89
171
|
this.core.effects.emit(`${this.name}:onInited`, {});
|
|
90
172
|
}
|
|
91
173
|
// 初始化step
|
|
@@ -174,6 +256,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
174
256
|
startDate: schedule_date || (0, _dayjs.default)().format('YYYY-MM-DD'),
|
|
175
257
|
endDate: schedule_date || (0, _dayjs.default)().format('YYYY-MM-DD'),
|
|
176
258
|
products: [...res]
|
|
259
|
+
}).catch(error => {
|
|
260
|
+
if (error?.name !== 'AbortError') console.error('[BookingByStep] Resource preload failed', error);
|
|
177
261
|
});
|
|
178
262
|
return res;
|
|
179
263
|
}
|
|
@@ -283,13 +367,15 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
283
367
|
startDate,
|
|
284
368
|
endDate,
|
|
285
369
|
custom_page_id,
|
|
286
|
-
channel
|
|
370
|
+
channel,
|
|
371
|
+
assertCurrent
|
|
287
372
|
}) {
|
|
288
373
|
return await this.store.schedule.loadScheduleAvailableDate({
|
|
289
374
|
startDate,
|
|
290
375
|
endDate,
|
|
291
376
|
custom_page_id,
|
|
292
|
-
channel
|
|
377
|
+
channel,
|
|
378
|
+
assertCurrent
|
|
293
379
|
});
|
|
294
380
|
}
|
|
295
381
|
|
|
@@ -431,6 +517,24 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
431
517
|
startDate = (0, _dayjs.default)().format('YYYY-MM-DD');
|
|
432
518
|
}
|
|
433
519
|
let tempProducts = products || this.store.cart.getItems().map(p => p._productOrigin);
|
|
520
|
+
const generation = this.productDetailGeneration;
|
|
521
|
+
const lifecycle = this.lifecycleGeneration;
|
|
522
|
+
const selectionKey = products ? undefined : this.resourceSelectionKey();
|
|
523
|
+
const assertCurrent = () => {
|
|
524
|
+
if (this.disposed || lifecycle !== this.lifecycleGeneration || (!products || !params.assertCurrent) && generation !== this.productDetailGeneration || selectionKey !== undefined && selectionKey !== this.resourceSelectionKey()) throw this.staleSelection();
|
|
525
|
+
params.assertCurrent?.();
|
|
526
|
+
};
|
|
527
|
+
const requiresSchedule = tempProducts.some(product => product?.['schedule.ids']?.length) || !products && !!this.store.currentProduct?.['schedule.ids']?.length;
|
|
528
|
+
if (requiresSchedule) {
|
|
529
|
+
try {
|
|
530
|
+
await this.store.schedule.ensureScheduleReady();
|
|
531
|
+
} catch (error) {
|
|
532
|
+
assertCurrent();
|
|
533
|
+
throw error;
|
|
534
|
+
}
|
|
535
|
+
assertCurrent();
|
|
536
|
+
this.refreshCurrentProductSchedule();
|
|
537
|
+
}
|
|
434
538
|
if (tempProducts.length) {
|
|
435
539
|
tempProducts.forEach(p => {
|
|
436
540
|
if (p?.['schedule.ids']) {
|
|
@@ -440,7 +544,7 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
440
544
|
});
|
|
441
545
|
}
|
|
442
546
|
// 如果当前打开了某个的商品详情弹窗,则应该默认用这个商品
|
|
443
|
-
if (this.store.currentProduct) {
|
|
547
|
+
if (!products && this.store.currentProduct) {
|
|
444
548
|
tempProducts = [{
|
|
445
549
|
...this.store.currentProduct,
|
|
446
550
|
_schedule: this.store.currentProductMeta?.['schedule']
|
|
@@ -460,6 +564,7 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
460
564
|
resourcesMap
|
|
461
565
|
} = (0, _products.getAvailableProductResources)(tempProducts) || {};
|
|
462
566
|
this.otherParams.currentResourcesMap = resourcesMap;
|
|
567
|
+
const catalogVersion = this.store.schedule.getScheduleCatalogVersion();
|
|
463
568
|
const res = await this.store.date.getResourceDates({
|
|
464
569
|
url: params.url,
|
|
465
570
|
query: {
|
|
@@ -469,11 +574,56 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
469
574
|
},
|
|
470
575
|
rules,
|
|
471
576
|
type,
|
|
472
|
-
useCache
|
|
577
|
+
useCache,
|
|
578
|
+
bookingRead: true,
|
|
579
|
+
errorMode: 'throw',
|
|
580
|
+
assertCurrent: () => {
|
|
581
|
+
assertCurrent();
|
|
582
|
+
if (requiresSchedule && catalogVersion !== this.store.schedule.getScheduleCatalogVersion()) throw this.staleSelection();
|
|
583
|
+
}
|
|
473
584
|
});
|
|
474
585
|
return res;
|
|
475
586
|
}
|
|
476
587
|
|
|
588
|
+
/** Prepare the exact cart/date selection before synchronous resource checks. */
|
|
589
|
+
prepareResourcesForCurrentSelection() {
|
|
590
|
+
const key = this.resourceSelectionKey();
|
|
591
|
+
if (this.resourcePreparation?.key === key) return this.resourcePreparation.promise;
|
|
592
|
+
const selected = (0, _lodashEs.cloneDeep)(this.store.date.getDateRange() || []);
|
|
593
|
+
const cart = this.store.cart.getItems().filter(item => !(0, _utils5.isNormalProduct)(item._productOrigin));
|
|
594
|
+
const sessionDates = cart.filter(item => (0, _products.isSessionProduct)(item._productOrigin)).flatMap(item => [item.start_date, item.end_date]).filter(Boolean);
|
|
595
|
+
const selectedDates = sessionDates.length ? [...new Set(sessionDates)].sort() : selected.map(date => date.date).sort();
|
|
596
|
+
const dates = selectedDates;
|
|
597
|
+
if (!cart.length || !dates.length) return Promise.resolve();
|
|
598
|
+
const assertCurrent = () => {
|
|
599
|
+
if (this.disposed || key !== this.resourceSelectionKey()) throw this.staleSelection();
|
|
600
|
+
};
|
|
601
|
+
const promise = (async () => {
|
|
602
|
+
const available = await this.getAvailableDate({
|
|
603
|
+
startDate: dates[0],
|
|
604
|
+
endDate: dates[dates.length - 1],
|
|
605
|
+
products: cart.map(item => item._productOrigin),
|
|
606
|
+
assertCurrent
|
|
607
|
+
});
|
|
608
|
+
assertCurrent();
|
|
609
|
+
this.store.date.setDateRange(selectedDates.map(date => available.find(item => item.date === date) || {
|
|
610
|
+
date,
|
|
611
|
+
week: (0, _dayjs.default)(date).format('ddd'),
|
|
612
|
+
weekNum: (0, _dayjs.default)(date).day(),
|
|
613
|
+
status: 'unavailable',
|
|
614
|
+
resource: []
|
|
615
|
+
}));
|
|
616
|
+
})();
|
|
617
|
+
this.resourcePreparation = {
|
|
618
|
+
key,
|
|
619
|
+
promise
|
|
620
|
+
};
|
|
621
|
+
void promise.finally(() => {
|
|
622
|
+
if (this.resourcePreparation?.promise === promise) this.resourcePreparation = undefined;
|
|
623
|
+
}).catch(() => {});
|
|
624
|
+
return promise;
|
|
625
|
+
}
|
|
626
|
+
|
|
477
627
|
/**
|
|
478
628
|
* 获取购物车汇总信息
|
|
479
629
|
*/
|
|
@@ -610,6 +760,10 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
610
760
|
async setOtherParams(params, {
|
|
611
761
|
cover = false
|
|
612
762
|
} = {}) {
|
|
763
|
+
this.scheduleRuntimeParams = {
|
|
764
|
+
...this.scheduleRuntimeParams,
|
|
765
|
+
...params
|
|
766
|
+
};
|
|
613
767
|
if (cover) {
|
|
614
768
|
this.otherParams = params;
|
|
615
769
|
} else {
|
|
@@ -618,6 +772,13 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
618
772
|
...params
|
|
619
773
|
};
|
|
620
774
|
}
|
|
775
|
+
this.store.schedule?.updateOtherParams({
|
|
776
|
+
...this.scheduleRuntimeParams,
|
|
777
|
+
fatherModule: this.name,
|
|
778
|
+
openCache: !!this.scheduleRuntimeParams.cacheId,
|
|
779
|
+
scheduleCatalogCache: 'memory',
|
|
780
|
+
bookingRead: true
|
|
781
|
+
});
|
|
621
782
|
}
|
|
622
783
|
async getOtherParams() {
|
|
623
784
|
return this.otherParams;
|
|
@@ -948,6 +1109,11 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
948
1109
|
return errorCartItemIds;
|
|
949
1110
|
}
|
|
950
1111
|
destroy() {
|
|
1112
|
+
this.disposed = true;
|
|
1113
|
+
this.lifecycleGeneration += 1;
|
|
1114
|
+
this.productDetailGeneration += 1;
|
|
1115
|
+
this.resourcePreparation = undefined;
|
|
1116
|
+
this.store.schedule?.destroy();
|
|
951
1117
|
this.store.cart?.destroy();
|
|
952
1118
|
this.store.step?.destroy();
|
|
953
1119
|
this.store.products?.destroy();
|
|
@@ -1955,7 +2121,17 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
1955
2121
|
}
|
|
1956
2122
|
// 打开某个商品详情的弹窗,OS 层这边会记录当前选中的商品,适用于 session 类商品预约
|
|
1957
2123
|
async openProductDetail(productId) {
|
|
1958
|
-
const
|
|
2124
|
+
const generation = ++this.productDetailGeneration;
|
|
2125
|
+
let targetProductData;
|
|
2126
|
+
try {
|
|
2127
|
+
targetProductData = await this.store.products.getProduct(productId);
|
|
2128
|
+
if (targetProductData?.['schedule.ids']?.length) await this.store.schedule.ensureScheduleReady();
|
|
2129
|
+
} catch (error) {
|
|
2130
|
+
if (this.disposed || generation !== this.productDetailGeneration) throw this.staleSelection();
|
|
2131
|
+
throw error;
|
|
2132
|
+
}
|
|
2133
|
+
if (this.disposed || generation !== this.productDetailGeneration) throw this.staleSelection();
|
|
2134
|
+
if (!targetProductData) throw new Error('Booking product is unavailable');
|
|
1959
2135
|
if (targetProductData) {
|
|
1960
2136
|
this.store.currentProduct = targetProductData;
|
|
1961
2137
|
this.store.currentProductMeta = {};
|
|
@@ -1964,6 +2140,7 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
1964
2140
|
const newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
|
|
1965
2141
|
if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
|
|
1966
2142
|
this.store.currentProductMeta.schedule = newScheduleArr;
|
|
2143
|
+
this.store.currentProductMeta.scheduleCatalogVersion = this.store.schedule.getScheduleCatalogVersion();
|
|
1967
2144
|
} else if (targetProductData.duration) {
|
|
1968
2145
|
const dateRange = this.store.date.getDateRange();
|
|
1969
2146
|
// 如果不是先选日期的流程 duration 商品就啥也不做
|
|
@@ -1979,14 +2156,15 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
1979
2156
|
startDate: dateRange[0].date,
|
|
1980
2157
|
endDate: dateRange[dateRange.length - 1].date,
|
|
1981
2158
|
products: [targetProductData]
|
|
2159
|
+
}).catch(error => {
|
|
2160
|
+
if (error?.name !== 'AbortError') console.error('[BookingByStep] Product resource preload failed', error);
|
|
1982
2161
|
});
|
|
1983
2162
|
}
|
|
1984
2163
|
}
|
|
1985
2164
|
}
|
|
1986
2165
|
closeProductDetail() {
|
|
1987
|
-
|
|
1988
|
-
|
|
1989
|
-
}
|
|
2166
|
+
this.productDetailGeneration += 1;
|
|
2167
|
+
this.store.currentProductMeta = {};
|
|
1990
2168
|
this.store.currentProduct = undefined;
|
|
1991
2169
|
}
|
|
1992
2170
|
|
|
@@ -2222,11 +2400,19 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
2222
2400
|
start_at: (0, _dayjs.default)(item.start),
|
|
2223
2401
|
end_at: (0, _dayjs.default)(item.end)
|
|
2224
2402
|
})) {
|
|
2225
|
-
mSet.set(m.id,
|
|
2403
|
+
mSet.set(m.id, {
|
|
2404
|
+
...m,
|
|
2405
|
+
pax: m.pax ?? 1
|
|
2406
|
+
});
|
|
2226
2407
|
}
|
|
2227
2408
|
});
|
|
2228
2409
|
});
|
|
2229
|
-
|
|
2410
|
+
const peakUsedCapacity = (0, _resources.getPeakConcurrentPax)(Array.from(mSet.values()), {
|
|
2411
|
+
start_at: (0, _dayjs.default)(item.start),
|
|
2412
|
+
end_at: (0, _dayjs.default)(item.end)
|
|
2413
|
+
});
|
|
2414
|
+
// 单个资源的超额占用不能扣减其他资源的可用容量。
|
|
2415
|
+
acc += Math.min(curr.capacity, peakUsedCapacity);
|
|
2230
2416
|
return acc;
|
|
2231
2417
|
}, 0);
|
|
2232
2418
|
// 如果已使用容量超过了当前类型资源的容量,则不可用
|
|
@@ -3128,6 +3314,20 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
3128
3314
|
return results;
|
|
3129
3315
|
}
|
|
3130
3316
|
async getAvailableDateForSessionOptimize(params = {}) {
|
|
3317
|
+
const requestVersion = ++this.sessionAvailabilityRequestVersion;
|
|
3318
|
+
const generation = this.productDetailGeneration;
|
|
3319
|
+
try {
|
|
3320
|
+
await this.store.schedule.ensureScheduleReady();
|
|
3321
|
+
} catch (error) {
|
|
3322
|
+
if (this.disposed || generation !== this.productDetailGeneration || requestVersion !== this.sessionAvailabilityRequestVersion) throw this.staleSelection();
|
|
3323
|
+
throw error;
|
|
3324
|
+
}
|
|
3325
|
+
if (this.disposed || generation !== this.productDetailGeneration || requestVersion !== this.sessionAvailabilityRequestVersion || !this.store.currentProduct) throw this.staleSelection();
|
|
3326
|
+
this.refreshCurrentProductSchedule();
|
|
3327
|
+
const catalogVersion = this.store.schedule.getScheduleCatalogVersion();
|
|
3328
|
+
const assertCurrent = () => {
|
|
3329
|
+
if (this.disposed || generation !== this.productDetailGeneration || requestVersion !== this.sessionAvailabilityRequestVersion || catalogVersion !== this.store.schedule.getScheduleCatalogVersion()) throw this.staleSelection();
|
|
3330
|
+
};
|
|
3131
3331
|
// 开始日期如果小于今天,直接以今天当做开始日期
|
|
3132
3332
|
let {
|
|
3133
3333
|
startDate,
|
|
@@ -3158,7 +3358,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
3158
3358
|
if (cache) {
|
|
3159
3359
|
// 开始日期大于等于缓存的开始日期,且结束日期小于等于缓存的结束日期,则直接返回缓存结果
|
|
3160
3360
|
if ((0, _dayjs.default)(params.startDate).isSameOrAfter((0, _dayjs.default)(cache.startDate), 'day') && (0, _dayjs.default)(params.endDate).isSameOrBefore((0, _dayjs.default)(cache.endDate), 'day')) {
|
|
3161
|
-
|
|
3361
|
+
assertCurrent();
|
|
3362
|
+
this.store.date.setDateList(cache.dateList, true);
|
|
3162
3363
|
return {
|
|
3163
3364
|
dateList: cache.dateList,
|
|
3164
3365
|
firstAvailableDate: cache.firstAvailableDate
|
|
@@ -3173,12 +3374,18 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
3173
3374
|
// 1.后端返回的数据,确定资源在每一天的可用和使用情况
|
|
3174
3375
|
const tempResourceIds = (0, _capacity.getResourcesIdsByProduct)(tempProducts);
|
|
3175
3376
|
const res = await this.store.date.fetchResourceDates({
|
|
3377
|
+
errorMode: 'throw',
|
|
3378
|
+
bookingRead: true,
|
|
3176
3379
|
query: {
|
|
3177
3380
|
start_date: startDate || '',
|
|
3178
3381
|
end_date: endDate || '',
|
|
3179
3382
|
resource_ids: tempResourceIds
|
|
3180
3383
|
}
|
|
3384
|
+
}).catch(error => {
|
|
3385
|
+
assertCurrent();
|
|
3386
|
+
throw error;
|
|
3181
3387
|
});
|
|
3388
|
+
assertCurrent();
|
|
3182
3389
|
// 2. 商品 schedule 数据,确定日程在每一天的时间片
|
|
3183
3390
|
// 3. 把后端返回的和 schedule 的数据进行合并,确定每一天的可用和使用情况
|
|
3184
3391
|
let dates = [];
|
|
@@ -3358,7 +3565,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
|
|
|
3358
3565
|
}
|
|
3359
3566
|
// 最终把资源数据也加到日期内
|
|
3360
3567
|
dates = (0, _utils4.handleAvailableDateByResource)(res.data, dates);
|
|
3361
|
-
|
|
3568
|
+
assertCurrent();
|
|
3569
|
+
this.store.date.setDateList(dates, true);
|
|
3362
3570
|
|
|
3363
3571
|
// 缓存这次结果,以防后面他小幅度范围内去修改天数
|
|
3364
3572
|
if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
|
|
@@ -7,6 +7,11 @@ import { CartItem, ProductData } from '../../../modules';
|
|
|
7
7
|
*
|
|
8
8
|
*/
|
|
9
9
|
type DateType = Dayjs;
|
|
10
|
+
interface EventItem {
|
|
11
|
+
pax: number;
|
|
12
|
+
start_at: DateType;
|
|
13
|
+
end_at: DateType;
|
|
14
|
+
}
|
|
10
15
|
export interface TimeSliceItem {
|
|
11
16
|
start_time: string;
|
|
12
17
|
end_time: string;
|
|
@@ -20,6 +25,11 @@ export interface ResourceItem {
|
|
|
20
25
|
interface BookingItem {
|
|
21
26
|
[key: string]: any;
|
|
22
27
|
}
|
|
28
|
+
/** 计算目标区间内的最大同时占用人数;事件去重由调用方负责。 */
|
|
29
|
+
export declare const getPeakConcurrentPax: (eventList: EventItem[], timeSlice: {
|
|
30
|
+
start_at: DateType;
|
|
31
|
+
end_at: DateType;
|
|
32
|
+
}) => number;
|
|
23
33
|
/**
|
|
24
34
|
* @title: 判断两个时间段是否有重叠
|
|
25
35
|
* @description:
|
|
@@ -7,7 +7,7 @@ exports.checkSessionProductLeadTime = checkSessionProductLeadTime;
|
|
|
7
7
|
exports.checkTwoResourcesIntersection = checkTwoResourcesIntersection;
|
|
8
8
|
exports.filterResourcesByFormItem = filterResourcesByFormItem;
|
|
9
9
|
exports.filterScheduleByDateRange = filterScheduleByDateRange;
|
|
10
|
-
exports.getResourcesByProduct = exports.getResourcesByIds = exports.getOthersSelectedResources = exports.getOthersCartSelectedResources = exports.getIsUsableByTimeItem = exports.formatResources = void 0;
|
|
10
|
+
exports.getResourcesByProduct = exports.getResourcesByIds = exports.getPeakConcurrentPax = exports.getOthersSelectedResources = exports.getOthersCartSelectedResources = exports.getIsUsableByTimeItem = exports.formatResources = void 0;
|
|
11
11
|
exports.getResourcesIdsByProduct = getResourcesIdsByProduct;
|
|
12
12
|
exports.mergeSubResourcesTimeSlices = exports.isConflict = exports.getTimesIntersection = exports.getTimeSlicesByResources = exports.getTimeSlicesByResource = void 0;
|
|
13
13
|
exports.sortCombinedResources = sortCombinedResources;
|
|
@@ -20,18 +20,27 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
20
20
|
*
|
|
21
21
|
*/
|
|
22
22
|
|
|
23
|
-
/**
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
23
|
+
/** 计算目标区间内的最大同时占用人数;事件去重由调用方负责。 */
|
|
24
|
+
const getPeakConcurrentPax = (eventList, timeSlice) => {
|
|
25
|
+
const start = (0, _dayjs.default)(timeSlice.start_at).valueOf();
|
|
26
|
+
const end = (0, _dayjs.default)(timeSlice.end_at).valueOf();
|
|
27
|
+
const changes = new Map();
|
|
28
|
+
for (const event of eventList || []) {
|
|
29
|
+
const eventStart = Math.max(start, (0, _dayjs.default)(event.start_at).valueOf());
|
|
30
|
+
const eventEnd = Math.min(end, (0, _dayjs.default)(event.end_at).valueOf());
|
|
31
|
+
if (!(eventStart < eventEnd)) continue;
|
|
32
|
+
const pax = Number(event.pax);
|
|
33
|
+
changes.set(eventStart, (changes.get(eventStart) ?? 0) + pax);
|
|
34
|
+
changes.set(eventEnd, (changes.get(eventEnd) ?? 0) - pax);
|
|
35
|
+
}
|
|
36
|
+
let current = 0;
|
|
37
|
+
let peak = 0;
|
|
38
|
+
// 同一时刻合并增减量,保持 [start, end) 语义,首尾相接不叠加。
|
|
39
|
+
for (const [, change] of [...changes].sort(([a], [b]) => a - b)) {
|
|
40
|
+
current += change;
|
|
41
|
+
peak = Math.max(peak, current);
|
|
42
|
+
}
|
|
43
|
+
return peak;
|
|
35
44
|
};
|
|
36
45
|
|
|
37
46
|
/**
|
|
@@ -42,6 +51,7 @@ const getUseableEventCount = (eventList, current) => {
|
|
|
42
51
|
* @return {*}
|
|
43
52
|
* @Author: zhiwei.Wang
|
|
44
53
|
*/
|
|
54
|
+
exports.getPeakConcurrentPax = getPeakConcurrentPax;
|
|
45
55
|
const isConflict = (event, current) => {
|
|
46
56
|
const eventStart = (0, _dayjs.default)(event.start_at);
|
|
47
57
|
const eventEnd = (0, _dayjs.default)(event.end_at);
|
|
@@ -132,8 +142,8 @@ const checkCapacity = ({
|
|
|
132
142
|
});
|
|
133
143
|
});
|
|
134
144
|
|
|
135
|
-
//
|
|
136
|
-
|
|
145
|
+
// 多人预约按同时占用峰值扣减,不能把先后到访的所有人数相加。
|
|
146
|
+
const conflictCount = resource.resourceType === 'single' ? conflict.reduce((remaining, event) => remaining - event.pax, resource.capacity || 0) : (resource.capacity || 0) - getPeakConcurrentPax(conflict, timeSlice);
|
|
137
147
|
|
|
138
148
|
// 同一时间段内只能进行一个预约,无论容量是否已满。
|
|
139
149
|
if (resource.resourceType === 'single') {
|
|
@@ -447,7 +447,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
447
447
|
/**
|
|
448
448
|
* 构造 BookingContext 计算上下文(供 getProductExtend / getResourceByIds 等读 API 复用)。
|
|
449
449
|
*/
|
|
450
|
-
|
|
450
|
+
protected buildBookingCalcContext(extra?: Partial<BookingCalcContext>): BookingCalcContext;
|
|
451
451
|
/**
|
|
452
452
|
* 取商品当前可选资源列表(透传 OS BookingContext utils#getResourceByIds)。
|
|
453
453
|
* `extraResources` 用于把拖入未绑定的资源也展示出来。
|
|
@@ -480,12 +480,24 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
480
480
|
/**
|
|
481
481
|
* 拼装 addProductDecision 通用上下文(从 store 自取)。
|
|
482
482
|
*/
|
|
483
|
-
|
|
483
|
+
protected buildAddProductCtx(extra?: Partial<AddProductDecideContext>): AddProductDecideContext;
|
|
484
484
|
/**
|
|
485
485
|
* 加车两阶段主决策(规格弹窗 / 资源编辑 / 直接加车)。
|
|
486
486
|
* 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
|
|
487
487
|
*/
|
|
488
|
-
decideAddProduct(item: any, options?: Partial<AddProductDecideContext>):
|
|
488
|
+
decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
|
|
489
|
+
action: "reloadCatalog";
|
|
490
|
+
} | {
|
|
491
|
+
action: "add";
|
|
492
|
+
cacheItem: any;
|
|
493
|
+
} | {
|
|
494
|
+
action: "requiresDetail";
|
|
495
|
+
payload: AddProductRequiresDetailPayload;
|
|
496
|
+
} | {
|
|
497
|
+
action: "requiresBookingEdit";
|
|
498
|
+
cacheItem: any;
|
|
499
|
+
payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
|
|
500
|
+
};
|
|
489
501
|
/** 规格弹窗 callback 后的第二段决策。 */
|
|
490
502
|
decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
|
|
491
503
|
/**
|
|
@@ -30,6 +30,7 @@ var _handleScan = require("./utils/scan/handleScan");
|
|
|
30
30
|
var _scanCache = _interopRequireDefault(require("./utils/scan/scanCache"));
|
|
31
31
|
var _formatGlobalScan = require("./utils/scan/formatGlobalScan");
|
|
32
32
|
var _applyGlobalScan = require("./utils/scan/applyGlobalScan");
|
|
33
|
+
var _applyProductVoucherCollectionScan = require("./utils/scan/applyProductVoucherCollectionScan");
|
|
33
34
|
var _cartView = require("./utils/cartView");
|
|
34
35
|
var _addProductDecision = require("./utils/addProductDecision");
|
|
35
36
|
var _buildCacheItemFromOrderLine = require("../../modules/BookingContext/utils/buildCacheItemFromOrderLine");
|
|
@@ -1620,7 +1621,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
|
|
|
1620
1621
|
resourcesOriginMap: state.resourcesOriginMap,
|
|
1621
1622
|
date,
|
|
1622
1623
|
presetStartTime: extra?.presetStartTime ?? (0, _BookingContext.derivePresetStartTimeFromDate)(date),
|
|
1623
|
-
...(extra || {})
|
|
1624
|
+
...(extra || {}),
|
|
1625
|
+
orderSessionId: this.getOrderSessionId() ?? undefined,
|
|
1626
|
+
isOrderSessionCurrent: sessionId => this.isOrderSessionCurrent(sessionId),
|
|
1627
|
+
platform: String(this.otherParams?.platform || '').trim().toLowerCase()
|
|
1624
1628
|
};
|
|
1625
1629
|
}
|
|
1626
1630
|
|
|
@@ -1712,7 +1716,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
|
|
|
1712
1716
|
presetStartTime: extra?.presetStartTime ?? (0, _BookingContext.derivePresetStartTimeFromDate)(date),
|
|
1713
1717
|
customerId: orderCustomerId,
|
|
1714
1718
|
...(extra || {}),
|
|
1715
|
-
channel: this.getSubmitOrderSalesChannel()
|
|
1719
|
+
channel: this.getSubmitOrderSalesChannel(),
|
|
1720
|
+
orderSessionId: this.getOrderSessionId() ?? undefined,
|
|
1721
|
+
isOrderSessionCurrent: sessionId => this.isOrderSessionCurrent(sessionId),
|
|
1722
|
+
platform: String(this.otherParams?.platform || '').trim().toLowerCase()
|
|
1716
1723
|
};
|
|
1717
1724
|
}
|
|
1718
1725
|
|
|
@@ -1845,6 +1852,20 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
|
|
|
1845
1852
|
return bridge.openBookingEdit(payload);
|
|
1846
1853
|
} : undefined
|
|
1847
1854
|
} : undefined;
|
|
1855
|
+
if (guardedBridge?.scanScope === 'product-voucher') {
|
|
1856
|
+
if (!guardedBridge.applyPromotionCode) return {
|
|
1857
|
+
status: 'failed',
|
|
1858
|
+
reason: 'no_bridge'
|
|
1859
|
+
};
|
|
1860
|
+
const promotion = await guardedBridge.applyPromotionCode(trimmed);
|
|
1861
|
+
return promotion.isAccepted ?? promotion.isAvailable ? {
|
|
1862
|
+
status: 'success',
|
|
1863
|
+
kind: 'promotion'
|
|
1864
|
+
} : {
|
|
1865
|
+
status: 'failed',
|
|
1866
|
+
reason: 'not_found'
|
|
1867
|
+
};
|
|
1868
|
+
}
|
|
1848
1869
|
const localSearch = v => this.store.products.findProductsByCodeOrBarcode(v);
|
|
1849
1870
|
const scanCallback = (0, _handleScan.handleGlobalScan)(this.request, localSearch, this.getSubmitOrderSalesChannel());
|
|
1850
1871
|
const raw = await scanCallback({
|
|
@@ -1859,7 +1880,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
|
|
|
1859
1880
|
reason: 'not_found'
|
|
1860
1881
|
};
|
|
1861
1882
|
}
|
|
1862
|
-
const
|
|
1883
|
+
const host = {
|
|
1863
1884
|
setOrderCustomer: customer => {
|
|
1864
1885
|
beforeScanCommit();
|
|
1865
1886
|
this.setOrderCustomer(customer);
|
|
@@ -1880,10 +1901,30 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
|
|
|
1880
1901
|
beforeScanCommit();
|
|
1881
1902
|
return this.scanWalletAsset(scanCode);
|
|
1882
1903
|
}
|
|
1883
|
-
}
|
|
1904
|
+
};
|
|
1905
|
+
const result = guardedBridge?.scanScope === 'product-voucher-collection' ? await (0, _applyProductVoucherCollectionScan.applyProductVoucherCollectionScan)({
|
|
1906
|
+
...host,
|
|
1907
|
+
loadCustomerDiscounts: async () => {
|
|
1908
|
+
beforeScanCommit();
|
|
1909
|
+
const customerId = Number(this.getOrderCustomer()?.customer_id || 0);
|
|
1910
|
+
if (customerId <= 1) return [];
|
|
1911
|
+
await this.refreshDiscountConfigAfterOrderCustomerChange(customerId);
|
|
1912
|
+
beforeScanCommit();
|
|
1913
|
+
return this.getDiscountList();
|
|
1914
|
+
}
|
|
1915
|
+
}, formatted, guardedBridge) : await (0, _applyGlobalScan.applyGlobalScan)(host, formatted, guardedBridge);
|
|
1884
1916
|
bridge?.refresh?.();
|
|
1885
1917
|
return result;
|
|
1886
1918
|
} catch (error) {
|
|
1919
|
+
if (bridge?.scanScope === 'product-voucher-collection') {
|
|
1920
|
+
if (bridge.isCurrent?.() === false) return {
|
|
1921
|
+
status: 'cancelled'
|
|
1922
|
+
};
|
|
1923
|
+
return {
|
|
1924
|
+
status: 'failed',
|
|
1925
|
+
reason: 'entry_resolution_failed'
|
|
1926
|
+
};
|
|
1927
|
+
}
|
|
1887
1928
|
console.error('[BookingTicket] handleGlobalScanCode failed', error);
|
|
1888
1929
|
bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
|
|
1889
1930
|
return {
|
|
@@ -2112,6 +2153,8 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
|
|
|
2112
2153
|
await this.replaceTempOrder({
|
|
2113
2154
|
...tempOrder,
|
|
2114
2155
|
vouchers: nextVouchers
|
|
2156
|
+
}, {
|
|
2157
|
+
preserveOrderSessionId: this.getOrderSessionId() || undefined
|
|
2115
2158
|
});
|
|
2116
2159
|
}
|
|
2117
2160
|
this.core.effects.emit(`${this.name}:onVouchersChange`, {});
|
|
@@ -208,6 +208,10 @@ export interface AddAddTimeProductsToBookingInput {
|
|
|
208
208
|
}
|
|
209
209
|
/** 扫码宿主桥接:SalesSdk 在 pubsub 订阅回调里注入,OS 需要 UI 时直接调用 */
|
|
210
210
|
export interface GlobalScanHostBridge {
|
|
211
|
+
/** product-voucher handles voucher codes; product-voucher-collection loads all vouchers for the scanned customer. */
|
|
212
|
+
scanScope?: 'all' | 'product-voucher' | 'product-voucher-collection';
|
|
213
|
+
/** A one-shot entry may outlive its page while requests are in flight. */
|
|
214
|
+
isCurrent?: () => boolean;
|
|
211
215
|
openProductDetail?: (payload: Record<string, any>) => Promise<any | null>;
|
|
212
216
|
openBookingEdit?: (payload: Record<string, any>) => Promise<any | null>;
|
|
213
217
|
confirmDetail?: (input: {
|
|
@@ -232,11 +236,13 @@ export interface GlobalScanHostBridge {
|
|
|
232
236
|
*/
|
|
233
237
|
applyPromotionCode?: (code: string, customerId?: number, options?: {
|
|
234
238
|
suppressFailureNotification?: boolean;
|
|
239
|
+
productVouchersOnly?: boolean;
|
|
235
240
|
}) => Promise<{
|
|
236
241
|
isAvailable?: boolean;
|
|
237
242
|
isAccepted?: boolean;
|
|
238
243
|
type?: string;
|
|
239
244
|
unavailableReason?: string;
|
|
245
|
+
scannedDiscountList?: Record<string, any>[];
|
|
240
246
|
}>;
|
|
241
247
|
/** 当前订单已有其他客户时,由宿主复用客户组件完成确认及切换。 */
|
|
242
248
|
requestCustomerSwitch?: (customer: ICustomer) => Promise<boolean | null>;
|
|
@@ -244,7 +250,7 @@ export interface GlobalScanHostBridge {
|
|
|
244
250
|
refresh?: () => void;
|
|
245
251
|
}
|
|
246
252
|
/** handleGlobalScanCode 结构化返回 */
|
|
247
|
-
export type GlobalScanHandleResult = {
|
|
253
|
+
export type GlobalScanHandleResult = ({
|
|
248
254
|
status: 'success';
|
|
249
255
|
kind: 'customer' | 'products' | 'promotion';
|
|
250
256
|
meta?: {
|
|
@@ -257,5 +263,11 @@ export type GlobalScanHandleResult = {
|
|
|
257
263
|
status: 'cancelled';
|
|
258
264
|
} | {
|
|
259
265
|
status: 'failed';
|
|
260
|
-
reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge';
|
|
266
|
+
reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge' | 'entry_resolution_failed';
|
|
267
|
+
}) & {
|
|
268
|
+
/** product-voucher-collection returns voucher candidates; the caller decides how to use them. */
|
|
269
|
+
redemption?: {
|
|
270
|
+
source: 'wallet' | 'scan';
|
|
271
|
+
vouchers: Record<string, any>[];
|
|
272
|
+
};
|
|
261
273
|
};
|