@pisell/pisellos 2.3.128 → 2.3.130

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (160) hide show
  1. package/dist/index.d.ts +2 -0
  2. package/dist/index.js +3 -1
  3. package/dist/model/strategy/adapter/promotion/index.js +0 -9
  4. package/dist/model/strategy/adapter/walletPass/evaluator.d.ts +2 -0
  5. package/dist/model/strategy/adapter/walletPass/evaluator.js +4 -2
  6. package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +58 -19
  7. package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +24 -12
  8. package/dist/modules/Customer/index.js +6 -3
  9. package/dist/modules/Customer/types.d.ts +2 -0
  10. package/dist/modules/Discount/availability.d.ts +7 -0
  11. package/dist/modules/Discount/availability.js +49 -0
  12. package/dist/modules/Discount/entitlementPass.d.ts +34 -0
  13. package/dist/modules/Discount/entitlementPass.js +147 -0
  14. package/dist/modules/Discount/index.d.ts +2 -2
  15. package/dist/modules/Discount/index.js +37 -151
  16. package/dist/modules/Discount/types.d.ts +36 -5
  17. package/dist/modules/FulfillmentTiming/index.d.ts +11 -0
  18. package/dist/modules/FulfillmentTiming/index.js +407 -0
  19. package/dist/modules/FulfillmentTiming/types.d.ts +67 -0
  20. package/dist/modules/FulfillmentTiming/types.js +1 -0
  21. package/dist/modules/OpenData/types.d.ts +6 -0
  22. package/dist/modules/Order/index.d.ts +12 -0
  23. package/dist/modules/Order/index.js +498 -247
  24. package/dist/modules/Order/pickupTiming.d.ts +46 -0
  25. package/dist/modules/Order/pickupTiming.js +53 -0
  26. package/dist/modules/Order/types.d.ts +5 -1
  27. package/dist/modules/Order/utils/orderCollectionIdentity.js +16 -12
  28. package/dist/modules/Order/utils.d.ts +1 -1
  29. package/dist/modules/Order/utils.js +117 -66
  30. package/dist/modules/Payment/index.js +9 -10
  31. package/dist/modules/Payment/types.d.ts +21 -1
  32. package/dist/modules/Payment/types.js +2 -0
  33. package/dist/modules/Payment/walletpass.d.ts +1 -1
  34. package/dist/modules/Payment/walletpass.js +80 -47
  35. package/dist/modules/Rules/index.d.ts +2 -2
  36. package/dist/modules/Rules/index.js +480 -186
  37. package/dist/modules/Rules/types.d.ts +4 -0
  38. package/dist/modules/Schedule/index.d.ts +8 -0
  39. package/dist/modules/Schedule/index.js +141 -39
  40. package/dist/modules/index.d.ts +1 -0
  41. package/dist/modules/index.js +1 -0
  42. package/dist/plugins/request.d.ts +7 -0
  43. package/dist/server/modules/order/types.d.ts +2 -0
  44. package/dist/server/utils/small-ticket.d.ts +1 -85
  45. package/dist/server/utils/small-ticket.js +2 -2542
  46. package/dist/shared/payment/loadPaymentMethods.d.ts +9 -0
  47. package/dist/shared/payment/loadPaymentMethods.js +66 -0
  48. package/dist/shared/receipt/loadCustomerInvoiceLayout.d.ts +22 -0
  49. package/dist/shared/receipt/loadCustomerInvoiceLayout.js +142 -0
  50. package/dist/shared/receipt/small-ticket.d.ts +85 -0
  51. package/dist/shared/receipt/small-ticket.js +2576 -0
  52. package/dist/shared/sales/loadSalesOrderSnapshot.d.ts +9 -0
  53. package/dist/shared/sales/loadSalesOrderSnapshot.js +21 -0
  54. package/dist/solution/BaseSales/index.d.ts +25 -0
  55. package/dist/solution/BaseSales/index.js +1226 -1040
  56. package/dist/solution/BaseSales/pickupTiming.d.ts +43 -0
  57. package/dist/solution/BaseSales/pickupTiming.js +589 -0
  58. package/dist/solution/BaseSales/types.d.ts +2 -2
  59. package/dist/solution/BaseSales/utils/cartPromotion.js +141 -126
  60. package/dist/solution/BaseSales/utils/parseSalesResponse.js +3 -0
  61. package/dist/solution/BookingByStep/index.d.ts +1 -1
  62. package/dist/solution/BookingTicket/index.d.ts +4 -5
  63. package/dist/solution/BookingTicket/index.js +60 -63
  64. package/dist/solution/BookingTicket/types.d.ts +5 -1
  65. package/dist/solution/BookingTicket/utils/cartView.js +3 -1
  66. package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +2 -0
  67. package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +338 -147
  68. package/dist/solution/BookingTicket/utils/scan/cloudSearch.js +8 -4
  69. package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +6 -0
  70. package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.js +19 -6
  71. package/dist/solution/OrderInvoicePreview/index.d.ts +56 -0
  72. package/dist/solution/OrderInvoicePreview/index.js +269 -0
  73. package/dist/solution/ShopDiscount/index.d.ts +2 -0
  74. package/dist/solution/ShopDiscount/index.js +99 -42
  75. package/dist/solution/ShopDiscount/utils.d.ts +4 -2
  76. package/dist/solution/ShopDiscount/utils.js +43 -23
  77. package/dist/solution/UnifiedBookingSales/index.d.ts +13 -4
  78. package/dist/solution/UnifiedBookingSales/index.js +874 -709
  79. package/dist/solution/index.d.ts +1 -0
  80. package/dist/solution/index.js +2 -1
  81. package/lib/index.d.ts +2 -0
  82. package/lib/index.js +21 -1
  83. package/lib/model/strategy/adapter/walletPass/evaluator.d.ts +2 -0
  84. package/lib/model/strategy/adapter/walletPass/evaluator.js +2 -0
  85. package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +35 -6
  86. package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +13 -6
  87. package/lib/modules/Customer/index.js +5 -1
  88. package/lib/modules/Customer/types.d.ts +2 -0
  89. package/lib/modules/Discount/availability.d.ts +7 -0
  90. package/lib/modules/Discount/availability.js +43 -0
  91. package/lib/modules/Discount/entitlementPass.d.ts +34 -0
  92. package/lib/modules/Discount/entitlementPass.js +141 -0
  93. package/lib/modules/Discount/index.d.ts +2 -2
  94. package/lib/modules/Discount/index.js +23 -129
  95. package/lib/modules/Discount/types.d.ts +36 -5
  96. package/lib/modules/FulfillmentTiming/index.d.ts +11 -0
  97. package/lib/modules/FulfillmentTiming/index.js +359 -0
  98. package/lib/modules/FulfillmentTiming/types.d.ts +67 -0
  99. package/lib/modules/FulfillmentTiming/types.js +5 -0
  100. package/lib/modules/OpenData/types.d.ts +6 -0
  101. package/lib/modules/Order/index.d.ts +12 -0
  102. package/lib/modules/Order/index.js +252 -48
  103. package/lib/modules/Order/pickupTiming.d.ts +46 -0
  104. package/lib/modules/Order/pickupTiming.js +61 -0
  105. package/lib/modules/Order/types.d.ts +5 -1
  106. package/lib/modules/Order/utils/orderCollectionIdentity.js +14 -11
  107. package/lib/modules/Order/utils.d.ts +1 -1
  108. package/lib/modules/Order/utils.js +51 -7
  109. package/lib/modules/Payment/index.js +3 -4
  110. package/lib/modules/Payment/types.d.ts +21 -1
  111. package/lib/modules/Payment/types.js +1 -0
  112. package/lib/modules/Payment/walletpass.d.ts +1 -1
  113. package/lib/modules/Payment/walletpass.js +29 -9
  114. package/lib/modules/Rules/index.d.ts +2 -2
  115. package/lib/modules/Rules/index.js +357 -110
  116. package/lib/modules/Rules/types.d.ts +4 -0
  117. package/lib/modules/Schedule/index.d.ts +8 -0
  118. package/lib/modules/Schedule/index.js +68 -12
  119. package/lib/modules/index.d.ts +1 -0
  120. package/lib/modules/index.js +11 -0
  121. package/lib/plugins/request.d.ts +7 -0
  122. package/lib/server/modules/order/types.d.ts +2 -0
  123. package/lib/server/utils/small-ticket.d.ts +1 -85
  124. package/lib/server/utils/small-ticket.js +9 -2305
  125. package/lib/shared/payment/loadPaymentMethods.d.ts +9 -0
  126. package/lib/shared/payment/loadPaymentMethods.js +40 -0
  127. package/lib/shared/receipt/loadCustomerInvoiceLayout.d.ts +22 -0
  128. package/lib/shared/receipt/loadCustomerInvoiceLayout.js +86 -0
  129. package/lib/shared/receipt/small-ticket.d.ts +85 -0
  130. package/lib/shared/receipt/small-ticket.js +2342 -0
  131. package/lib/shared/sales/loadSalesOrderSnapshot.d.ts +9 -0
  132. package/lib/shared/sales/loadSalesOrderSnapshot.js +22 -0
  133. package/lib/solution/BaseSales/index.d.ts +25 -0
  134. package/lib/solution/BaseSales/index.js +102 -3
  135. package/lib/solution/BaseSales/pickupTiming.d.ts +43 -0
  136. package/lib/solution/BaseSales/pickupTiming.js +269 -0
  137. package/lib/solution/BaseSales/types.d.ts +2 -2
  138. package/lib/solution/BaseSales/utils/cartPromotion.js +12 -4
  139. package/lib/solution/BaseSales/utils/parseSalesResponse.js +3 -0
  140. package/lib/solution/BookingByStep/index.d.ts +1 -1
  141. package/lib/solution/BookingTicket/index.d.ts +4 -5
  142. package/lib/solution/BookingTicket/index.js +36 -33
  143. package/lib/solution/BookingTicket/types.d.ts +5 -1
  144. package/lib/solution/BookingTicket/utils/cartView.js +3 -1
  145. package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +2 -0
  146. package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +174 -42
  147. package/lib/solution/BookingTicket/utils/scan/cloudSearch.js +8 -4
  148. package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +6 -0
  149. package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.js +11 -3
  150. package/lib/solution/OrderInvoicePreview/index.d.ts +56 -0
  151. package/lib/solution/OrderInvoicePreview/index.js +192 -0
  152. package/lib/solution/ShopDiscount/index.d.ts +2 -0
  153. package/lib/solution/ShopDiscount/index.js +55 -9
  154. package/lib/solution/ShopDiscount/utils.d.ts +4 -2
  155. package/lib/solution/ShopDiscount/utils.js +42 -25
  156. package/lib/solution/UnifiedBookingSales/index.d.ts +13 -4
  157. package/lib/solution/UnifiedBookingSales/index.js +132 -48
  158. package/lib/solution/index.d.ts +1 -0
  159. package/lib/solution/index.js +11 -0
  160. package/package.json +1 -1
