@pisell/pisellos 2.3.74 → 2.3.75
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/core/index.js +6 -10
- package/dist/model/strategy/adapter/promotion/index.js +9 -0
- package/dist/model/strategy/adapter/walletPass/example.js +3 -26
- package/dist/model/strategy/strategy-example.js +5 -19
- package/dist/modules/Cart/index.js +0 -3
- package/dist/modules/Cart/utils/cartProduct.js +0 -1
- package/dist/modules/Date/index.js +1 -5
- package/dist/modules/Discount/index.js +2 -4
- package/dist/modules/OpenData/index.js +0 -2
- package/dist/modules/Order/index.js +36 -64
- package/dist/modules/Payment/index.js +97 -162
- package/dist/modules/Rules/index.js +1 -4
- package/dist/modules/Schedule/index.js +0 -1
- package/dist/modules/Schedule/utils.js +0 -1
- package/dist/modules/Step/index.js +0 -1
- package/dist/plugins/request.js +1 -4
- package/dist/plugins/window.js +2 -6
- package/dist/server/index.js +97 -129
- package/dist/server/modules/menu/index.js +32 -41
- package/dist/server/modules/order/index.js +2 -4
- package/dist/server/modules/products/index.js +24 -42
- package/dist/server/modules/quotation/index.js +29 -38
- package/dist/server/modules/resource/index.js +3 -4
- package/dist/server/modules/schedule/index.js +27 -35
- package/dist/server/utils/product.js +0 -1
- package/dist/solution/BaseSales/index.js +38 -41
- package/dist/solution/BookingByStep/index.js +7 -59
- package/dist/solution/BookingByStep/utils/capacity.js +1 -11
- package/dist/solution/BookingByStep/utils/resources.js +1 -3
- package/dist/solution/BookingByStep/utils/timeslots.js +2 -43
- package/dist/solution/BookingTicket/index.js +0 -2
- package/dist/solution/BookingTicket/utils/scan/cloudSearch.js +6 -7
- package/dist/solution/BookingTicket/utils/scan/handleScan.js +25 -31
- package/dist/solution/BookingTicket/utils/scan/index.js +6 -10
- package/dist/solution/BuyTickets/index.js +9 -12
- package/dist/solution/Checkout/index.js +177 -252
- package/dist/solution/Checkout/utils/index.js +4 -16
- package/dist/solution/RegisterAndLogin/index.js +30 -76
- package/dist/solution/ScanOrder/index.js +50 -60
- package/dist/solution/ShopDiscount/index.js +2 -7
- package/dist/solution/VenueBooking/index.js +45 -55
- package/dist/utils/task.js +15 -18
- package/dist/utils/watch.js +0 -1
- package/lib/apis/picoding.js +2 -0
- package/lib/core/index.js +134 -134
- package/lib/effects/index.js +46 -57
- package/lib/index.js +82 -49
- package/lib/model/index.js +14 -21
- package/lib/model/strategy/adapter/dataVariant/adapter.js +38 -50
- package/lib/model/strategy/adapter/dataVariant/evaluator.js +162 -236
- package/lib/model/strategy/adapter/dataVariant/examples.js +229 -237
- package/lib/model/strategy/adapter/dataVariant/index.js +39 -34
- package/lib/model/strategy/adapter/dataVariant/type.js +57 -28
- package/lib/model/strategy/adapter/index.js +100 -64
- package/lib/model/strategy/adapter/itemRule/adapter.js +156 -144
- package/lib/model/strategy/adapter/itemRule/evaluator.js +36 -48
- package/lib/model/strategy/adapter/itemRule/examples.js +295 -225
- package/lib/model/strategy/adapter/itemRule/index.js +83 -57
- package/lib/model/strategy/adapter/itemRule/type.js +97 -36
- package/lib/model/strategy/adapter/promotion/adapter.js +91 -69
- package/lib/model/strategy/adapter/promotion/evaluator.js +444 -310
- package/lib/model/strategy/adapter/promotion/examples.js +222 -234
- package/lib/model/strategy/adapter/promotion/index.js +1 -0
- package/lib/model/strategy/adapter/promotion/type.js +243 -36
- package/lib/model/strategy/adapter/type.js +4 -16
- package/lib/model/strategy/adapter/walletPass/evaluator.js +180 -150
- package/lib/model/strategy/adapter/walletPass/example.js +217 -190
- package/lib/model/strategy/adapter/walletPass/index.js +75 -51
- package/lib/model/strategy/adapter/walletPass/locales.js +36 -58
- package/lib/model/strategy/adapter/walletPass/type.js +4 -16
- package/lib/model/strategy/adapter/walletPass/utils.js +588 -378
- package/lib/model/strategy/engine.js +270 -168
- package/lib/model/strategy/index.js +49 -34
- package/lib/model/strategy/strategy-example.js +243 -239
- package/lib/model/strategy/type.js +100 -40
- package/lib/modules/Account/index.js +39 -53
- package/lib/modules/Account/types.js +20 -33
- package/lib/modules/AccountList/index.js +116 -154
- package/lib/modules/AccountList/types.js +30 -31
- package/lib/modules/AccountList/utils.js +18 -30
- package/lib/modules/BaseModule.js +23 -42
- package/lib/modules/BookingContext/index.js +158 -136
- package/lib/modules/BookingContext/types.js +46 -32
- package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +138 -146
- package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +78 -83
- package/lib/modules/BookingContext/utils/cacheItemToBookingInput.js +170 -150
- package/lib/modules/BookingContext/utils/flexible.js +38 -55
- package/lib/modules/BookingContext/utils/formatResourceList.js +19 -34
- package/lib/modules/BookingContext/utils/index.js +124 -41
- package/lib/modules/BookingContext/utils/noResource.js +58 -70
- package/lib/modules/BookingContext/utils/orderLineDisplay.js +14 -41
- package/lib/modules/BookingContext/utils/productExtend.js +202 -155
- package/lib/modules/BookingContext/utils/resourceErrors.js +53 -53
- package/lib/modules/BookingContext/utils/resourceSelection.js +19 -41
- package/lib/modules/BookingContext/utils/resources.js +209 -167
- package/lib/modules/BookingContext/utils/serviceTimes.js +115 -116
- package/lib/modules/BookingContext/utils/timeSlices.js +76 -86
- package/lib/modules/Cart/index.js +170 -124
- package/lib/modules/Cart/types.js +46 -51
- package/lib/modules/Cart/utils/cartAccount.js +40 -39
- package/lib/modules/Cart/utils/cartDate.js +56 -61
- package/lib/modules/Cart/utils/cartDiscount.js +28 -33
- package/lib/modules/Cart/utils/cartNote.js +27 -32
- package/lib/modules/Cart/utils/cartProduct.js +321 -251
- package/lib/modules/Cart/utils/cartRelationForms.js +29 -35
- package/lib/modules/Cart/utils/cartResource.js +70 -78
- package/lib/modules/Cart/utils/changePrice.js +22 -50
- package/lib/modules/Cart/utils/index.js +106 -48
- package/lib/modules/Customer/constants.js +13 -34
- package/lib/modules/Customer/index.js +235 -172
- package/lib/modules/Customer/types.js +38 -35
- package/lib/modules/Date/index.js +116 -115
- package/lib/modules/Date/types.js +16 -28
- package/lib/modules/Date/utils.js +174 -123
- package/lib/modules/Discount/index.js +122 -127
- package/lib/modules/Discount/types.js +9 -31
- package/lib/modules/Guests/index.js +30 -56
- package/lib/modules/Guests/types.js +23 -33
- package/lib/modules/Holder/index.js +209 -189
- package/lib/modules/Holder/types.js +4 -16
- package/lib/modules/Holder/utils.js +20 -49
- package/lib/modules/OpenData/index.js +70 -76
- package/lib/modules/OpenData/types.js +4 -16
- package/lib/modules/OpenData/utils.js +44 -78
- package/lib/modules/Order/index.js +1713 -2118
- package/lib/modules/Order/payment-utils.js +77 -120
- package/lib/modules/Order/types.js +88 -35
- package/lib/modules/Order/utils/bundleDiscountHydration.js +41 -74
- package/lib/modules/Order/utils/discountProductLineIdentity.js +142 -100
- package/lib/modules/Order/utils/manualProductDiscount.js +124 -123
- package/lib/modules/Order/utils/orderCollectionIdentity.js +184 -244
- package/lib/modules/Order/utils.js +814 -647
- package/lib/modules/Payment/cash.js +20 -33
- package/lib/modules/Payment/cashRecommendationAlgorithm.js +145 -76
- package/lib/modules/Payment/eftpos.js +16 -30
- package/lib/modules/Payment/index.js +532 -399
- package/lib/modules/Payment/mx51.js +1 -0
- package/lib/modules/Payment/types.js +230 -108
- package/lib/modules/Payment/utils.js +52 -51
- package/lib/modules/Payment/walletpass.js +485 -660
- package/lib/modules/Product/index.js +51 -46
- package/lib/modules/Product/types.js +4 -16
- package/lib/modules/Product/utils.js +32 -33
- package/lib/modules/ProductList/index.js +113 -123
- package/lib/modules/ProductList/types.js +9 -31
- package/lib/modules/Quotation/index.js +81 -118
- package/lib/modules/Quotation/types.js +4 -16
- package/lib/modules/Resource/index.js +27 -59
- package/lib/modules/Resource/types.js +22 -32
- package/lib/modules/Resource/utils.js +30 -38
- package/lib/modules/ResourcePlanner/index.js +25 -23
- package/lib/modules/ResourcePlanner/localClock.js +54 -119
- package/lib/modules/ResourcePlanner/planner.js +589 -770
- package/lib/modules/ResourcePlanner/types.js +10 -29
- package/lib/modules/Rules/index.js +1218 -959
- package/lib/modules/Rules/types.js +17 -40
- package/lib/modules/SalesSummary/index.js +85 -90
- package/lib/modules/SalesSummary/types.js +4 -16
- package/lib/modules/SalesSummary/utils.js +355 -430
- package/lib/modules/ScanOrderLogger/index.js +59 -79
- package/lib/modules/ScanOrderLogger/providers/feishu.js +54 -78
- package/lib/modules/ScanOrderLogger/providers/grafana.js +13 -36
- package/lib/modules/ScanOrderLogger/types.js +4 -16
- package/lib/modules/Schedule/getDateIsInSchedule.js +334 -163
- package/lib/modules/Schedule/index.js +100 -114
- package/lib/modules/Schedule/type.js +4 -16
- package/lib/modules/Schedule/types.js +4 -16
- package/lib/modules/Schedule/utils.js +433 -291
- package/lib/modules/Step/index.js +40 -52
- package/lib/modules/Step/tyeps.js +4 -16
- package/lib/modules/Summary/index.js +66 -71
- package/lib/modules/Summary/types.js +4 -16
- package/lib/modules/Summary/utils.js +773 -418
- package/lib/modules/SurchargeList/index.js +46 -60
- package/lib/modules/SurchargeList/types.js +4 -16
- package/lib/modules/index.js +245 -63
- package/lib/plugins/app.js +4 -16
- package/lib/plugins/index.js +36 -25
- package/lib/plugins/request.js +137 -126
- package/lib/plugins/shopStore.js +4 -16
- package/lib/plugins/user.js +4 -16
- package/lib/plugins/window.js +171 -179
- package/lib/server/index.js +3050 -2665
- package/lib/server/modules/floor-plan/index.js +118 -134
- package/lib/server/modules/floor-plan/types.js +15 -30
- package/lib/server/modules/index.js +106 -68
- package/lib/server/modules/menu/index.js +142 -122
- package/lib/server/modules/menu/types.js +18 -31
- package/lib/server/modules/order/index.js +784 -1002
- package/lib/server/modules/order/types.js +122 -33
- package/lib/server/modules/order/utils/filterBookings.js +219 -194
- package/lib/server/modules/order/utils/filterOrders.js +118 -92
- package/lib/server/modules/payment/index.js +59 -83
- package/lib/server/modules/payment/types.js +4 -16
- package/lib/server/modules/products/index.js +583 -471
- package/lib/server/modules/products/types.js +44 -34
- package/lib/server/modules/quotation/index.js +137 -172
- package/lib/server/modules/quotation/types.js +21 -31
- package/lib/server/modules/resource/index.js +220 -186
- package/lib/server/modules/resource/types.js +42 -33
- package/lib/server/modules/schedule/index.js +135 -123
- package/lib/server/modules/schedule/types.js +14 -21
- package/lib/server/modules/schedule/utils.js +334 -163
- package/lib/server/types.js +4 -16
- package/lib/server/utils/index.js +25 -23
- package/lib/server/utils/product.js +196 -139
- package/lib/server/utils/schedule.js +34 -41
- package/lib/server/utils/small-ticket.js +479 -456
- package/lib/server/utils/time.js +40 -49
- package/lib/solution/BaseSales/index.js +1186 -1410
- package/lib/solution/BaseSales/types.js +42 -38
- package/lib/solution/BaseSales/utils/cartPromotion.js +642 -498
- package/lib/solution/BaseSales/utils/parseSalesResponse.js +85 -105
- package/lib/solution/BaseSales/utils/quotationPrice.js +56 -114
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +108 -145
- package/lib/solution/BaseSales/utils.js +158 -143
- package/lib/solution/BookingByStep/index.js +1527 -1340
- package/lib/solution/BookingByStep/types.js +40 -99
- package/lib/solution/BookingByStep/utils/capacity.js +192 -160
- package/lib/solution/BookingByStep/utils/products.js +42 -52
- package/lib/solution/BookingByStep/utils/resources.js +527 -330
- package/lib/solution/BookingByStep/utils/stock.js +65 -44
- package/lib/solution/BookingByStep/utils/timeslots.js +129 -131
- package/lib/solution/BookingTicket/index.js +607 -522
- package/lib/solution/BookingTicket/types.js +99 -77
- package/lib/solution/BookingTicket/utils/addProductDecision.js +226 -189
- package/lib/solution/BookingTicket/utils/addTimeAvailability.js +58 -89
- package/lib/solution/BookingTicket/utils/bookingStatus.js +107 -78
- package/lib/solution/BookingTicket/utils/cartView.js +114 -99
- package/lib/solution/BookingTicket/utils/exampleData.js +185 -0
- package/lib/solution/BookingTicket/utils/orderCustomer.js +18 -41
- package/lib/solution/BookingTicket/utils/resolveBestAddTimePlan.js +219 -86
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +168 -116
- package/lib/solution/BookingTicket/utils/scan/cloudSearch.js +79 -91
- package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.js +54 -41
- package/lib/solution/BookingTicket/utils/scan/handleScan.js +84 -81
- package/lib/solution/BookingTicket/utils/scan/index.js +98 -104
- package/lib/solution/BookingTicket/utils/scan/scanCache.js +90 -43
- package/lib/solution/BookingTicket/utils/scan/scanProductValues.js +52 -64
- package/lib/solution/BookingTicket/utils/sessionCatalogStale.js +56 -58
- package/lib/solution/BookingTicket/utils/weighingProductSku.js +34 -48
- package/lib/solution/BuyTickets/index.js +67 -70
- package/lib/solution/BuyTickets/types.js +22 -38
- package/lib/solution/Checkout/index.js +1451 -1158
- package/lib/solution/Checkout/types.js +91 -61
- package/lib/solution/Checkout/utils/index.js +228 -156
- package/lib/solution/PlaceOrder/index.js +55 -0
- package/lib/solution/RegisterAndLogin/config.js +493 -460
- package/lib/solution/RegisterAndLogin/index.js +633 -630
- package/lib/solution/RegisterAndLogin/types.js +189 -76
- package/lib/solution/RegisterAndLogin/utils.js +183 -125
- package/lib/solution/Sales/index.js +328 -324
- package/lib/solution/Sales/types.js +27 -33
- package/lib/solution/ScanOrder/index.js +832 -864
- package/lib/solution/ScanOrder/types.js +33 -34
- package/lib/solution/ScanOrder/utils.js +409 -374
- package/lib/solution/ShopDiscount/index.js +226 -232
- package/lib/solution/ShopDiscount/types.js +15 -37
- package/lib/solution/ShopDiscount/utils.js +300 -172
- package/lib/solution/UnifiedBookingSales/index.js +1035 -1201
- package/lib/solution/UnifiedBookingSales/remoteOccupancyCache.js +99 -159
- package/lib/solution/UnifiedBookingSales/types.js +10 -32
- package/lib/solution/VenueBooking/index.js +811 -879
- package/lib/solution/VenueBooking/types.js +19 -39
- package/lib/solution/VenueBooking/utils/dateSummary.js +27 -56
- package/lib/solution/VenueBooking/utils/resource.js +31 -54
- package/lib/solution/VenueBooking/utils/slotMerge.js +94 -107
- package/lib/solution/VenueBooking/utils/timeSlot.js +132 -132
- package/lib/solution/VenueBooking/utils.js +130 -67
- package/lib/solution/index.js +124 -41
- package/lib/store/createStore.js +32 -29
- package/lib/types/index.js +4 -16
- package/lib/utils/payment-number.js +26 -46
- package/lib/utils/task.js +36 -36
- package/lib/utils/watch.js +81 -47
- package/package.json +2 -1
|
@@ -157,9 +157,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
157
157
|
app = appPlugin.getApp();
|
|
158
158
|
this.dbManager = app.sqlite;
|
|
159
159
|
this.logger = app.logger;
|
|
160
|
-
if (this.dbManager) {
|
|
161
|
-
console.log('[Schedule] SQLite 已初始化');
|
|
162
|
-
} else {
|
|
160
|
+
if (this.dbManager) {} else {
|
|
163
161
|
console.warn('[Schedule] SQLite 未找到');
|
|
164
162
|
}
|
|
165
163
|
}
|
|
@@ -323,7 +321,6 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
323
321
|
} finally {
|
|
324
322
|
_iterator2.f();
|
|
325
323
|
}
|
|
326
|
-
console.log("[Schedule] Map \u7F13\u5B58\u5DF2\u540C\u6B65\uFF0C\u5171 ".concat(this.store.map.size, " \u4E2A\u65E5\u7A0B"));
|
|
327
324
|
}
|
|
328
325
|
|
|
329
326
|
/**
|
|
@@ -344,32 +341,31 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
344
341
|
this.store.map.clear();
|
|
345
342
|
// 同时清空 SQLite 中的数据
|
|
346
343
|
if (!this.dbManager) {
|
|
347
|
-
_context3.next =
|
|
344
|
+
_context3.next = 15;
|
|
348
345
|
break;
|
|
349
346
|
}
|
|
350
347
|
_context3.prev = 4;
|
|
351
348
|
_context3.next = 7;
|
|
352
349
|
return this.dbManager.clear(SCHEDULE_STORE_NAME);
|
|
353
350
|
case 7:
|
|
354
|
-
console.log('[Schedule] SQLite 缓存已清空');
|
|
355
351
|
this.logInfo('SQLite 缓存已清空');
|
|
356
|
-
_context3.next =
|
|
352
|
+
_context3.next = 15;
|
|
357
353
|
break;
|
|
358
|
-
case
|
|
359
|
-
_context3.prev =
|
|
354
|
+
case 10:
|
|
355
|
+
_context3.prev = 10;
|
|
360
356
|
_context3.t0 = _context3["catch"](4);
|
|
361
357
|
errorMessage = _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0);
|
|
362
358
|
console.error('[Schedule] 清空 SQLite 缓存失败:', _context3.t0);
|
|
363
359
|
this.logError('清空 SQLite 缓存失败', {
|
|
364
360
|
error: errorMessage
|
|
365
361
|
});
|
|
366
|
-
case
|
|
362
|
+
case 15:
|
|
367
363
|
this.logInfo('缓存清空完成');
|
|
368
|
-
case
|
|
364
|
+
case 16:
|
|
369
365
|
case "end":
|
|
370
366
|
return _context3.stop();
|
|
371
367
|
}
|
|
372
|
-
}, _callee3, this, [[4,
|
|
368
|
+
}, _callee3, this, [[4, 10]]);
|
|
373
369
|
}));
|
|
374
370
|
function clear() {
|
|
375
371
|
return _clear.apply(this, arguments);
|
|
@@ -509,14 +505,13 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
509
505
|
return _this4.dbManager.add(SCHEDULE_STORE_NAME, schedule);
|
|
510
506
|
}));
|
|
511
507
|
case 20:
|
|
512
|
-
console.log("[Schedule] \u5DF2\u5C06 ".concat(scheduleList.length, " \u6761\u65E5\u7A0B\u6570\u636E\u4FDD\u5B58\u5230 SQLite"));
|
|
513
508
|
this.logInfo('日程数据已保存到 SQLite', {
|
|
514
509
|
scheduleCount: scheduleList.length
|
|
515
510
|
});
|
|
516
|
-
_context5.next =
|
|
511
|
+
_context5.next = 28;
|
|
517
512
|
break;
|
|
518
|
-
case
|
|
519
|
-
_context5.prev =
|
|
513
|
+
case 23:
|
|
514
|
+
_context5.prev = 23;
|
|
520
515
|
_context5.t0 = _context5["catch"](4);
|
|
521
516
|
errorMessage = _context5.t0 instanceof Error ? _context5.t0.message : String(_context5.t0);
|
|
522
517
|
console.error('[Schedule] 保存数据到 SQLite 失败:', _context5.t0);
|
|
@@ -524,11 +519,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
524
519
|
scheduleCount: scheduleList.length,
|
|
525
520
|
error: errorMessage
|
|
526
521
|
});
|
|
527
|
-
case
|
|
522
|
+
case 28:
|
|
528
523
|
case "end":
|
|
529
524
|
return _context5.stop();
|
|
530
525
|
}
|
|
531
|
-
}, _callee5, this, [[4,
|
|
526
|
+
}, _callee5, this, [[4, 23]]);
|
|
532
527
|
}));
|
|
533
528
|
function saveScheduleToSQLite(_x3) {
|
|
534
529
|
return _saveScheduleToSQLite.apply(this, arguments);
|
|
@@ -548,19 +543,17 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
548
543
|
return _regeneratorRuntime().wrap(function _callee6$(_context6) {
|
|
549
544
|
while (1) switch (_context6.prev = _context6.next) {
|
|
550
545
|
case 0:
|
|
551
|
-
console.log('[Schedule] 开始预加载数据...');
|
|
552
546
|
startTime = Date.now();
|
|
553
547
|
this.logInfo('开始预加载数据');
|
|
554
|
-
_context6.prev =
|
|
555
|
-
_context6.next =
|
|
548
|
+
_context6.prev = 2;
|
|
549
|
+
_context6.next = 5;
|
|
556
550
|
return this.loadScheduleFromSQLite();
|
|
557
|
-
case
|
|
551
|
+
case 5:
|
|
558
552
|
cachedData = _context6.sent;
|
|
559
553
|
if (!(cachedData && cachedData.length > 0)) {
|
|
560
|
-
_context6.next =
|
|
554
|
+
_context6.next = 12;
|
|
561
555
|
break;
|
|
562
556
|
}
|
|
563
|
-
console.log("[Schedule] \u4ECE SQLite \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u65E5\u7A0B\u6570\u636E"));
|
|
564
557
|
// 将缓存数据放入 store
|
|
565
558
|
this.store.scheduleList = cloneDeep(cachedData);
|
|
566
559
|
// 同步更新 Map 缓存
|
|
@@ -572,23 +565,22 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
572
565
|
source: 'SQLite'
|
|
573
566
|
});
|
|
574
567
|
return _context6.abrupt("return");
|
|
575
|
-
case
|
|
576
|
-
console.log('[Schedule] SQLite 中没有缓存数据,从服务器加载...');
|
|
568
|
+
case 12:
|
|
577
569
|
this.logInfo('SQLite 中没有缓存数据,准备从服务器加载');
|
|
578
|
-
_context6.next =
|
|
570
|
+
_context6.next = 20;
|
|
579
571
|
break;
|
|
580
|
-
case
|
|
581
|
-
_context6.prev =
|
|
582
|
-
_context6.t0 = _context6["catch"](
|
|
572
|
+
case 15:
|
|
573
|
+
_context6.prev = 15;
|
|
574
|
+
_context6.t0 = _context6["catch"](2);
|
|
583
575
|
errorMessage = _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0);
|
|
584
576
|
console.warn('[Schedule] 从 SQLite 加载数据失败:', _context6.t0);
|
|
585
577
|
this.logWarning('从 SQLite 加载数据失败,准备从服务器加载', {
|
|
586
578
|
error: errorMessage
|
|
587
579
|
});
|
|
588
|
-
case
|
|
589
|
-
_context6.next =
|
|
580
|
+
case 20:
|
|
581
|
+
_context6.next = 22;
|
|
590
582
|
return this.loadAllSchedule();
|
|
591
|
-
case
|
|
583
|
+
case 22:
|
|
592
584
|
scheduleList = _context6.sent;
|
|
593
585
|
// 3. 将服务器数据放入 store
|
|
594
586
|
if (scheduleList && scheduleList.length > 0) {
|
|
@@ -607,11 +599,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
|
|
|
607
599
|
duration: "".concat(_duration3, "ms")
|
|
608
600
|
});
|
|
609
601
|
}
|
|
610
|
-
case
|
|
602
|
+
case 24:
|
|
611
603
|
case "end":
|
|
612
604
|
return _context6.stop();
|
|
613
605
|
}
|
|
614
|
-
}, _callee6, this, [[
|
|
606
|
+
}, _callee6, this, [[2, 15]]);
|
|
615
607
|
}));
|
|
616
608
|
function preload() {
|
|
617
609
|
return _preload.apply(this, arguments);
|
|
@@ -82,7 +82,6 @@ function buildPriceIndexMap(priceData) {
|
|
|
82
82
|
export function applyPriceDataToProducts(products, priceData) {
|
|
83
83
|
var t0 = performance.now();
|
|
84
84
|
if (!priceData || priceData.length === 0) {
|
|
85
|
-
console.log('[applyPriceDataToProducts] 没有价格数据,返回原商品');
|
|
86
85
|
return products;
|
|
87
86
|
}
|
|
88
87
|
var t1 = performance.now();
|
|
@@ -2272,11 +2272,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
2272
2272
|
});
|
|
2273
2273
|
case 40:
|
|
2274
2274
|
if (!rulesModule) {
|
|
2275
|
-
_context21.next =
|
|
2275
|
+
_context21.next = 76;
|
|
2276
2276
|
break;
|
|
2277
2277
|
}
|
|
2278
2278
|
orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
|
|
2279
|
-
console.log('[BaseSales.applyDiscountConfig.calcDiscount]');
|
|
2280
2279
|
result = rulesModule.calcDiscount({
|
|
2281
2280
|
productList: tempOrder.products,
|
|
2282
2281
|
discountList: nextDiscountList,
|
|
@@ -2293,22 +2292,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
2293
2292
|
tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
|
|
2294
2293
|
}
|
|
2295
2294
|
_iterator2 = _createForOfIteratorHelper(tempOrder.products || []);
|
|
2296
|
-
_context21.prev =
|
|
2295
|
+
_context21.prev = 45;
|
|
2297
2296
|
_iterator2.s();
|
|
2298
|
-
case
|
|
2297
|
+
case 47:
|
|
2299
2298
|
if ((_step2 = _iterator2.n()).done) {
|
|
2300
|
-
_context21.next =
|
|
2299
|
+
_context21.next = 62;
|
|
2301
2300
|
break;
|
|
2302
2301
|
}
|
|
2303
2302
|
product = _step2.value;
|
|
2304
2303
|
productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
|
|
2305
2304
|
runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
|
|
2306
2305
|
if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
|
|
2307
|
-
_context21.next =
|
|
2306
|
+
_context21.next = 53;
|
|
2308
2307
|
break;
|
|
2309
2308
|
}
|
|
2310
|
-
return _context21.abrupt("continue",
|
|
2311
|
-
case
|
|
2309
|
+
return _context21.abrupt("continue", 60);
|
|
2310
|
+
case 53:
|
|
2312
2311
|
totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
|
|
2313
2312
|
return sum + Number(pd.amount || 0);
|
|
2314
2313
|
}, 0);
|
|
@@ -2324,59 +2323,59 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
2324
2323
|
mainPrice: newMainSellingPrice,
|
|
2325
2324
|
bundle: product.product_bundle
|
|
2326
2325
|
});
|
|
2327
|
-
case
|
|
2328
|
-
_context21.next =
|
|
2326
|
+
case 60:
|
|
2327
|
+
_context21.next = 47;
|
|
2329
2328
|
break;
|
|
2330
|
-
case
|
|
2331
|
-
_context21.next =
|
|
2329
|
+
case 62:
|
|
2330
|
+
_context21.next = 67;
|
|
2332
2331
|
break;
|
|
2333
|
-
case
|
|
2334
|
-
_context21.prev =
|
|
2335
|
-
_context21.t0 = _context21["catch"](
|
|
2332
|
+
case 64:
|
|
2333
|
+
_context21.prev = 64;
|
|
2334
|
+
_context21.t0 = _context21["catch"](45);
|
|
2336
2335
|
_iterator2.e(_context21.t0);
|
|
2337
|
-
case
|
|
2338
|
-
_context21.prev =
|
|
2336
|
+
case 67:
|
|
2337
|
+
_context21.prev = 67;
|
|
2339
2338
|
_iterator2.f();
|
|
2340
|
-
return _context21.finish(
|
|
2341
|
-
case
|
|
2339
|
+
return _context21.finish(67);
|
|
2340
|
+
case 70:
|
|
2342
2341
|
if (!result.discountList) {
|
|
2343
|
-
_context21.next =
|
|
2342
|
+
_context21.next = 76;
|
|
2344
2343
|
break;
|
|
2345
2344
|
}
|
|
2346
2345
|
nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
|
|
2347
2346
|
OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
|
|
2348
|
-
_context21.next =
|
|
2347
|
+
_context21.next = 75;
|
|
2349
2348
|
return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
|
|
2350
|
-
case
|
|
2349
|
+
case 75:
|
|
2351
2350
|
tempOrder.discount_list = nextDiscountList.filter(function (discount) {
|
|
2352
2351
|
return discount.isSelected;
|
|
2353
2352
|
});
|
|
2354
|
-
case
|
|
2355
|
-
_context21.next =
|
|
2353
|
+
case 76:
|
|
2354
|
+
_context21.next = 78;
|
|
2356
2355
|
return this.store.order.recalculateSummary({
|
|
2357
2356
|
createIfMissing: true
|
|
2358
2357
|
});
|
|
2359
|
-
case
|
|
2358
|
+
case 78:
|
|
2360
2359
|
summary = _context21.sent;
|
|
2361
2360
|
this.store.order.persistTempOrder();
|
|
2362
|
-
_context21.next =
|
|
2361
|
+
_context21.next = 82;
|
|
2363
2362
|
return this.effectsEmit('onDiscountApplied', {
|
|
2364
2363
|
productList: tempOrder.products || [],
|
|
2365
2364
|
discountList: nextDiscountList,
|
|
2366
2365
|
selectedDiscountList: tempOrder.discount_list || [],
|
|
2367
2366
|
tempOrder: tempOrder
|
|
2368
2367
|
});
|
|
2369
|
-
case
|
|
2368
|
+
case 82:
|
|
2370
2369
|
return _context21.abrupt("return", {
|
|
2371
2370
|
productList: tempOrder.products || [],
|
|
2372
2371
|
discountList: nextDiscountList,
|
|
2373
2372
|
availableWalletIds: this.getAvailableWalletIds()
|
|
2374
2373
|
});
|
|
2375
|
-
case
|
|
2374
|
+
case 83:
|
|
2376
2375
|
case "end":
|
|
2377
2376
|
return _context21.stop();
|
|
2378
2377
|
}
|
|
2379
|
-
}, _callee21, this, [[
|
|
2378
|
+
}, _callee21, this, [[45, 64, 67, 70]]);
|
|
2380
2379
|
}));
|
|
2381
2380
|
function loadDiscountConfig(_x16) {
|
|
2382
2381
|
return _loadDiscountConfig.apply(this, arguments);
|
|
@@ -2420,11 +2419,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
2420
2419
|
return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
|
|
2421
2420
|
case 12:
|
|
2422
2421
|
if (!rulesModule) {
|
|
2423
|
-
_context22.next =
|
|
2422
|
+
_context22.next = 23;
|
|
2424
2423
|
break;
|
|
2425
2424
|
}
|
|
2426
2425
|
orderTotalAmount = Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0);
|
|
2427
|
-
console.log('[BaseSales.bestDiscount.calcDiscount]');
|
|
2428
2426
|
result = rulesModule.calcDiscount({
|
|
2429
2427
|
productList: tempOrder.products,
|
|
2430
2428
|
discountList: nextDiscountList,
|
|
@@ -2438,14 +2436,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
2438
2436
|
tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
|
|
2439
2437
|
}
|
|
2440
2438
|
if (!result.discountList) {
|
|
2441
|
-
_context22.next =
|
|
2439
|
+
_context22.next = 23;
|
|
2442
2440
|
break;
|
|
2443
2441
|
}
|
|
2444
2442
|
nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
|
|
2445
2443
|
OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
|
|
2446
|
-
_context22.next =
|
|
2444
|
+
_context22.next = 21;
|
|
2447
2445
|
return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
|
|
2448
|
-
case
|
|
2446
|
+
case 21:
|
|
2449
2447
|
tempOrder.discount_list = nextDiscountList.filter(function (discount) {
|
|
2450
2448
|
return discount.isSelected;
|
|
2451
2449
|
});
|
|
@@ -2453,24 +2451,24 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
2453
2451
|
productList: tempOrder.products,
|
|
2454
2452
|
discountList: nextDiscountList
|
|
2455
2453
|
};
|
|
2456
|
-
case
|
|
2457
|
-
_context22.next =
|
|
2454
|
+
case 23:
|
|
2455
|
+
_context22.next = 25;
|
|
2458
2456
|
return this.store.order.recalculateSummary({
|
|
2459
2457
|
createIfMissing: true
|
|
2460
2458
|
});
|
|
2461
|
-
case
|
|
2459
|
+
case 25:
|
|
2462
2460
|
this.store.order.persistTempOrder();
|
|
2463
|
-
_context22.next =
|
|
2461
|
+
_context22.next = 28;
|
|
2464
2462
|
return this.effectsEmit('onDiscountApplied', {
|
|
2465
2463
|
productList: tempOrder.products || [],
|
|
2466
2464
|
discountList: nextDiscountList,
|
|
2467
2465
|
selectedDiscountList: tempOrder.discount_list || [],
|
|
2468
2466
|
tempOrder: tempOrder
|
|
2469
2467
|
});
|
|
2470
|
-
case
|
|
2468
|
+
case 28:
|
|
2471
2469
|
cb === null || cb === void 0 || cb(result);
|
|
2472
2470
|
return _context22.abrupt("return", result);
|
|
2473
|
-
case
|
|
2471
|
+
case 30:
|
|
2474
2472
|
case "end":
|
|
2475
2473
|
return _context22.stop();
|
|
2476
2474
|
}
|
|
@@ -2639,7 +2637,6 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
2639
2637
|
case 13:
|
|
2640
2638
|
if (rulesModule) {
|
|
2641
2639
|
orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
|
|
2642
|
-
console.log('[BaseSales.setDiscountSelected.calcDiscount]');
|
|
2643
2640
|
result = rulesModule.calcDiscount({
|
|
2644
2641
|
productList: tempOrder.products,
|
|
2645
2642
|
discountList: updated,
|
|
@@ -87,23 +87,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
87
87
|
this.core = core;
|
|
88
88
|
this.store = options.store || {};
|
|
89
89
|
this.otherParams = options.otherParams || {};
|
|
90
|
-
console.log('[BookingByStep] 初始化完成');
|
|
91
90
|
// 获取依赖的插件
|
|
92
91
|
this.request = core.getPlugin('request');
|
|
93
92
|
this.window = core.getPlugin('window');
|
|
94
93
|
this.shopStore = core.getPlugin('shopStore');
|
|
95
94
|
if (this.request) {
|
|
96
|
-
_context.next =
|
|
95
|
+
_context.next = 8;
|
|
97
96
|
break;
|
|
98
97
|
}
|
|
99
98
|
throw new Error('bookingByStep解决方案需要 request 插件支持');
|
|
100
|
-
case
|
|
99
|
+
case 8:
|
|
101
100
|
if (this.shopStore) {
|
|
102
|
-
_context.next =
|
|
101
|
+
_context.next = 10;
|
|
103
102
|
break;
|
|
104
103
|
}
|
|
105
104
|
throw new Error('SummaryModule 需要 shopStore 插件支持');
|
|
106
|
-
case
|
|
105
|
+
case 10:
|
|
107
106
|
// 如果有传 cacheid,默认需要收集上面这些模块里用户操作选中的数据
|
|
108
107
|
// 并且在上面 registerModule 的时候,读取 sessionStroage 里的数据,塞进默认值
|
|
109
108
|
targetCacheData = {};
|
|
@@ -138,7 +137,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
138
137
|
});
|
|
139
138
|
this.store.schedule.loadAllSchedule();
|
|
140
139
|
this.core.effects.emit("".concat(this.name, ":onInited"), {});
|
|
141
|
-
case
|
|
140
|
+
case 18:
|
|
142
141
|
case "end":
|
|
143
142
|
return _context.stop();
|
|
144
143
|
}
|
|
@@ -3187,8 +3186,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3187
3186
|
key: "findCommonAvailableTimeSlots",
|
|
3188
3187
|
value: function findCommonAvailableTimeSlots(resources) {
|
|
3189
3188
|
if (resources.length === 0) return [];
|
|
3190
|
-
console.log("\u8BA1\u7B97 ".concat(resources.length, " \u4E2A\u8D44\u6E90\u7684\u516C\u5171\u65F6\u95F4\u6BB5"));
|
|
3191
|
-
|
|
3192
3189
|
// 收集所有资源的时间段,转换为统一的时间格式
|
|
3193
3190
|
var allTimeSlots = resources.map(function (resource) {
|
|
3194
3191
|
return resource.times.map(function (time) {
|
|
@@ -3198,19 +3195,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3198
3195
|
};
|
|
3199
3196
|
});
|
|
3200
3197
|
});
|
|
3201
|
-
console.log('所有资源的时间段:', allTimeSlots.map(function (slots) {
|
|
3202
|
-
return slots.map(function (slot) {
|
|
3203
|
-
return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
|
|
3204
|
-
});
|
|
3205
|
-
}));
|
|
3206
|
-
|
|
3207
3198
|
// 找到公共时间段的交集
|
|
3208
3199
|
var commonSlots = allTimeSlots[0]; // 从第一个资源的时间段开始
|
|
3209
|
-
console.log('初始公共时间段:', commonSlots.map(function (slot) {
|
|
3210
|
-
return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
|
|
3211
|
-
}));
|
|
3212
|
-
|
|
3213
|
-
// 与其他资源的时间段求交集
|
|
3214
3200
|
var _loop3 = function _loop3() {
|
|
3215
3201
|
var currentResourceSlots = allTimeSlots[i];
|
|
3216
3202
|
var intersections = [];
|
|
@@ -3231,14 +3217,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3231
3217
|
});
|
|
3232
3218
|
});
|
|
3233
3219
|
if (intersections.length === 0) {
|
|
3234
|
-
console.log("\u8D44\u6E90".concat(i, "\u4E0E\u5F53\u524D\u516C\u5171\u65F6\u95F4\u6BB5\u65E0\u4EA4\u96C6\uFF0C\u8DF3\u8FC7\u8BE5\u8D44\u6E90"));
|
|
3235
3220
|
return 1; // continue
|
|
3236
3221
|
}
|
|
3237
3222
|
commonSlots = intersections;
|
|
3238
|
-
console.log("\u4E0E\u8D44\u6E90".concat(i, "\u6C42\u4EA4\u96C6\u540E\u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonSlots.map(function (slot) {
|
|
3239
|
-
return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
|
|
3240
|
-
}));
|
|
3241
3223
|
};
|
|
3224
|
+
// 与其他资源的时间段求交集
|
|
3242
3225
|
for (var i = 1; i < allTimeSlots.length; i++) {
|
|
3243
3226
|
if (_loop3()) continue;
|
|
3244
3227
|
}
|
|
@@ -3250,7 +3233,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3250
3233
|
endTime: slot.end.format('HH:mm')
|
|
3251
3234
|
};
|
|
3252
3235
|
});
|
|
3253
|
-
console.log('最终公共时间段:', result);
|
|
3254
3236
|
return result;
|
|
3255
3237
|
}
|
|
3256
3238
|
}, {
|
|
@@ -3360,7 +3342,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3360
3342
|
// 获取该资源类型对应的 form_id
|
|
3361
3343
|
var targetFormId = resourceCodeToFormIdMap[resourceCode];
|
|
3362
3344
|
if (!targetFormId) {
|
|
3363
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u627E\u4E0D\u5230\u5BF9\u5E94\u7684 form_id"));
|
|
3364
3345
|
return {
|
|
3365
3346
|
v: {
|
|
3366
3347
|
success: false,
|
|
@@ -3387,7 +3368,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3387
3368
|
});
|
|
3388
3369
|
});
|
|
3389
3370
|
if (resourcesOfThisType.length === 0) {
|
|
3390
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u627E\u5230\u53EF\u7528\u8D44\u6E90"));
|
|
3391
3371
|
return {
|
|
3392
3372
|
v: {
|
|
3393
3373
|
success: false,
|
|
@@ -3454,24 +3434,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3454
3434
|
// 检查是否有容量问题
|
|
3455
3435
|
if (requiredAmount > totalAvailable) {
|
|
3456
3436
|
hasCapacityIssue = true;
|
|
3457
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " ").concat(isMultipleBooking ? '容量' : '资源数量', "\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredAmount, ", \u603B\u5171 ").concat(totalAvailable));
|
|
3458
3437
|
}
|
|
3459
3438
|
|
|
3460
3439
|
// 为通过检测的商品分配一个公共可用时间段
|
|
3461
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u8D44\u6E90\u65F6\u95F4\u4FE1\u606F:"), resourcesOfThisType.map(function (r) {
|
|
3462
|
-
return {
|
|
3463
|
-
id: r.id,
|
|
3464
|
-
times: r.times.map(function (t) {
|
|
3465
|
-
return "".concat(t.start_at, " - ").concat(t.end_at);
|
|
3466
|
-
})
|
|
3467
|
-
};
|
|
3468
|
-
}));
|
|
3469
3440
|
|
|
3470
3441
|
// 找到所有资源都可用的时间段
|
|
3471
3442
|
var commonTimeSlots = _this16.findCommonAvailableTimeSlots(resourcesOfThisType);
|
|
3472
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonTimeSlots);
|
|
3473
3443
|
if (commonTimeSlots.length === 0) {
|
|
3474
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u516C\u5171\u53EF\u7528\u65F6\u95F4\u6BB5"));
|
|
3475
3444
|
return {
|
|
3476
3445
|
v: {
|
|
3477
3446
|
success: false,
|
|
@@ -3482,7 +3451,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3482
3451
|
|
|
3483
3452
|
// 使用第一个公共可用时间段,但只处理未处理过的商品
|
|
3484
3453
|
var firstCommonSlot = commonTimeSlots[0];
|
|
3485
|
-
console.log("\u4F7F\u7528\u516C\u5171\u65F6\u95F4\u6BB5: ".concat(firstCommonSlot.startTime, " - ").concat(firstCommonSlot.endTime));
|
|
3486
3454
|
items.forEach(function (cartItem) {
|
|
3487
3455
|
// 只处理未处理过的商品,避免重复添加
|
|
3488
3456
|
if (!processedCartItemIds.has(cartItem._id)) {
|
|
@@ -3793,7 +3761,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3793
3761
|
// 获取该资源类型对应的 form_id
|
|
3794
3762
|
var targetFormId = resourceCodeToFormIdMap[resourceCode];
|
|
3795
3763
|
if (!targetFormId) {
|
|
3796
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u627E\u4E0D\u5230\u5BF9\u5E94\u7684 form_id"));
|
|
3797
3764
|
return {
|
|
3798
3765
|
v: {
|
|
3799
3766
|
success: false,
|
|
@@ -3820,7 +3787,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3820
3787
|
});
|
|
3821
3788
|
});
|
|
3822
3789
|
if (resourcesOfThisType.length === 0) {
|
|
3823
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u627E\u5230\u53EF\u7528\u8D44\u6E90"));
|
|
3824
3790
|
return {
|
|
3825
3791
|
v: {
|
|
3826
3792
|
success: false,
|
|
@@ -3887,24 +3853,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3887
3853
|
// 检查是否有容量问题
|
|
3888
3854
|
if (requiredAmount > totalAvailable) {
|
|
3889
3855
|
hasCapacityIssue = true;
|
|
3890
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " ").concat(isMultipleBooking ? '容量' : '资源数量', "\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredAmount, ", \u603B\u5171 ").concat(totalAvailable));
|
|
3891
3856
|
}
|
|
3892
3857
|
|
|
3893
3858
|
// 为通过检测的商品分配一个公共可用时间段
|
|
3894
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u8D44\u6E90\u65F6\u95F4\u4FE1\u606F:"), resourcesOfThisType.map(function (r) {
|
|
3895
|
-
return {
|
|
3896
|
-
id: r.id,
|
|
3897
|
-
times: r.times.map(function (t) {
|
|
3898
|
-
return "".concat(t.start_at, " - ").concat(t.end_at);
|
|
3899
|
-
})
|
|
3900
|
-
};
|
|
3901
|
-
}));
|
|
3902
3859
|
|
|
3903
3860
|
// 找到所有资源都可用的时间段
|
|
3904
3861
|
var commonTimeSlots = _this17.findCommonAvailableTimeSlots(resourcesOfThisType);
|
|
3905
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonTimeSlots);
|
|
3906
3862
|
if (commonTimeSlots.length === 0) {
|
|
3907
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u516C\u5171\u53EF\u7528\u65F6\u95F4\u6BB5"));
|
|
3908
3863
|
return {
|
|
3909
3864
|
v: {
|
|
3910
3865
|
success: false,
|
|
@@ -3915,7 +3870,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3915
3870
|
|
|
3916
3871
|
// 使用第一个公共可用时间段,但只处理未处理过的商品
|
|
3917
3872
|
var firstCommonSlot = commonTimeSlots[0];
|
|
3918
|
-
console.log("\u4F7F\u7528\u516C\u5171\u65F6\u95F4\u6BB5: ".concat(firstCommonSlot.startTime, " - ").concat(firstCommonSlot.endTime));
|
|
3919
3873
|
items.forEach(function (cartItem) {
|
|
3920
3874
|
// 只处理未处理过的商品,避免重复添加
|
|
3921
3875
|
if (!processedCartItemIds.has(cartItem._id)) {
|
|
@@ -4225,12 +4179,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4225
4179
|
while (1) switch (_context29.prev = _context29.next) {
|
|
4226
4180
|
case 0:
|
|
4227
4181
|
startDate = _ref16.startDate, endDate = _ref16.endDate, scheduleIds = _ref16.scheduleIds, resources = _ref16.resources;
|
|
4228
|
-
console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
|
|
4229
|
-
startDate: startDate,
|
|
4230
|
-
endDate: endDate,
|
|
4231
|
-
scheduleIds: scheduleIds,
|
|
4232
|
-
resources: resources
|
|
4233
|
-
});
|
|
4234
4182
|
// 生成日期范围内的所有日期
|
|
4235
4183
|
dates = [];
|
|
4236
4184
|
currentDate = dayjs(startDate);
|
|
@@ -4250,7 +4198,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4250
4198
|
});
|
|
4251
4199
|
}
|
|
4252
4200
|
return _context29.abrupt("return", results);
|
|
4253
|
-
case
|
|
4201
|
+
case 8:
|
|
4254
4202
|
case "end":
|
|
4255
4203
|
return _context29.stop();
|
|
4256
4204
|
}
|
|
@@ -293,7 +293,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
|
|
|
293
293
|
|
|
294
294
|
// 检查每种资源类型是否有足够的容量
|
|
295
295
|
var _loop = function _loop() {
|
|
296
|
-
var _resourceTypeConfig
|
|
296
|
+
var _resourceTypeConfig;
|
|
297
297
|
var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
|
|
298
298
|
formId = _Object$entries$_i[0],
|
|
299
299
|
requiredCapacity = _Object$entries$_i[1];
|
|
@@ -324,12 +324,6 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
|
|
|
324
324
|
_iterator2.f();
|
|
325
325
|
}
|
|
326
326
|
var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.type) === 'multiple';
|
|
327
|
-
console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u914D\u7F6E:"), {
|
|
328
|
-
resourceTypeConfig: resourceTypeConfig,
|
|
329
|
-
type: (_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type,
|
|
330
|
-
isMultipleBooking: isMultipleBooking,
|
|
331
|
-
requiredCapacity: requiredCapacity
|
|
332
|
-
});
|
|
333
327
|
if (isMultipleBooking) {
|
|
334
328
|
// 多个预约:计算总可用容量
|
|
335
329
|
var totalAvailableCapacity = 0;
|
|
@@ -343,9 +337,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
|
|
|
343
337
|
totalAvailableCapacity += resource.capacity || 0;
|
|
344
338
|
}
|
|
345
339
|
});
|
|
346
|
-
console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u591A\u4E2A\u9884\u7EA6\u68C0\u67E5: \u603B\u5BB9\u91CF ").concat(totalAvailableCapacity, ", \u9700\u6C42 ").concat(requiredCapacity));
|
|
347
340
|
if (totalAvailableCapacity < requiredCapacity) {
|
|
348
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5BB9\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(totalAvailableCapacity));
|
|
349
341
|
return {
|
|
350
342
|
v: {
|
|
351
343
|
success: false,
|
|
@@ -366,9 +358,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
|
|
|
366
358
|
availableResourceCount++;
|
|
367
359
|
}
|
|
368
360
|
});
|
|
369
|
-
console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5355\u4E2A\u9884\u7EA6\u68C0\u67E5: \u53EF\u7528\u8D44\u6E90\u6570 ").concat(availableResourceCount, ", \u9700\u6C42 ").concat(requiredCapacity));
|
|
370
361
|
if (availableResourceCount < requiredCapacity) {
|
|
371
|
-
console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u6570\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(availableResourceCount));
|
|
372
362
|
return {
|
|
373
363
|
v: {
|
|
374
364
|
success: false,
|