@pisell/pisellos 2.3.189 → 2.3.191
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/model/strategy/adapter/promotion/index.js +9 -0
- package/dist/modules/Product/index.d.ts +1 -1
- package/dist/server/index.d.ts +3 -0
- package/dist/server/index.js +1100 -974
- package/dist/shared/receipt/small-ticket.js +33 -5
- package/dist/solution/BookingByStep/index.d.ts +2 -2
- package/dist/solution/BookingByStep/index.js +8 -5
- package/dist/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/dist/solution/BookingByStep/utils/resources.js +117 -76
- package/lib/modules/Product/index.d.ts +1 -1
- package/lib/server/index.d.ts +3 -0
- package/lib/server/index.js +81 -4
- package/lib/shared/receipt/small-ticket.js +30 -5
- package/lib/solution/BookingByStep/index.d.ts +2 -2
- package/lib/solution/BookingByStep/index.js +8 -2
- package/lib/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/lib/solution/BookingByStep/utils/resources.js +25 -15
- package/package.json +1 -1
|
@@ -103,6 +103,7 @@ var LABELS = {
|
|
|
103
103
|
cashReceived: 'Cash received',
|
|
104
104
|
changeDue: 'Change due',
|
|
105
105
|
eftpos: 'Eftpos',
|
|
106
|
+
creditCard: 'Credit card',
|
|
106
107
|
wallet: 'Wallet',
|
|
107
108
|
giftCard: 'Gift card',
|
|
108
109
|
pointCard: 'Point card',
|
|
@@ -149,6 +150,7 @@ var LABELS = {
|
|
|
149
150
|
cashReceived: '收取现金',
|
|
150
151
|
changeDue: '找零',
|
|
151
152
|
eftpos: '刷卡支付',
|
|
153
|
+
creditCard: '信用卡',
|
|
152
154
|
wallet: '钱包支付',
|
|
153
155
|
giftCard: '礼品卡',
|
|
154
156
|
pointCard: '积分卡',
|
|
@@ -195,6 +197,7 @@ var LABELS = {
|
|
|
195
197
|
cashReceived: '收取現金',
|
|
196
198
|
changeDue: '找零',
|
|
197
199
|
eftpos: '刷卡支付',
|
|
200
|
+
creditCard: '信用卡',
|
|
198
201
|
wallet: '錢包支付',
|
|
199
202
|
giftCard: '禮品卡',
|
|
200
203
|
pointCard: '積分卡',
|
|
@@ -239,6 +242,7 @@ var LABELS = {
|
|
|
239
242
|
asap: 'できるだけ早く',
|
|
240
243
|
cash: '現金',
|
|
241
244
|
eftpos: 'カード',
|
|
245
|
+
creditCard: 'クレジットカード',
|
|
242
246
|
wallet: 'ウォレット',
|
|
243
247
|
giftCard: 'ギフトカード',
|
|
244
248
|
pointCard: 'ポイントカード',
|
|
@@ -284,6 +288,7 @@ var LABELS = {
|
|
|
284
288
|
asap: 'Assim que possível',
|
|
285
289
|
cash: 'Dinheiro',
|
|
286
290
|
eftpos: 'Cartão',
|
|
291
|
+
creditCard: 'Cartão de crédito',
|
|
287
292
|
wallet: 'Carteira',
|
|
288
293
|
giftCard: 'Cartão-presente',
|
|
289
294
|
pointCard: 'Cartão de pontos',
|
|
@@ -2639,12 +2644,33 @@ function appendMaskedCardCode(name, code) {
|
|
|
2639
2644
|
function trimDecimal(value) {
|
|
2640
2645
|
return value.toDecimalPlaces(2).toFixed(2).replace(/\.?0+$/, '');
|
|
2641
2646
|
}
|
|
2647
|
+
function getLocalizedPaymentName(value, locale) {
|
|
2648
|
+
if (typeof value === 'string') return value.trim();
|
|
2649
|
+
if (!value || _typeof(value) !== 'object' || Array.isArray(value)) return '';
|
|
2650
|
+
var candidates = [value[locale], value[locale.replace('_', '-')], value[locale.replace('-', '_')], value.original, value.auto, value.default, value.en];
|
|
2651
|
+
for (var _i24 = 0, _candidates2 = candidates; _i24 < _candidates2.length; _i24++) {
|
|
2652
|
+
var candidate = _candidates2[_i24];
|
|
2653
|
+
if (typeof candidate === 'string' && candidate.trim()) return candidate.trim();
|
|
2654
|
+
}
|
|
2655
|
+
return '';
|
|
2656
|
+
}
|
|
2657
|
+
function getExplicitPaymentName(payment, locale) {
|
|
2658
|
+
var _payment$metadata4;
|
|
2659
|
+
// Cloud order snapshots retain the localized name in metadata after reload.
|
|
2660
|
+
var candidates = [payment.name, payment.title, payment.payment_method_name, payment.method_name, (_payment$metadata4 = payment.metadata) === null || _payment$metadata4 === void 0 ? void 0 : _payment$metadata4.custom_payment_name];
|
|
2661
|
+
for (var _i25 = 0, _candidates3 = candidates; _i25 < _candidates3.length; _i25++) {
|
|
2662
|
+
var candidate = _candidates3[_i25];
|
|
2663
|
+
var name = getLocalizedPaymentName(candidate, locale);
|
|
2664
|
+
if (name) return name;
|
|
2665
|
+
}
|
|
2666
|
+
return '';
|
|
2667
|
+
}
|
|
2642
2668
|
function getFundRecordPaymentName(payment, locale) {
|
|
2643
2669
|
var fundRecord = getFundRecord(payment);
|
|
2644
2670
|
if (!fundRecord) return '';
|
|
2645
|
-
var name =
|
|
2671
|
+
var name = getLocalizedPaymentName(fundRecord.wallet_pass_name, locale);
|
|
2646
2672
|
if (!name && !maskMachineCode(fundRecord.code)) return '';
|
|
2647
|
-
var fallbackName =
|
|
2673
|
+
var fallbackName = getExplicitPaymentName(payment, locale) || getLocalizedPaymentName(payment.code, locale);
|
|
2648
2674
|
return appendMaskedCardCode(name || fallbackName, fundRecord.code);
|
|
2649
2675
|
}
|
|
2650
2676
|
function appendMachineCodeToName(name, payment) {
|
|
@@ -2654,13 +2680,15 @@ function appendMachineCodeToName(name, payment) {
|
|
|
2654
2680
|
function paymentMethodName(payment, locale) {
|
|
2655
2681
|
var fundRecordName = getFundRecordPaymentName(payment, locale);
|
|
2656
2682
|
if (fundRecordName) return fundRecordName;
|
|
2657
|
-
var
|
|
2658
|
-
if (
|
|
2683
|
+
var name = getExplicitPaymentName(payment, locale);
|
|
2684
|
+
if (name) return appendMachineCodeToName(name, payment);
|
|
2659
2685
|
var code = stringify(payment.code || payment.type || payment.payment_method || payment.method).toLowerCase();
|
|
2660
2686
|
if (code.includes('cash')) return label(locale, 'cash');
|
|
2661
|
-
if (code.includes('eftpos')
|
|
2687
|
+
if (code.includes('eftpos')) return label(locale, 'eftpos');
|
|
2662
2688
|
if (code.includes('wallet')) return label(locale, 'wallet');
|
|
2663
2689
|
if (code.includes('gift')) return label(locale, 'giftCard');
|
|
2690
|
+
if (code === 'credit_card' || code.startsWith('credit_card_')) return label(locale, 'creditCard');
|
|
2691
|
+
if (code.includes('card')) return label(locale, 'eftpos');
|
|
2664
2692
|
return stringify(payment.code || payment.type || payment.payment_method || payment.method);
|
|
2665
2693
|
}
|
|
2666
2694
|
function getSummary(order) {
|
|
@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
328
328
|
date: string;
|
|
329
329
|
status: string;
|
|
330
330
|
week: string;
|
|
331
|
-
weekNum: 0 | 2 | 1 |
|
|
331
|
+
weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
|
|
332
332
|
}[]>;
|
|
333
333
|
submitTimeSlot(timeSlots: TimeSliceItem): void;
|
|
334
334
|
private getScheduleDataByIds;
|
|
@@ -375,7 +375,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
375
375
|
};
|
|
376
376
|
setOtherData(key: string, value: any): void;
|
|
377
377
|
getOtherData(key: string): any;
|
|
378
|
-
getProductTypeById(id: number): Promise<"
|
|
378
|
+
getProductTypeById(id: number): Promise<"duration" | "normal" | "session">;
|
|
379
379
|
/**
|
|
380
380
|
* 提供给 UI 的方法,减轻 UI 层的计算压力,UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
|
|
381
381
|
*
|
|
@@ -32,7 +32,7 @@ import { BaseModule } from "../../modules/BaseModule";
|
|
|
32
32
|
import { createModule } from "./types";
|
|
33
33
|
import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
|
|
34
34
|
import { getAvailableProductResources, isSessionProduct } from "./utils/products";
|
|
35
|
-
import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
|
|
35
|
+
import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getPeakConcurrentPax, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
|
|
36
36
|
import dayjs from 'dayjs';
|
|
37
37
|
import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
|
|
38
38
|
import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
|
|
@@ -3109,13 +3109,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3109
3109
|
end_at: dayjs(item.end)
|
|
3110
3110
|
})) {
|
|
3111
3111
|
var _m$pax;
|
|
3112
|
-
mSet.set(m.id, (
|
|
3112
|
+
mSet.set(m.id, _objectSpread(_objectSpread({}, m), {}, {
|
|
3113
|
+
pax: (_m$pax = m.pax) !== null && _m$pax !== void 0 ? _m$pax : 1
|
|
3114
|
+
}));
|
|
3113
3115
|
}
|
|
3114
3116
|
});
|
|
3115
3117
|
});
|
|
3116
|
-
acc += Array.from(mSet.values())
|
|
3117
|
-
|
|
3118
|
-
|
|
3118
|
+
acc += getPeakConcurrentPax(Array.from(mSet.values()), {
|
|
3119
|
+
start_at: dayjs(item.start),
|
|
3120
|
+
end_at: dayjs(item.end)
|
|
3121
|
+
});
|
|
3119
3122
|
return acc;
|
|
3120
3123
|
}, 0);
|
|
3121
3124
|
// 如果已使用容量超过了当前类型资源的容量,则不可用
|
|
@@ -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:
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
-
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
3
|
-
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
4
|
-
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
5
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
6
|
-
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
7
|
-
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
8
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
9
2
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
10
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
11
4
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
12
5
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
13
6
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
7
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
8
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
9
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
10
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
11
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
12
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
13
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
14
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
15
|
+
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
16
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
17
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
14
18
|
import dayjs from 'dayjs';
|
|
15
19
|
|
|
16
20
|
/**
|
|
@@ -20,18 +24,53 @@ import dayjs from 'dayjs';
|
|
|
20
24
|
*
|
|
21
25
|
*/
|
|
22
26
|
|
|
23
|
-
/**
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
27
|
+
/** 计算目标区间内的最大同时占用人数;事件去重由调用方负责。 */
|
|
28
|
+
export var getPeakConcurrentPax = function getPeakConcurrentPax(eventList, timeSlice) {
|
|
29
|
+
var start = dayjs(timeSlice.start_at).valueOf();
|
|
30
|
+
var end = dayjs(timeSlice.end_at).valueOf();
|
|
31
|
+
var changes = new Map();
|
|
32
|
+
var _iterator = _createForOfIteratorHelper(eventList || []),
|
|
33
|
+
_step;
|
|
34
|
+
try {
|
|
35
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
36
|
+
var _changes$get, _changes$get2;
|
|
37
|
+
var event = _step.value;
|
|
38
|
+
var eventStart = Math.max(start, dayjs(event.start_at).valueOf());
|
|
39
|
+
var eventEnd = Math.min(end, dayjs(event.end_at).valueOf());
|
|
40
|
+
if (!(eventStart < eventEnd)) continue;
|
|
41
|
+
var pax = Number(event.pax);
|
|
42
|
+
changes.set(eventStart, ((_changes$get = changes.get(eventStart)) !== null && _changes$get !== void 0 ? _changes$get : 0) + pax);
|
|
43
|
+
changes.set(eventEnd, ((_changes$get2 = changes.get(eventEnd)) !== null && _changes$get2 !== void 0 ? _changes$get2 : 0) - pax);
|
|
44
|
+
}
|
|
45
|
+
} catch (err) {
|
|
46
|
+
_iterator.e(err);
|
|
47
|
+
} finally {
|
|
48
|
+
_iterator.f();
|
|
49
|
+
}
|
|
50
|
+
var current = 0;
|
|
51
|
+
var peak = 0;
|
|
52
|
+
// 同一时刻合并增减量,保持 [start, end) 语义,首尾相接不叠加。
|
|
53
|
+
var _iterator2 = _createForOfIteratorHelper(_toConsumableArray(changes).sort(function (_ref, _ref2) {
|
|
54
|
+
var _ref3 = _slicedToArray(_ref, 1),
|
|
55
|
+
a = _ref3[0];
|
|
56
|
+
var _ref4 = _slicedToArray(_ref2, 1),
|
|
57
|
+
b = _ref4[0];
|
|
58
|
+
return a - b;
|
|
59
|
+
})),
|
|
60
|
+
_step2;
|
|
61
|
+
try {
|
|
62
|
+
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
63
|
+
var _step2$value = _slicedToArray(_step2.value, 2),
|
|
64
|
+
change = _step2$value[1];
|
|
65
|
+
current += change;
|
|
66
|
+
peak = Math.max(peak, current);
|
|
67
|
+
}
|
|
68
|
+
} catch (err) {
|
|
69
|
+
_iterator2.e(err);
|
|
70
|
+
} finally {
|
|
71
|
+
_iterator2.f();
|
|
72
|
+
}
|
|
73
|
+
return peak;
|
|
35
74
|
};
|
|
36
75
|
|
|
37
76
|
/**
|
|
@@ -104,12 +143,12 @@ var formatResource = function formatResource(resourceItem, booking) {
|
|
|
104
143
|
* @return {*}
|
|
105
144
|
* @Author: zhiwei.Wang
|
|
106
145
|
*/
|
|
107
|
-
var checkCapacity = function checkCapacity(
|
|
108
|
-
var event_list =
|
|
109
|
-
timeSlice =
|
|
110
|
-
resource =
|
|
111
|
-
|
|
112
|
-
currentCount =
|
|
146
|
+
var checkCapacity = function checkCapacity(_ref5) {
|
|
147
|
+
var event_list = _ref5.event_list,
|
|
148
|
+
timeSlice = _ref5.timeSlice,
|
|
149
|
+
resource = _ref5.resource,
|
|
150
|
+
_ref5$currentCount = _ref5.currentCount,
|
|
151
|
+
currentCount = _ref5$currentCount === void 0 ? 1 : _ref5$currentCount;
|
|
113
152
|
// 单个预约:如果当前资源容量不足以满足需求的容量,且当前资源是没有被占用的,返回资源不可用标记,但在外部运算会通过 reason=capacityOnly 来处理组合资源可用
|
|
114
153
|
// 多个预约:只需判断容量是否足够
|
|
115
154
|
var isMultipleBooking = resource.resourceType === 'multiple';
|
|
@@ -130,8 +169,10 @@ var checkCapacity = function checkCapacity(_ref) {
|
|
|
130
169
|
});
|
|
131
170
|
});
|
|
132
171
|
|
|
133
|
-
//
|
|
134
|
-
var conflictCount =
|
|
172
|
+
// 多人预约按同时占用峰值扣减,不能把先后到访的所有人数相加。
|
|
173
|
+
var conflictCount = resource.resourceType === 'single' ? conflict.reduce(function (remaining, event) {
|
|
174
|
+
return remaining - event.pax;
|
|
175
|
+
}, resource.capacity || 0) : (resource.capacity || 0) - getPeakConcurrentPax(conflict, timeSlice);
|
|
135
176
|
|
|
136
177
|
// 同一时间段内只能进行一个预约,无论容量是否已满。
|
|
137
178
|
if (resource.resourceType === 'single') {
|
|
@@ -170,16 +211,16 @@ var checkCapacity = function checkCapacity(_ref) {
|
|
|
170
211
|
* @return {*}
|
|
171
212
|
* @Author: zhiwei.Wang
|
|
172
213
|
*/
|
|
173
|
-
export var getIsUsableByTimeItem = function getIsUsableByTimeItem(
|
|
214
|
+
export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref6) {
|
|
174
215
|
var _resource$combined_re;
|
|
175
|
-
var timeSlice =
|
|
176
|
-
time =
|
|
177
|
-
resource =
|
|
178
|
-
|
|
179
|
-
currentCount =
|
|
180
|
-
|
|
181
|
-
resourcesUseableMap =
|
|
182
|
-
cut_off_time =
|
|
216
|
+
var timeSlice = _ref6.timeSlice,
|
|
217
|
+
time = _ref6.time,
|
|
218
|
+
resource = _ref6.resource,
|
|
219
|
+
_ref6$currentCount = _ref6.currentCount,
|
|
220
|
+
currentCount = _ref6$currentCount === void 0 ? 1 : _ref6$currentCount,
|
|
221
|
+
_ref6$resourcesUseabl = _ref6.resourcesUseableMap,
|
|
222
|
+
resourcesUseableMap = _ref6$resourcesUseabl === void 0 ? {} : _ref6$resourcesUseabl,
|
|
223
|
+
cut_off_time = _ref6.cut_off_time;
|
|
183
224
|
var status = {
|
|
184
225
|
afterToDay: false,
|
|
185
226
|
capacity: false,
|
|
@@ -191,11 +232,11 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
|
|
|
191
232
|
// 最早可预约时间为 当前日期之后并且提前量之后
|
|
192
233
|
var earliest = dayjs();
|
|
193
234
|
var canBookingForOngoing = false;
|
|
194
|
-
var
|
|
195
|
-
unit =
|
|
196
|
-
unit_type =
|
|
197
|
-
type =
|
|
198
|
-
ongoing =
|
|
235
|
+
var _ref7 = cut_off_time || {},
|
|
236
|
+
unit = _ref7.unit,
|
|
237
|
+
unit_type = _ref7.unit_type,
|
|
238
|
+
type = _ref7.type,
|
|
239
|
+
ongoing = _ref7.ongoing;
|
|
199
240
|
// 允许购买已开始的活动
|
|
200
241
|
if (type === 'ongoing' && (ongoing === null || ongoing === void 0 ? void 0 : ongoing.type) === 'after_start') {
|
|
201
242
|
// 如果timeSlice.start_at 小于当前时间,判断当前时间是否在如果timeSlice.start_at+ongoing.unit之间
|
|
@@ -366,17 +407,17 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
|
|
|
366
407
|
* @Author: zhiwei.Wang
|
|
367
408
|
* @Date: 2024-01-09 13:38
|
|
368
409
|
*/
|
|
369
|
-
export var formatResources = function formatResources(
|
|
370
|
-
var booking =
|
|
371
|
-
resources =
|
|
410
|
+
export var formatResources = function formatResources(_ref8) {
|
|
411
|
+
var booking = _ref8.booking,
|
|
412
|
+
resources = _ref8.resources;
|
|
372
413
|
try {
|
|
373
414
|
var _list = _toConsumableArray(resources);
|
|
374
415
|
var maps = {};
|
|
375
|
-
var
|
|
376
|
-
|
|
416
|
+
var _iterator3 = _createForOfIteratorHelper(_list),
|
|
417
|
+
_step3;
|
|
377
418
|
try {
|
|
378
419
|
var _loop = function _loop() {
|
|
379
|
-
var item =
|
|
420
|
+
var item = _step3.value;
|
|
380
421
|
var renderListMaps = {};
|
|
381
422
|
item.renderList = item.renderList.map(function (d) {
|
|
382
423
|
var res = formatResource(d, booking);
|
|
@@ -387,13 +428,13 @@ export var formatResources = function formatResources(_ref4) {
|
|
|
387
428
|
renderListMaps: renderListMaps
|
|
388
429
|
});
|
|
389
430
|
};
|
|
390
|
-
for (
|
|
431
|
+
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
|
391
432
|
_loop();
|
|
392
433
|
}
|
|
393
434
|
} catch (err) {
|
|
394
|
-
|
|
435
|
+
_iterator3.e(err);
|
|
395
436
|
} finally {
|
|
396
|
-
|
|
437
|
+
_iterator3.f();
|
|
397
438
|
}
|
|
398
439
|
return {
|
|
399
440
|
list: _list,
|
|
@@ -412,20 +453,20 @@ export var formatResources = function formatResources(_ref4) {
|
|
|
412
453
|
* @return {*}
|
|
413
454
|
* @Author: zhiwei.Wang
|
|
414
455
|
*/
|
|
415
|
-
export var getTimeSlicesByResource = function getTimeSlicesByResource(
|
|
416
|
-
var resource =
|
|
417
|
-
duration =
|
|
418
|
-
|
|
419
|
-
split =
|
|
420
|
-
|
|
421
|
-
currentDate =
|
|
422
|
-
capacity =
|
|
423
|
-
|
|
424
|
-
resourcesUseableMap =
|
|
425
|
-
cut_off_time =
|
|
426
|
-
hasFlexibleDuration =
|
|
427
|
-
operating_day_boundary =
|
|
428
|
-
maxBlockThreshold =
|
|
456
|
+
export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref9) {
|
|
457
|
+
var resource = _ref9.resource,
|
|
458
|
+
duration = _ref9.duration,
|
|
459
|
+
_ref9$split = _ref9.split,
|
|
460
|
+
split = _ref9$split === void 0 ? 10 : _ref9$split,
|
|
461
|
+
_ref9$currentDate = _ref9.currentDate,
|
|
462
|
+
currentDate = _ref9$currentDate === void 0 ? dayjs() : _ref9$currentDate,
|
|
463
|
+
capacity = _ref9.capacity,
|
|
464
|
+
_ref9$resourcesUseabl = _ref9.resourcesUseableMap,
|
|
465
|
+
resourcesUseableMap = _ref9$resourcesUseabl === void 0 ? {} : _ref9$resourcesUseabl,
|
|
466
|
+
cut_off_time = _ref9.cut_off_time,
|
|
467
|
+
hasFlexibleDuration = _ref9.hasFlexibleDuration,
|
|
468
|
+
operating_day_boundary = _ref9.operating_day_boundary,
|
|
469
|
+
maxBlockThreshold = _ref9.maxBlockThreshold;
|
|
429
470
|
var times = resource.times;
|
|
430
471
|
|
|
431
472
|
// 存储所有时间切片
|
|
@@ -587,18 +628,18 @@ export var mergeSubResourcesTimeSlices = function mergeSubResourcesTimeSlices(re
|
|
|
587
628
|
* @return {*}
|
|
588
629
|
* @Author: zhiwei.Wang
|
|
589
630
|
*/
|
|
590
|
-
export var getTimeSlicesByResources = function getTimeSlicesByResources(
|
|
591
|
-
var resourceIds =
|
|
592
|
-
resourcesMap =
|
|
593
|
-
duration =
|
|
594
|
-
currentDate =
|
|
595
|
-
split =
|
|
596
|
-
capacity =
|
|
597
|
-
resourcesUseableMap =
|
|
598
|
-
cut_off_time =
|
|
599
|
-
hasFlexibleDuration =
|
|
600
|
-
operating_day_boundary =
|
|
601
|
-
maxBlockThreshold =
|
|
631
|
+
export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref10) {
|
|
632
|
+
var resourceIds = _ref10.resourceIds,
|
|
633
|
+
resourcesMap = _ref10.resourcesMap,
|
|
634
|
+
duration = _ref10.duration,
|
|
635
|
+
currentDate = _ref10.currentDate,
|
|
636
|
+
split = _ref10.split,
|
|
637
|
+
capacity = _ref10.capacity,
|
|
638
|
+
resourcesUseableMap = _ref10.resourcesUseableMap,
|
|
639
|
+
cut_off_time = _ref10.cut_off_time,
|
|
640
|
+
hasFlexibleDuration = _ref10.hasFlexibleDuration,
|
|
641
|
+
operating_day_boundary = _ref10.operating_day_boundary,
|
|
642
|
+
maxBlockThreshold = _ref10.maxBlockThreshold;
|
|
602
643
|
// 获取资源列表
|
|
603
644
|
var resources = getResourcesByIds(resourcesMap, resourceIds);
|
|
604
645
|
mergeSubResourcesTimeSlices(resources, resourcesMap);
|
|
@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
|
|
|
49
49
|
getCategories(): ProductCategory[];
|
|
50
50
|
setOtherParams(key: string, value: any): void;
|
|
51
51
|
getOtherParams(): any;
|
|
52
|
-
getProductType(): "
|
|
52
|
+
getProductType(): "duration" | "normal" | "session";
|
|
53
53
|
}
|
package/lib/server/index.d.ts
CHANGED
|
@@ -64,6 +64,7 @@ declare class Server {
|
|
|
64
64
|
private salesSearchSubscribers;
|
|
65
65
|
private deviceTaskActionsRegistered;
|
|
66
66
|
private localPaymentUpdateQueues;
|
|
67
|
+
private paymentIdentityRefreshes;
|
|
67
68
|
private floorPlanQuerySubscribers;
|
|
68
69
|
private moduleRegistry;
|
|
69
70
|
constructor(core: PisellCore);
|
|
@@ -133,6 +134,8 @@ declare class Server {
|
|
|
133
134
|
private resolveKioskCheckoutOperatorId;
|
|
134
135
|
private mergeCheckoutSyncPayments;
|
|
135
136
|
private persistSyncedCheckoutOrder;
|
|
137
|
+
private hasPaidPaymentWithoutId;
|
|
138
|
+
private refreshMissingPaymentIds;
|
|
136
139
|
/**
|
|
137
140
|
* 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
|
|
138
141
|
*/
|
package/lib/server/index.js
CHANGED
|
@@ -123,6 +123,7 @@ class Server {
|
|
|
123
123
|
salesSearchSubscribers = new Map();
|
|
124
124
|
deviceTaskActionsRegistered = false;
|
|
125
125
|
localPaymentUpdateQueues = new Map();
|
|
126
|
+
paymentIdentityRefreshes = new Map();
|
|
126
127
|
floorPlanQuerySubscribers = new Map();
|
|
127
128
|
|
|
128
129
|
// 模块注册表 - 定义所有可用的模块配置
|
|
@@ -873,8 +874,52 @@ class Server {
|
|
|
873
874
|
order_id: fresh?.order_id
|
|
874
875
|
});
|
|
875
876
|
}
|
|
877
|
+
if (syncedOrder) {
|
|
878
|
+
// 不占用 sync_sales 的执行超时:慢速补取不能让已成功的 checkout 被再次提交。
|
|
879
|
+
void this.refreshMissingPaymentIds(syncedOrder, title).catch(error => {
|
|
880
|
+
this.logWarning(`${title}: 后台补齐付款 ID 失败`, {
|
|
881
|
+
order_id: syncedOrder?.order_id,
|
|
882
|
+
error: this.getUnknownErrorMessage(error)
|
|
883
|
+
});
|
|
884
|
+
});
|
|
885
|
+
}
|
|
876
886
|
return syncedOrder;
|
|
877
887
|
}
|
|
888
|
+
hasPaidPaymentWithoutId(order) {
|
|
889
|
+
return (order?.payments || []).some(payment => {
|
|
890
|
+
const paymentId = payment.order_payment_id ?? payment.id;
|
|
891
|
+
return payment.status === 'paid' && (paymentId === undefined || paymentId === null || String(paymentId).trim() === '');
|
|
892
|
+
});
|
|
893
|
+
}
|
|
894
|
+
async refreshMissingPaymentIds(order, title) {
|
|
895
|
+
if (!this.hasPaidPaymentWithoutId(order) || !(Number(order.order_id) > 0) || Number(order.need_sync || 0) === 1 || Number(order.is_draft_order || 0) === 1) {
|
|
896
|
+
return order;
|
|
897
|
+
}
|
|
898
|
+
const key = String(order.order_id);
|
|
899
|
+
let refresh = this.paymentIdentityRefreshes.get(key);
|
|
900
|
+
if (!refresh) {
|
|
901
|
+
// checkout 已成功,只补取付款身份;补取失败不能让 sync_sales 重试 checkout。
|
|
902
|
+
refresh = this.fetchAndPersistSalesOrderByLookup(key, {
|
|
903
|
+
forceRemote: true
|
|
904
|
+
}, `${title}.paymentIdentityRefresh`, order);
|
|
905
|
+
this.paymentIdentityRefreshes.set(key, refresh);
|
|
906
|
+
}
|
|
907
|
+
try {
|
|
908
|
+
const result = await refresh;
|
|
909
|
+
const refreshedOrder = result.order || this.order?.getLocalOrderFromMemoryByLookup?.(key) || order;
|
|
910
|
+
if (this.hasPaidPaymentWithoutId(refreshedOrder)) {
|
|
911
|
+
this.logWarning(`${title}: 付款 ID 尚未补齐,下次读取详情重试`, {
|
|
912
|
+
order_id: order.order_id,
|
|
913
|
+
code: result.code
|
|
914
|
+
});
|
|
915
|
+
}
|
|
916
|
+
return refreshedOrder;
|
|
917
|
+
} finally {
|
|
918
|
+
if (this.paymentIdentityRefreshes.get(key) === refresh) {
|
|
919
|
+
this.paymentIdentityRefreshes.delete(key);
|
|
920
|
+
}
|
|
921
|
+
}
|
|
922
|
+
}
|
|
878
923
|
|
|
879
924
|
/**
|
|
880
925
|
* 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
|
|
@@ -5096,7 +5141,7 @@ class Server {
|
|
|
5096
5141
|
const code = typeof value === 'number' ? value : Number(value);
|
|
5097
5142
|
return Number.isFinite(code) ? code : 500;
|
|
5098
5143
|
}
|
|
5099
|
-
async fetchAndPersistSalesOrderByLookup(lookup, data, title) {
|
|
5144
|
+
async fetchAndPersistSalesOrderByLookup(lookup, data, title, paymentIdentityOrder) {
|
|
5100
5145
|
if (!this.order?.getLocalOrderByLookup || !this.order?.upsertOrdersFromRemote) {
|
|
5101
5146
|
this.logError(`${title}: Order 模块未注册`);
|
|
5102
5147
|
return {
|
|
@@ -5150,13 +5195,44 @@ class Server {
|
|
|
5150
5195
|
};
|
|
5151
5196
|
}
|
|
5152
5197
|
const localBeforeRefresh = this.order.getLocalOrderFromMemoryByLookup?.(lookup) || (this.shouldForceRemoteSalesDetail(data) ? await this.order.getLocalOrderByLookup(lookup) : null);
|
|
5198
|
+
let orderToPersist = fresh;
|
|
5199
|
+
if (paymentIdentityOrder) {
|
|
5200
|
+
if (String(fresh.order_id) !== String(paymentIdentityOrder.order_id) || fresh.external_sale_number && paymentIdentityOrder.external_sale_number && fresh.external_sale_number !== paymentIdentityOrder.external_sale_number || !Array.isArray(fresh.payments)) {
|
|
5201
|
+
throw new Error('远端订单身份不匹配或缺少付款明细,暂不补齐付款 ID');
|
|
5202
|
+
}
|
|
5203
|
+
// 请求期间可能又产生本地改动,不能用这次补取清除待同步状态。
|
|
5204
|
+
if (!localBeforeRefresh || Number(localBeforeRefresh.need_sync || 0) === 1 || Number(localBeforeRefresh.is_draft_order || 0) === 1) {
|
|
5205
|
+
return {
|
|
5206
|
+
code: 200,
|
|
5207
|
+
message: '',
|
|
5208
|
+
order: localBeforeRefresh || paymentIdentityOrder
|
|
5209
|
+
};
|
|
5210
|
+
}
|
|
5211
|
+
const remotePayments = fresh.payments;
|
|
5212
|
+
const paidPayments = (localBeforeRefresh.payments || []).filter(payment => payment.status === 'paid');
|
|
5213
|
+
const paymentIdsComplete = paidPayments.every(payment => {
|
|
5214
|
+
const localKeys = new Set((0, _paymentUtils.getOrderPaymentIdentityKeys)(payment));
|
|
5215
|
+
const matches = remotePayments.filter(remotePayment => (0, _paymentUtils.getOrderPaymentIdentityKeys)(remotePayment).some(key => localKeys.has(key)));
|
|
5216
|
+
const paymentId = matches[0]?.order_payment_id ?? matches[0]?.id;
|
|
5217
|
+
return matches.length === 1 && paymentId !== undefined && paymentId !== null && String(paymentId).trim() !== '';
|
|
5218
|
+
});
|
|
5219
|
+
if (!paymentIdsComplete) {
|
|
5220
|
+
throw new Error('远端付款 ID 尚未齐全或付款身份匹配不唯一,保留本地付款等待重试');
|
|
5221
|
+
}
|
|
5222
|
+
orderToPersist = {
|
|
5223
|
+
...fresh,
|
|
5224
|
+
payments: (0, _paymentUtils.mergeOrderPaymentListsByIdentity)(localBeforeRefresh.payments, remotePayments, {
|
|
5225
|
+
preserveUnmatchedExisting: true
|
|
5226
|
+
})
|
|
5227
|
+
};
|
|
5228
|
+
}
|
|
5153
5229
|
if ((0, _localEftposState.requiresLocalPaymentRefresh)(localBeforeRefresh)) {
|
|
5154
5230
|
if (String(fresh.order_id) !== String(localBeforeRefresh.order_id)) {
|
|
5155
5231
|
throw new Error('远端订单身份不匹配,请重新刷新');
|
|
5156
5232
|
}
|
|
5157
|
-
await this.order.completeLocalPaymentRefresh(
|
|
5233
|
+
await this.order.completeLocalPaymentRefresh(orderToPersist);
|
|
5158
5234
|
} else {
|
|
5159
|
-
await this.order.upsertOrdersFromRemote([
|
|
5235
|
+
await this.order.upsertOrdersFromRemote([orderToPersist]);
|
|
5160
5236
|
}
|
|
5161
5237
|
let savedOrder = await this.order.getLocalOrderByLookup(lookup);
|
|
5162
5238
|
if (!savedOrder && fresh.order_id !== undefined && fresh.order_id !== null && String(fresh.order_id) !== String(lookup)) {
|
|
@@ -5251,7 +5327,8 @@ class Server {
|
|
|
5251
5327
|
if (!this.shouldForceRemoteSalesDetail(data)) {
|
|
5252
5328
|
const localOrder = await this.order.getLocalOrderByLookup(lookup);
|
|
5253
5329
|
if (localOrder) {
|
|
5254
|
-
const
|
|
5330
|
+
const refreshedOrder = await this.refreshMissingPaymentIds(localOrder, 'handleOrderSalesDetail');
|
|
5331
|
+
const enrichedOrder = await this.withSalesDetailProductSnapshots(refreshedOrder);
|
|
5255
5332
|
this.logInfo('handleOrderSalesDetail: 命中本地订单', {
|
|
5256
5333
|
lookup
|
|
5257
5334
|
});
|