@@ -27,8 +27,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
27
27
  import { BaseModule } from "../../modules/BaseModule";
28
28
  import { DiscountModule } from "../../modules/Discount";
29
29
  import { RulesModule } from "../../modules/Rules";
30
+ import { isEntitlementPass } from "../../modules/Discount/entitlementPass";
30
31
  import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
31
32
  import { UnavailableReason } from "../../modules/Rules/types";
33
+ import { getDiscountLifecycleReason } from "../../modules/Discount/availability";
32
34
  import Decimal from 'decimal.js';
33
35
  import { isBoolean } from 'lodash-es';
34
36
  export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
@@ -203,7 +205,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
203
205
  customerId: customer.id,
204
206
  action: 'create',
205
207
  with_good_pass: 1,
206
- with_discount_card: 1
208
+ with_discount_card: 1,
209
+ with_entitlement_pass: 1
207
210
  });
208
211
  });
209
212
  }
@@ -439,7 +442,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
439
442
  key: "scanCode",
440
443
  value: function () {
441
444
  var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
442
- var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
445
+ var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, evaluatedDiscountList, isAvailable, unavailableReason, isAccepted, _this$options$otherPa6, scannedIds, retainedScannedDiscounts, _this$store$discount5, retainedDiscounts;
443
446
  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
444
447
  while (1) switch (_context6.prev = _context6.next) {
445
448
  case 0:
@@ -521,30 +524,65 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
521
524
  isAvailable: false,
522
525
  productList: this.store.productList || [],
523
526
  discountList: this.getDiscountList()
524
- }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
527
+ }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, evaluatedDiscountList = _ref2.evaluatedDiscountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
528
+ isAccepted = isAvailable;
525
529
  if (!isAvailable) {
526
- _context6.next = 25;
530
+ _context6.next = 28;
527
531
  break;
528
532
  }
