@pisell/pisellos 3.0.12 → 3.0.13
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/solution/BookingByStep/index.js +2 -1
- package/dist/solution/BookingByStep/utils/resources.d.ts +6 -1
- package/dist/solution/BookingByStep/utils/resources.js +34 -27
- package/lib/solution/BookingByStep/index.js +2 -1
- package/lib/solution/BookingByStep/utils/resources.d.ts +6 -1
- package/lib/solution/BookingByStep/utils/resources.js +9 -2
- package/package.json +1 -1
|
@@ -1860,7 +1860,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
1860
1860
|
time: childTiem,
|
|
1861
1861
|
resource: m,
|
|
1862
1862
|
currentCount: 1,
|
|
1863
|
-
resourcesUseableMap: resourcesUseableMap
|
|
1863
|
+
resourcesUseableMap: resourcesUseableMap,
|
|
1864
|
+
cut_off_time: targetProductData === null || targetProductData === void 0 ? void 0 : targetProductData.cut_off_time
|
|
1864
1865
|
});
|
|
1865
1866
|
if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
|
|
1866
1867
|
resourcesUseableMap[m.id] = res.usable;
|
|
@@ -27,12 +27,17 @@ interface BookingItem {
|
|
|
27
27
|
* @return {*}
|
|
28
28
|
* @Author: zhiwei.Wang
|
|
29
29
|
*/
|
|
30
|
-
export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, }: {
|
|
30
|
+
export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, cut_off_time, }: {
|
|
31
31
|
timeSlice: TimeSliceItem;
|
|
32
32
|
time: any;
|
|
33
33
|
resource: ResourceItem;
|
|
34
34
|
currentCount: number;
|
|
35
35
|
resourcesUseableMap: Record<string, boolean>;
|
|
36
|
+
cut_off_time?: {
|
|
37
|
+
future_day: number;
|
|
38
|
+
unit: number;
|
|
39
|
+
unit_type: string;
|
|
40
|
+
} | undefined;
|
|
36
41
|
}) => {
|
|
37
42
|
afterToDay: boolean;
|
|
38
43
|
capacity: boolean;
|
|
@@ -175,7 +175,8 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
|
|
|
175
175
|
_ref2$currentCount = _ref2.currentCount,
|
|
176
176
|
currentCount = _ref2$currentCount === void 0 ? 1 : _ref2$currentCount,
|
|
177
177
|
_ref2$resourcesUseabl = _ref2.resourcesUseableMap,
|
|
178
|
-
resourcesUseableMap = _ref2$resourcesUseabl === void 0 ? {} : _ref2$resourcesUseabl
|
|
178
|
+
resourcesUseableMap = _ref2$resourcesUseabl === void 0 ? {} : _ref2$resourcesUseabl,
|
|
179
|
+
cut_off_time = _ref2.cut_off_time;
|
|
179
180
|
var status = {
|
|
180
181
|
afterToDay: false,
|
|
181
182
|
capacity: false,
|
|
@@ -186,6 +187,12 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
|
|
|
186
187
|
};
|
|
187
188
|
// 最早可预约时间为 当前日期之后并且提前量之后
|
|
188
189
|
var earliest = dayjs();
|
|
190
|
+
var _ref3 = cut_off_time || {},
|
|
191
|
+
unit = _ref3.unit,
|
|
192
|
+
unit_type = _ref3.unit_type;
|
|
193
|
+
if (unit) {
|
|
194
|
+
earliest = earliest.add(unit, unit_type);
|
|
195
|
+
}
|
|
189
196
|
// 不可预约提前量时间之前的
|
|
190
197
|
if (!checkAfterToDay(timeSlice.start_at, earliest)) {
|
|
191
198
|
return status;
|
|
@@ -323,9 +330,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
|
|
|
323
330
|
* @Author: zhiwei.Wang
|
|
324
331
|
* @Date: 2024-01-09 13:38
|
|
325
332
|
*/
|
|
326
|
-
export var formatResources = function formatResources(
|
|
327
|
-
var booking =
|
|
328
|
-
resources =
|
|
333
|
+
export var formatResources = function formatResources(_ref4) {
|
|
334
|
+
var booking = _ref4.booking,
|
|
335
|
+
resources = _ref4.resources;
|
|
329
336
|
try {
|
|
330
337
|
var _list = _toConsumableArray(resources);
|
|
331
338
|
var maps = {};
|
|
@@ -371,16 +378,16 @@ export var formatResources = function formatResources(_ref3) {
|
|
|
371
378
|
* @return {*}
|
|
372
379
|
* @Author: zhiwei.Wang
|
|
373
380
|
*/
|
|
374
|
-
export var getTimeSlicesByResource = function getTimeSlicesByResource(
|
|
375
|
-
var resource =
|
|
376
|
-
duration =
|
|
377
|
-
|
|
378
|
-
split =
|
|
379
|
-
|
|
380
|
-
currentDate =
|
|
381
|
-
capacity =
|
|
382
|
-
|
|
383
|
-
resourcesUseableMap =
|
|
381
|
+
export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
|
|
382
|
+
var resource = _ref5.resource,
|
|
383
|
+
duration = _ref5.duration,
|
|
384
|
+
_ref5$split = _ref5.split,
|
|
385
|
+
split = _ref5$split === void 0 ? 10 : _ref5$split,
|
|
386
|
+
_ref5$currentDate = _ref5.currentDate,
|
|
387
|
+
currentDate = _ref5$currentDate === void 0 ? dayjs() : _ref5$currentDate,
|
|
388
|
+
capacity = _ref5.capacity,
|
|
389
|
+
_ref5$resourcesUseabl = _ref5.resourcesUseableMap,
|
|
390
|
+
resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl;
|
|
384
391
|
var times = resource.times;
|
|
385
392
|
|
|
386
393
|
// 存储所有时间切片
|
|
@@ -521,14 +528,14 @@ export var mergeSubResourcesTimeSlices = function mergeSubResourcesTimeSlices(re
|
|
|
521
528
|
* @return {*}
|
|
522
529
|
* @Author: zhiwei.Wang
|
|
523
530
|
*/
|
|
524
|
-
export var getTimeSlicesByResources = function getTimeSlicesByResources(
|
|
525
|
-
var resourceIds =
|
|
526
|
-
resourcesMap =
|
|
527
|
-
duration =
|
|
528
|
-
currentDate =
|
|
529
|
-
split =
|
|
530
|
-
capacity =
|
|
531
|
-
resourcesUseableMap =
|
|
531
|
+
export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
|
|
532
|
+
var resourceIds = _ref6.resourceIds,
|
|
533
|
+
resourcesMap = _ref6.resourcesMap,
|
|
534
|
+
duration = _ref6.duration,
|
|
535
|
+
currentDate = _ref6.currentDate,
|
|
536
|
+
split = _ref6.split,
|
|
537
|
+
capacity = _ref6.capacity,
|
|
538
|
+
resourcesUseableMap = _ref6.resourcesUseableMap;
|
|
532
539
|
// 获取资源列表
|
|
533
540
|
var resources = getResourcesByIds(resourcesMap, resourceIds);
|
|
534
541
|
mergeSubResourcesTimeSlices(resources, resourcesMap);
|
|
@@ -660,9 +667,9 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
|
|
|
660
667
|
* @return {*}
|
|
661
668
|
* @Author: zhiwei.Wang
|
|
662
669
|
*/
|
|
663
|
-
export var formatDefaultCapacitys = function formatDefaultCapacitys(
|
|
664
|
-
var capacity =
|
|
665
|
-
product_bundle =
|
|
670
|
+
export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref7) {
|
|
671
|
+
var capacity = _ref7.capacity,
|
|
672
|
+
product_bundle = _ref7.product_bundle;
|
|
666
673
|
if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
|
|
667
674
|
return (product_bundle || []).map(function (d) {
|
|
668
675
|
var id = d.bundle_product_id;
|
|
@@ -701,8 +708,8 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref6) {
|
|
|
701
708
|
* @return {*}
|
|
702
709
|
* @Author: zhiwei.Wang
|
|
703
710
|
*/
|
|
704
|
-
export var getSumCapacity = function getSumCapacity(
|
|
705
|
-
var capacity =
|
|
711
|
+
export var getSumCapacity = function getSumCapacity(_ref8) {
|
|
712
|
+
var capacity = _ref8.capacity;
|
|
706
713
|
var sum = 0;
|
|
707
714
|
var _iterator2 = _createForOfIteratorHelper(capacity || []),
|
|
708
715
|
_step2;
|
|
@@ -1229,7 +1229,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
|
|
|
1229
1229
|
time: childTiem,
|
|
1230
1230
|
resource: m,
|
|
1231
1231
|
currentCount: 1,
|
|
1232
|
-
resourcesUseableMap
|
|
1232
|
+
resourcesUseableMap,
|
|
1233
|
+
cut_off_time: targetProductData == null ? void 0 : targetProductData.cut_off_time
|
|
1233
1234
|
});
|
|
1234
1235
|
if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
|
|
1235
1236
|
resourcesUseableMap[m.id] = res.usable;
|
|
@@ -27,12 +27,17 @@ interface BookingItem {
|
|
|
27
27
|
* @return {*}
|
|
28
28
|
* @Author: zhiwei.Wang
|
|
29
29
|
*/
|
|
30
|
-
export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, }: {
|
|
30
|
+
export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, cut_off_time, }: {
|
|
31
31
|
timeSlice: TimeSliceItem;
|
|
32
32
|
time: any;
|
|
33
33
|
resource: ResourceItem;
|
|
34
34
|
currentCount: number;
|
|
35
35
|
resourcesUseableMap: Record<string, boolean>;
|
|
36
|
+
cut_off_time?: {
|
|
37
|
+
future_day: number;
|
|
38
|
+
unit: number;
|
|
39
|
+
unit_type: string;
|
|
40
|
+
} | undefined;
|
|
36
41
|
}) => {
|
|
37
42
|
afterToDay: boolean;
|
|
38
43
|
capacity: boolean;
|
|
@@ -127,7 +127,8 @@ var getIsUsableByTimeItem = ({
|
|
|
127
127
|
time,
|
|
128
128
|
resource,
|
|
129
129
|
currentCount = 1,
|
|
130
|
-
resourcesUseableMap = {}
|
|
130
|
+
resourcesUseableMap = {},
|
|
131
|
+
cut_off_time
|
|
131
132
|
}) => {
|
|
132
133
|
var _a;
|
|
133
134
|
let status = {
|
|
@@ -139,6 +140,10 @@ var getIsUsableByTimeItem = ({
|
|
|
139
140
|
reason: ""
|
|
140
141
|
};
|
|
141
142
|
let earliest = (0, import_dayjs.default)();
|
|
143
|
+
const { unit, unit_type } = cut_off_time || {};
|
|
144
|
+
if (unit) {
|
|
145
|
+
earliest = earliest.add(unit, unit_type);
|
|
146
|
+
}
|
|
142
147
|
if (!checkAfterToDay(timeSlice.start_at, earliest)) {
|
|
143
148
|
return status;
|
|
144
149
|
}
|
|
@@ -373,7 +378,9 @@ var mergeSubResourcesTimeSlices = (resources, resourcesMap) => {
|
|
|
373
378
|
const subResource = resourcesMap[id];
|
|
374
379
|
if (subResource) {
|
|
375
380
|
subResource.times.forEach((time) => {
|
|
376
|
-
const fatherResourcesTime = item.times.find(
|
|
381
|
+
const fatherResourcesTime = item.times.find(
|
|
382
|
+
(n) => n.start_at === time.start_at && n.end_at === time.end_at
|
|
383
|
+
);
|
|
377
384
|
if (fatherResourcesTime) {
|
|
378
385
|
fatherResourcesTime.event_list.push(...time.event_list || []);
|
|
379
386
|
}
|