529
533
  this.setDiscountList(newDiscountList || []);
530
534
  this.store.originalDiscountList = newDiscountList || [];
531
535
  this.setProductList(newProductList || []);
532
536
  if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1))) {
533
- _context6.next = 25;
537
+ _context6.next = 26;
534
538
  break;
535
539
  }
536
- _context6.next = 25;
540
+ _context6.next = 26;
537
541
  return this.getCustomerWallet(resultDiscountList[0].customer_id);
538
- case 25:
542
+ case 26:
543
+ _context6.next = 38;
544
+ break;
545
+ case 28:
546
+ scannedIds = new Set(withScanList.map(function (discount) {
547
+ return String(discount.id);
548
+ }));
549
+ retainedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(function (discount) {
550
+ return scannedIds.has(String(discount.id)) && !getDiscountLifecycleReason(discount);
551
+ });
552
+ if (!retainedScannedDiscounts.length) {
553
+ _context6.next = 38;
554
+ break;
555
+ }
556
+ retainedDiscounts = new Map(this.getDiscountList().map(function (discount) {
557
+ return [String(discount.id), discount];
558
+ }));
559
+ retainedScannedDiscounts.forEach(function (discount) {
560
+ retainedDiscounts.set(String(discount.id), _objectSpread(_objectSpread({}, discount), {}, {
561
+ isScan: true,
562
+ isAvailable: false,
563
+ isSelected: false,
564
+ reasonCode: discount.reasonCode || 'product_not_applicable',
565
+ appliedProductDetails: [],
566
+ savedAmount: 0
567
+ }));
568
+ });
569
+ this.setDiscountList(_toConsumableArray(retainedDiscounts.values()));
570
+ this.store.originalDiscountList = this.getDiscountList();
571
+ _context6.next = 37;
572
+ return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.setOriginalDiscountList(this.getDiscountList());
573
+ case 37:
574
+ isAccepted = true;
575
+ case 38:
539
576
  return _context6.abrupt("return", {
540
577
  type: "clientCalc",
541
578
  isAvailable: isAvailable || false,
579
+ isAccepted: Boolean(isAccepted),
542
580
  productList: newProductList || this.store.productList || [],
543
- discountList: newDiscountList || this.getDiscountList(),
581
+ discountList: this.getDiscountList(),
544
582
  unavailableReason: unavailableReason
545
583
  });
546
- case 28:
547
- _context6.prev = 28;
584
+ case 41:
585
+ _context6.prev = 41;
548
586
  _context6.t1 = _context6["catch"](0);
549
587
  console.error('[ShopDiscount] 扫码出错:', _context6.t1);
550
588
  return _context6.abrupt("return", {
@@ -554,11 +592,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
554
592
  discountList: this.getDiscountList(),
555
593
  unavailableReason: UnavailableReason.Unknown
556
594
  });
557
- case 32:
595
+ case 45:
558
596
  case "end":
559
597
  return _context6.stop();
560
598
  }
561
- }, _callee6, this, [[0, 28]]);
599
+ }, _callee6, this, [[0, 41]]);
562
600
  }));
563
601
  function scanCode(_x5, _x6) {
564
602
  return _scanCode.apply(this, arguments);
@@ -568,8 +606,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
568
606
  }, {
569
607
  key: "calcDiscountApplicableProductTotalPrice",
570
608
  value: function calcDiscountApplicableProductTotalPrice(discount) {
571
- var _this$store$discount5;
572
- return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.calcDiscountApplicableProductTotalPrice(discount);
609
+ var _this$store$discount6;
610
+ return (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.calcDiscountApplicableProductTotalPrice(discount);
573
611
  }
574
612
 
575
613
  // =========== 私有辅助方法 ===========
@@ -614,7 +652,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
614
652
  key: "setDiscountList",
615
653
  value: function setDiscountList(discountList) {
616
654
  var _this3 = this,
617
- _this$store$discount6;
655
+ _this$store$discount7;
618
656
  var productList = this.store.productList || [];
619
657
  var editModeDiscountList = [];
620
658
  productList.forEach(function (item) {
@@ -622,7 +660,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
622
660
  var _this3$hooks;
623
661
  var product = (_this3$hooks = _this3.hooks) === null || _this3$hooks === void 0 ? void 0 : _this3$hooks.getProduct(item);
624
662
  (item.discount_list || []).forEach(function (discount) {
625
- if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
663
+ if (discount.id && ['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) {
626
664
  var index = editModeDiscountList.findIndex(function (n) {
627
665
  var _discount$discount;
628
666
  return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
@@ -697,7 +735,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
697
735
  item.isDisabledForProductUsed = false;
698
736
  }
699
737
  });
700
- (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
738
+ (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 || _this$store$discount7.setDiscountList(newDiscountList);
701
739
  this.emitDiscountListChange(newDiscountList);
702
740
  return newDiscountList;
703
741
  }
@@ -706,8 +744,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
706
744
  }, {
707
745
  key: "getDiscountList",
708
746
  value: function getDiscountList() {
709
- var _this$store$discount7;
710
- return ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
747
+ var _this$store$discount8;
748
+ return ((_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.getDiscountList()) || [];
711
749
  }
712
750
 
713
751
  // 获取客户钱包信息
@@ -789,7 +827,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
789
827
  key: "loadPrepareConfig",
790
828
  value: function () {
791
829
  var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
792
- var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
830
+ var _this$getCustomer2, _this$store$discount9, _this$getDiscountList, _this$store$discount10, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountById, refreshedScanEntitlementIds, newGoodPassList, retainedScanDiscounts, newDiscountList, filteredDiscountList, _result3;
793
831
  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
794
832
  while (1) switch (_context10.prev = _context10.next) {
795
833
  case 0:
@@ -799,12 +837,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
799
837
  // return
800
838
  // }
801
839
  _context10.next = 5;
802
- return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
840
+ return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.loadPrepareConfig(_objectSpread({
803
841
  customer_id: customerId,
804
842
  action: orderId ? 'edit' : 'create',
805
843
  with_good_pass: 1,
806
844
  with_discount_card: 1,
807
845
  with_wallet_pass_holder: 1,
846
+ with_entitlement_pass: 1,
847
+ filter_order_wallet_pass_usage: 0,
808
848
  request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
809
849
  }, orderId ? {
810
850
  order_id: orderId
@@ -814,44 +854,61 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
814
854
  goodPassList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList) || [];
815
855
  scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
816
856
  return item.isScan;
817
- }); // goodPassList 里可能有 scanDiscount 重合的部分,goodPassList 需要剔除
818
- scanDiscountIds = scanDiscount.map(function (n) {
819
- return n.id;
857
+ }); // 扫码 Entitlement Pass 与客户列表重复时保留扫码选择状态,但刷新实时余额。
858
+ // 其他券继续沿用原来的“保留扫码结果、剔除列表重复项”行为。
859
+ scanDiscountById = new Map(scanDiscount.map(function (discount) {
860
+ return [String(discount.id), discount];
861
+ }));
862
+ refreshedScanEntitlementIds = new Set();
863
+ newGoodPassList = goodPassList.flatMap(function (discount) {
864
+ var key = String(discount.id);
865
+ var scannedDiscount = scanDiscountById.get(key);
866
+ if (!scannedDiscount) return [discount];
867
+ if (isEntitlementPass(scannedDiscount) && isEntitlementPass(discount)) {
868
+ var _scannedDiscount$isSe, _scannedDiscount$isMa;
869
+ refreshedScanEntitlementIds.add(key);
870
+ return [_objectSpread(_objectSpread({}, discount), {}, {
871
+ isScan: true,
872
+ isSelected: (_scannedDiscount$isSe = scannedDiscount.isSelected) !== null && _scannedDiscount$isSe !== void 0 ? _scannedDiscount$isSe : discount.isSelected,
873
+ isManualSelect: (_scannedDiscount$isMa = scannedDiscount.isManualSelect) !== null && _scannedDiscount$isMa !== void 0 ? _scannedDiscount$isMa : discount.isManualSelect
874
+ })];
875
+ }
876
+ return [];
820
877
  });
821
- newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
822
- return !scanDiscountIds.includes(n.id);
878
+ retainedScanDiscounts = scanDiscount.filter(function (discount) {
879
+ return !refreshedScanEntitlementIds.has(String(discount.id));
823
880
  });
824
- newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
881
+ newDiscountList = [].concat(_toConsumableArray(retainedScanDiscounts), _toConsumableArray(newGoodPassList)); // 存储原始优惠券列表
825
882
  this.store.originalDiscountList = newDiscountList;
826
- _context10.next = 14;
827
- return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
828
- case 14:
829
- // 根据当前预约时间过滤优惠券列表
830
- filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
883
+ _context10.next = 16;
884
+ return (_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.setOriginalDiscountList(newDiscountList);
885
+ case 16:
886
+ // 日程限制交给 Rules 计算可用状态,展示列表保留当前不可用的卡券。
887
+ filteredDiscountList = newDiscountList;
831
888
  this.store.filteredDiscountList = filteredDiscountList;
832
889
  this.setDiscountList(filteredDiscountList || []);
833
890
  if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
834
- _context10.next = 21;
891
+ _context10.next = 23;
835
892
  break;
836
893
  }
837
894
  _result3 = this.calcDiscount(this.store.productList);
838
- _context10.next = 21;
839
- return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
840
- case 21:
841
895
  _context10.next = 23;
842
- return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
896
+ return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
843
897
  case 23:
844
- _context10.next = 28;
845
- break;
898
+ _context10.next = 25;
899
+ return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
846
900
  case 25:
847
- _context10.prev = 25;
901
+ _context10.next = 30;
902
+ break;
903
+ case 27:
904
+ _context10.prev = 27;
848
905
  _context10.t0 = _context10["catch"](0);
849
906
  console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
850
- case 28:
907
+ case 30:
851
908
  case "end":
852
909
  return _context10.stop();
853
910
  }
854
- }, _callee10, this, [[0, 25]]);
911
+ }, _callee10, this, [[0, 27]]);
855
912
  }));
856
913
  function loadPrepareConfig(_x10) {
857
914
  return _loadPrepareConfig.apply(this, arguments);
@@ -59,12 +59,14 @@ export interface ScheduleItem {
59
59
  }
60
60
  export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
61
61
  /**
62
- * 根据预约时间过滤优惠券列表
62
+ * 根据商品使用时间过滤优惠券列表(预约开始时间或普通商品的当前时间)
63
63
  * @param discountList 优惠券列表
64
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
64
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss),未确定时不提前过滤
65
65
  * @returns 过滤后的优惠券列表
66
66
  */
67
67
  export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];
68
+ /** 与抵扣计算共用时间判断,区分未开始、有效期不匹配和日程限制。 */
69
+ export declare const getDiscountTimeUnavailableReason: (discount: Discount, useTime: string) => 'not_started' | 'time_limit' | 'outside_schedule' | undefined;
68
70
  /**
69
71
  * 判断是否是订单级别的固定金额折扣卡
70
72
  * @param discount 折扣
@@ -9,6 +9,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
9
9
  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; }
10
10
  import Decimal from "decimal.js";
11
11
  import dayjs from "dayjs";
12
+ import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
13
+ import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
14
+ import { isFullCoveragePass } from "../../modules/Discount/entitlementPass";
15
+ dayjs.extend(isSameOrAfter);
16
+ dayjs.extend(isSameOrBefore);
12
17
  export var uniqueById = function uniqueById(arr) {
13
18
  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
14
19
  var seen = new Set();
@@ -41,8 +46,8 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
41
46
  */
42
47
  export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
43
48
  var _discount$metadata;
44
- // 商品券
45
- if (discount.tag === 'good_pass') {
49
+ // 商品券和 Entitlement Pass 都是全额抵扣。
50
+ if (isFullCoveragePass(discount)) {
46
51
  return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
47
52
  }
48
53
 
@@ -439,36 +444,51 @@ var isInWeeklyRepeatForDate = function isInWeeklyRepeatForDate(targetDate, start
439
444
  };
440
445
 
441
446
  /**
442
- * 根据预约时间过滤优惠券列表
447
+ * 根据商品使用时间过滤优惠券列表(预约开始时间或普通商品的当前时间)
443
448
  * @param discountList 优惠券列表
444
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
449
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss),未确定时不提前过滤
445
450
  * @returns 过滤后的优惠券列表
446
451
  */
447
452
  export var filterDiscountListByBookingTime = function filterDiscountListByBookingTime(discountList, bookingTime) {
448
- if (!bookingTime) {
449
- return discountList;
450
- }
453
+ if (!bookingTime) return discountList;
451
454
  return discountList.filter(function (discount) {
452
- var _discount$metadata2;
455
+ return !getDiscountTimeUnavailableReason(discount, bookingTime);
456
+ });
457
+ };
458
+
459
+ /** 与抵扣计算共用时间判断,区分未开始、有效期不匹配和日程限制。 */
460
+ export var getDiscountTimeUnavailableReason = function getDiscountTimeUnavailableReason(discount, useTime) {
461
+ var useTimeDayjs = dayjs(useTime);
462
+ if (!useTimeDayjs.isValid()) return 'time_limit';
463
+ try {
464
+ var _discount$metadata2, _discount$extension_d, _discount$custom_sche2;
453
465
  if ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.validity_type) === "custom_schedule_validity") {
454
466
  var _discount$custom_sche;
455
- return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
467
+ return getDateIsInSchedule(useTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []) ? undefined : 'outside_schedule';
456
468
  }
457
- try {
458
- var isHasStart = !!discount.start_date && !!discount.start_time;
459
- var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
460
- var bookingTimeDayjs = dayjs(bookingTime);
461
-
462
- // 判断预约时间是否在开始时间之后
463
- var isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
464
-
465
- // 判断预约时间是否在过期时间之前(expire_time 为空时为长期有效)
466
- var isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore(dayjs(discount.expire_time)) : true;
467
- return isAfterStart && isBeforeExpire;
468
- } catch (error) {
469
- return true;
469
+ var isHasStart = !!discount.start_date && !!discount.start_time;
470
+ var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
471
+
472
+ // 开始时刻包含在有效期内。
473
+ if (isHasStart) {
474
+ if (!startDate.isValid()) return 'time_limit';
475
+ if (useTimeDayjs.isBefore(startDate)) return 'not_started';
470
476
  }
471
- });
477
+
478
+ // 到期时刻不再可用;expire_time 为空时为长期有效。
479
+ var expireTime = discount.expire_time ? dayjs(discount.expire_time) : null;
480
+ var isBeforeExpire = expireTime ? expireTime.isValid() && useTimeDayjs.isBefore(expireTime) : true;
481
+ if (!isBeforeExpire) return 'time_limit';
482
+ var validity = (_discount$extension_d = discount.extension_data) === null || _discount$extension_d === void 0 || (_discount$extension_d = _discount$extension_d.find(function (field) {
483
+ return field.field_key === 'valid_times';
484
+ })) === null || _discount$extension_d === void 0 ? void 0 : _discount$extension_d.value;
485
+ if ((validity === null || validity === void 0 ? void 0 : validity.restrict_use_by_schedule) === true && !getDateIsInSchedule(useTime, ((_discount$custom_sche2 = discount.custom_schedule_snapshot) === null || _discount$custom_sche2 === void 0 ? void 0 : _discount$custom_sche2.data) || [])) {
486
+ return 'outside_schedule';
487
+ }
488
+ return undefined;
489
+ } catch (error) {
490
+ return 'time_limit';
491
+ }
472
492
  };
473
493
  /**
474
494
  * 判断是否是订单级别的固定金额折扣卡
@@ -59,6 +59,13 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
59
59
  protected defaultName: string;
60
60
  protected defaultVersion: string;
61
61
  protected store: UnifiedBookingSalesState;
62
+ protected pickupTimingEnabled: boolean;
63
+ private runtimeOpenDataScope;
64
+ private runtimeOpenDataSnapshot;
65
+ private runtimeOpenDataModule;
66
+ private runtimeOpenDataCore;
67
+ private runtimeOpenDataGeneration;
68
+ private runtimeOpenDataDestroyed;
62
69
  private unifiedProductCatalog;
63
70
  private availabilityRuntimeOffsetMinutes;
64
71
  private availabilityScheduleCatalog;
@@ -142,12 +149,14 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
142
149
  private resolveDiscountAction;
143
150
  private resetCachedCustomerDiscountState;
144
151
  private refreshLegacySessionCustomerDiscounts;
145
- /**
146
- * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
147
- * business/channel target so a reused solution instance cannot leak another entry's menus.
148
- */
152
+ private getRuntimeOpenDataScope;
153
+ private resetRuntimeOpenData;
154
+ protected prepareInvoiceTemplateAtSolutionReady(injectedOpenData?: OpenDataConfig): Promise<void>;
155
+ protected loadOpenDataConfig(): Promise<OpenDataConfig | null>;
156
+ /** A successful configuration belongs to this business runtime until an explicit refresh. */
149
157
  loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
150
158
  getOpenData(): Promise<OpenDataConfig | null>;
159
+ protected loadPickupTimingOpenData(_force: boolean): Promise<Record<string, unknown>>;
151
160
  private resetAllergyItemRuleState;
152
161
  private fetchAllergyItemRuleConfigs;
153
162
  private ensureAllergyItemRuleConfigsLoaded;