@pisell/pisellos 2.3.124 → 2.3.126

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 (93) hide show
  1. package/dist/model/strategy/adapter/promotion/index.js +9 -0
  2. package/dist/model/strategy/adapter/walletPass/evaluator.d.ts +0 -2
  3. package/dist/model/strategy/adapter/walletPass/evaluator.js +2 -4
  4. package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +19 -58
  5. package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +12 -24
  6. package/dist/modules/Customer/index.js +3 -6
  7. package/dist/modules/Customer/types.d.ts +0 -2
  8. package/dist/modules/Discount/index.d.ts +2 -2
  9. package/dist/modules/Discount/index.js +151 -37
  10. package/dist/modules/Discount/types.d.ts +5 -36
  11. package/dist/modules/Order/index.d.ts +12 -7
  12. package/dist/modules/Order/index.js +307 -432
  13. package/dist/modules/Order/types.d.ts +5 -0
  14. package/dist/modules/Order/utils/orderCollectionIdentity.js +12 -16
  15. package/dist/modules/Order/utils.d.ts +11 -1
  16. package/dist/modules/Order/utils.js +127 -122
  17. package/dist/modules/Payment/types.d.ts +1 -21
  18. package/dist/modules/Payment/types.js +0 -2
  19. package/dist/modules/Payment/walletpass.d.ts +1 -1
  20. package/dist/modules/Payment/walletpass.js +47 -80
  21. package/dist/modules/Rules/index.d.ts +2 -2
  22. package/dist/modules/Rules/index.js +186 -480
  23. package/dist/modules/Rules/types.d.ts +0 -4
  24. package/dist/server/modules/order/types.d.ts +0 -2
  25. package/dist/solution/BaseSales/index.d.ts +0 -1
  26. package/dist/solution/BaseSales/index.js +59 -51
  27. package/dist/solution/BaseSales/types.d.ts +2 -2
  28. package/dist/solution/BaseSales/utils/cartPromotion.js +126 -141
  29. package/dist/solution/BookingByStep/index.d.ts +1 -1
  30. package/dist/solution/BookingTicket/index.d.ts +2 -1
  31. package/dist/solution/BookingTicket/index.js +63 -60
  32. package/dist/solution/BookingTicket/types.d.ts +1 -5
  33. package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +0 -2
  34. package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +147 -338
  35. package/dist/solution/BookingTicket/utils/scan/cloudSearch.js +4 -8
  36. package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +0 -6
  37. package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.js +6 -19
  38. package/dist/solution/ShopDiscount/index.d.ts +0 -2
  39. package/dist/solution/ShopDiscount/index.js +42 -99
  40. package/dist/solution/ShopDiscount/utils.d.ts +2 -4
  41. package/dist/solution/ShopDiscount/utils.js +23 -43
  42. package/dist/solution/UnifiedBookingSales/index.js +2 -2
  43. package/lib/model/strategy/adapter/promotion/index.js +1 -46
  44. package/lib/model/strategy/adapter/walletPass/evaluator.d.ts +0 -2
  45. package/lib/model/strategy/adapter/walletPass/evaluator.js +0 -2
  46. package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +6 -35
  47. package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +6 -13
  48. package/lib/modules/Customer/index.js +1 -5
  49. package/lib/modules/Customer/types.d.ts +0 -2
  50. package/lib/modules/Discount/index.d.ts +2 -2
  51. package/lib/modules/Discount/index.js +129 -23
  52. package/lib/modules/Discount/types.d.ts +5 -36
  53. package/lib/modules/Order/index.d.ts +12 -7
  54. package/lib/modules/Order/index.js +107 -215
  55. package/lib/modules/Order/types.d.ts +5 -0
  56. package/lib/modules/Order/utils/orderCollectionIdentity.js +11 -14
  57. package/lib/modules/Order/utils.d.ts +11 -1
  58. package/lib/modules/Order/utils.js +45 -39
  59. package/lib/modules/Payment/types.d.ts +1 -21
  60. package/lib/modules/Payment/types.js +0 -1
  61. package/lib/modules/Payment/walletpass.d.ts +1 -1
  62. package/lib/modules/Payment/walletpass.js +9 -29
  63. package/lib/modules/Rules/index.d.ts +2 -2
  64. package/lib/modules/Rules/index.js +110 -357
  65. package/lib/modules/Rules/types.d.ts +0 -4
  66. package/lib/server/modules/order/types.d.ts +0 -2
  67. package/lib/solution/BaseSales/index.d.ts +0 -1
  68. package/lib/solution/BaseSales/index.js +12 -5
  69. package/lib/solution/BaseSales/types.d.ts +2 -2
  70. package/lib/solution/BaseSales/utils/cartPromotion.js +4 -12
  71. package/lib/solution/BookingByStep/index.d.ts +1 -1
  72. package/lib/solution/BookingTicket/index.d.ts +2 -1
  73. package/lib/solution/BookingTicket/index.js +33 -36
  74. package/lib/solution/BookingTicket/types.d.ts +1 -5
  75. package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +0 -2
  76. package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +42 -174
  77. package/lib/solution/BookingTicket/utils/scan/cloudSearch.js +4 -8
  78. package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +0 -6
  79. package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.js +3 -11
  80. package/lib/solution/ShopDiscount/index.d.ts +0 -2
  81. package/lib/solution/ShopDiscount/index.js +9 -55
  82. package/lib/solution/ShopDiscount/utils.d.ts +2 -4
  83. package/lib/solution/ShopDiscount/utils.js +25 -42
  84. package/lib/solution/UnifiedBookingSales/index.js +2 -2
  85. package/package.json +1 -1
  86. package/dist/modules/Discount/availability.d.ts +0 -7
  87. package/dist/modules/Discount/availability.js +0 -49
  88. package/dist/modules/Discount/entitlementPass.d.ts +0 -34
  89. package/dist/modules/Discount/entitlementPass.js +0 -147
  90. package/lib/modules/Discount/availability.d.ts +0 -7
  91. package/lib/modules/Discount/availability.js +0 -43
  92. package/lib/modules/Discount/entitlementPass.d.ts +0 -34
  93. package/lib/modules/Discount/entitlementPass.js +0 -141
@@ -17,8 +17,7 @@ export var searchWalletPass = /*#__PURE__*/function () {
17
17
  // 翻译识别码名称 0:不翻译 1:翻译
18
18
  relation_product: 1,
19
19
  // 组装关联商品: 0不处理 1处理
20
- with_franchisor_data: 1,
21
- with: ['customer', 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use'],
20
+ with: ['customer'],
22
21
  tags: ['point_card',
23
22
  // 积分卡
24
23
  'gift_card',
@@ -29,8 +28,6 @@ export var searchWalletPass = /*#__PURE__*/function () {
29
28
  // 折扣卡
30
29
  'good_pass',
31
30
  // 商品券
32
- 'entitlement_pass',
33
- // 月卡 / 年卡 / 多次使用卡
34
31
  'session_ticket',
35
32
  // 场次票
36
33
  'appointment_ticket' // 预约类门票
@@ -77,15 +74,14 @@ export var searchWallet = /*#__PURE__*/function () {
77
74
  case 0:
78
75
  params = {
79
76
  code: code,
80
- with_customer: 1,
81
- with_franchisor_data: 1
77
+ with_customer: 1
82
78
  };
83
79
  _context2.prev = 1;
84
80
  _context2.next = 4;
85
81
  return request === null || request === void 0 ? void 0 : request.post('/wallet/detail/search', params);
86
82
  case 4:
87
83
  res = _context2.sent;
88
- if (!((res === null || res === void 0 ? void 0 : res.status) === true && (res === null || res === void 0 ? void 0 : res.code) === 200 && !!(res !== null && res !== void 0 && res.data))) {
84
+ if (!((res === null || res === void 0 ? void 0 : res.code) == 200 && !!(res !== null && res !== void 0 && res.data))) {
89
85
  _context2.next = 7;
90
86
  break;
91
87
  }
@@ -94,7 +90,7 @@ export var searchWallet = /*#__PURE__*/function () {
94
90
  response: res
95
91
  });
96
92
  case 7:
97
- throw new Error((res === null || res === void 0 ? void 0 : res.message) || '没有找到对应的识别码');
93
+ throw new Error('没有找到对应的识别码');
98
94
  case 10:
99
95
  _context2.prev = 10;
100
96
  _context2.t0 = _context2["catch"](1);
@@ -6,12 +6,6 @@ export interface GlobalScanFormattedResult {
6
6
  searchType: GlobalScanSearchType;
7
7
  data: any;
8
8
  scanCode: string;
9
- /** Wallet / Wallet Pass 来源客户 ID;跨店时必须先解析为当前店客户。 */
10
- customerId?: string | number;
11
- /** 仅 Wallet 返回;true 时禁止直接使用响应内的来源客户。 */
12
- isCrossShopWallet?: boolean;
13
- /** 总店 Wallet Pass 未共享给当前子店。 */
14
- isWalletPassUnavailableAtStore?: boolean;
15
9
  }
16
10
  interface RawScanSearchResult {
17
11
  searchType?: GlobalScanSearchType;
@@ -1,9 +1,3 @@
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 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; }
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; }
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; }
5
- function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
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
1
  /**
8
2
  * 全局扫码搜索结果格式化(对齐 ticketBooking `formatScanGlobal`)。
9
3
  */
@@ -33,23 +27,16 @@ export function formatGlobalScanResult(raw, scanCode) {
33
27
  return {
34
28
  searchType: searchType,
35
29
  data: resultData === null || resultData === void 0 ? void 0 : resultData.customer,
36
- scanCode: scanCode,
37
- customerId: resultData === null || resultData === void 0 ? void 0 : resultData.customer_id,
38
- isCrossShopWallet: (resultData === null || resultData === void 0 ? void 0 : resultData.is_cross_shop_wallet) === true || Number(resultData === null || resultData === void 0 ? void 0 : resultData.is_cross_shop_wallet) === 1
30
+ scanCode: scanCode
39
31
  };
40
32
  }
41
33
  if (searchType === 'walletPass') {
42
- var _firstResult$franchis, _ref2, _ref3, _firstResult$customer, _firstResult$holder, _firstResult$customer2, _firstResult$customer3;
43
- var firstResult = resultData === null || resultData === void 0 ? void 0 : resultData[0];
44
- var isWalletPassUnavailableAtStore = (firstResult === null || firstResult === void 0 ? void 0 : firstResult.is_franchisor_pass) === 1 && (firstResult === null || firstResult === void 0 || (_firstResult$franchis = firstResult.franchisee_wallet_pass) === null || _firstResult$franchis === void 0 ? void 0 : _firstResult$franchis.use) !== 'enabled';
45
- return _objectSpread({
34
+ var _resultData$;
35
+ return {
46
36
  searchType: searchType,
47
- data: firstResult === null || firstResult === void 0 ? void 0 : firstResult.customer,
48
- scanCode: scanCode,
49
- customerId: (_ref2 = (_ref3 = (_firstResult$customer = firstResult === null || firstResult === void 0 ? void 0 : firstResult.customer_id) !== null && _firstResult$customer !== void 0 ? _firstResult$customer : firstResult === null || firstResult === void 0 || (_firstResult$holder = firstResult.holder) === null || _firstResult$holder === void 0 ? void 0 : _firstResult$holder.customer_id) !== null && _ref3 !== void 0 ? _ref3 : firstResult === null || firstResult === void 0 || (_firstResult$customer2 = firstResult.customer) === null || _firstResult$customer2 === void 0 ? void 0 : _firstResult$customer2.id) !== null && _ref2 !== void 0 ? _ref2 : firstResult === null || firstResult === void 0 || (_firstResult$customer3 = firstResult.customer) === null || _firstResult$customer3 === void 0 ? void 0 : _firstResult$customer3.customer_id
50
- }, isWalletPassUnavailableAtStore ? {
51
- isWalletPassUnavailableAtStore: true
52
- } : {});
37
+ data: resultData === null || resultData === void 0 || (_resultData$ = resultData[0]) === null || _resultData$ === void 0 ? void 0 : _resultData$.customer,
38
+ scanCode: scanCode
39
+ };
53
40
  }
54
41
  if (searchType === 'product' || searchType === 'local_product') {
55
42
  return {
@@ -43,7 +43,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
43
43
  batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
44
44
  scanCode(code: string, customerId?: number): Promise<{
45
45
  isAvailable: boolean;
46
- isAccepted?: boolean;
47
46
  productList: Record<string, any>[];
48
47
  discountList: Discount[];
49
48
  type: "server" | "clientCalc";
@@ -63,7 +62,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
63
62
  action?: 'create' | 'edit';
64
63
  with_good_pass?: 0 | 1;
65
64
  with_discount_card?: 0 | 1;
66
- with_entitlement_pass?: 0 | 1;
67
65
  }): Promise<void>;
68
66
  }
69
67
  export default ShopDiscountImpl;
@@ -27,10 +27,8 @@ 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";
31
30
  import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
32
31
  import { UnavailableReason } from "../../modules/Rules/types";
33
- import { getDiscountLifecycleReason } from "../../modules/Discount/availability";
34
32
  import Decimal from 'decimal.js';
35
33
  import { isBoolean } from 'lodash-es';
36
34
  export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
@@ -205,8 +203,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
205
203
  customerId: customer.id,
206
204
  action: 'create',
207
205
  with_good_pass: 1,
208
- with_discount_card: 1,
209
- with_entitlement_pass: 1
206
+ with_discount_card: 1
210
207
  });
211
208
  });
212
209
  }
@@ -442,7 +439,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
442
439
  key: "scanCode",
443
440
  value: function () {
444
441
  var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
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;
442
+ var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
446
443
  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
447
444
  while (1) switch (_context6.prev = _context6.next) {
448
445
  case 0:
@@ -524,65 +521,30 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
524
521
  isAvailable: false,
525
522
  productList: this.store.productList || [],
526
523
  discountList: this.getDiscountList()
527
- }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, evaluatedDiscountList = _ref2.evaluatedDiscountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
528
- isAccepted = isAvailable;
524
+ }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
529
525
  if (!isAvailable) {
530
- _context6.next = 28;
526
+ _context6.next = 25;
531
527
  break;
532
528
  }
533
529
  this.setDiscountList(newDiscountList || []);
534
530
  this.store.originalDiscountList = newDiscountList || [];
535
531
  this.setProductList(newProductList || []);
536
532
  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))) {
537
- _context6.next = 26;
533
+ _context6.next = 25;
538
534
  break;
539
535
  }
540
- _context6.next = 26;
536
+ _context6.next = 25;
541
537
  return this.getCustomerWallet(resultDiscountList[0].customer_id);
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:
538
+ case 25:
576
539
  return _context6.abrupt("return", {
577
540
  type: "clientCalc",
578
541
  isAvailable: isAvailable || false,
579
- isAccepted: Boolean(isAccepted),
580
542
  productList: newProductList || this.store.productList || [],
581
- discountList: this.getDiscountList(),
543
+ discountList: newDiscountList || this.getDiscountList(),
582
544
  unavailableReason: unavailableReason
583
545
  });
584
- case 41:
585
- _context6.prev = 41;
546
+ case 28:
547
+ _context6.prev = 28;
586
548
  _context6.t1 = _context6["catch"](0);
587
549
  console.error('[ShopDiscount] 扫码出错:', _context6.t1);
588
550
  return _context6.abrupt("return", {
@@ -592,11 +554,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
592
554
  discountList: this.getDiscountList(),
593
555
  unavailableReason: UnavailableReason.Unknown
594
556
  });
595
- case 45:
557
+ case 32:
596
558
  case "end":
597
559
  return _context6.stop();
598
560
  }
599
- }, _callee6, this, [[0, 41]]);
561
+ }, _callee6, this, [[0, 28]]);
600
562
  }));
601
563
  function scanCode(_x5, _x6) {
602
564
  return _scanCode.apply(this, arguments);
@@ -606,8 +568,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
606
568
  }, {
607
569
  key: "calcDiscountApplicableProductTotalPrice",
608
570
  value: function 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);
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);
611
573
  }
612
574
 
613
575
  // =========== 私有辅助方法 ===========
@@ -652,7 +614,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
652
614
  key: "setDiscountList",
653
615
  value: function setDiscountList(discountList) {
654
616
  var _this3 = this,
655
- _this$store$discount7;
617
+ _this$store$discount6;
656
618
  var productList = this.store.productList || [];
657
619
  var editModeDiscountList = [];
658
620
  productList.forEach(function (item) {
@@ -660,7 +622,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
660
622
  var _this3$hooks;
661
623
  var product = (_this3$hooks = _this3.hooks) === null || _this3$hooks === void 0 ? void 0 : _this3$hooks.getProduct(item);
662
624
  (item.discount_list || []).forEach(function (discount) {
663
- if (discount.id && ['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) {
625
+ if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
664
626
  var index = editModeDiscountList.findIndex(function (n) {
665
627
  var _discount$discount;
666
628
  return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
@@ -735,7 +697,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
735
697
  item.isDisabledForProductUsed = false;
736
698
  }
737
699
  });
738
- (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 || _this$store$discount7.setDiscountList(newDiscountList);
700
+ (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
739
701
  this.emitDiscountListChange(newDiscountList);
740
702
  return newDiscountList;
741
703
  }
@@ -744,8 +706,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
744
706
  }, {
745
707
  key: "getDiscountList",
746
708
  value: function 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()) || [];
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()) || [];
749
711
  }
750
712
 
751
713
  // 获取客户钱包信息
@@ -827,7 +789,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
827
789
  key: "loadPrepareConfig",
828
790
  value: function () {
829
791
  var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
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;
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;
831
793
  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
832
794
  while (1) switch (_context10.prev = _context10.next) {
833
795
  case 0:
@@ -837,14 +799,12 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
837
799
  // return
838
800
  // }
839
801
  _context10.next = 5;
840
- return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.loadPrepareConfig(_objectSpread({
802
+ return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
841
803
  customer_id: customerId,
842
804
  action: orderId ? 'edit' : 'create',
843
805
  with_good_pass: 1,
844
806
  with_discount_card: 1,
845
807
  with_wallet_pass_holder: 1,
846
- with_entitlement_pass: 1,
847
- filter_order_wallet_pass_usage: 0,
848
808
  request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
849
809
  }, orderId ? {
850
810
  order_id: orderId
@@ -854,61 +814,44 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
854
814
  goodPassList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList) || [];
855
815
  scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
856
816
  return item.isScan;
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 [];
817
+ }); // goodPassList 里可能有 scanDiscount 重合的部分,goodPassList 需要剔除
818
+ scanDiscountIds = scanDiscount.map(function (n) {
819
+ return n.id;
877
820
  });
878
- retainedScanDiscounts = scanDiscount.filter(function (discount) {
879
- return !refreshedScanEntitlementIds.has(String(discount.id));
821
+ newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
822
+ return !scanDiscountIds.includes(n.id);
880
823
  });
881
- newDiscountList = [].concat(_toConsumableArray(retainedScanDiscounts), _toConsumableArray(newGoodPassList)); // 存储原始优惠券列表
824
+ newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
882
825
  this.store.originalDiscountList = newDiscountList;
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;
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);
888
831
  this.store.filteredDiscountList = filteredDiscountList;
889
832
  this.setDiscountList(filteredDiscountList || []);
890
833
  if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
891
- _context10.next = 23;
834
+ _context10.next = 21;
892
835
  break;
893
836
  }
894
837
  _result3 = this.calcDiscount(this.store.productList);
895
- _context10.next = 23;
838
+ _context10.next = 21;
896
839
  return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
897
- case 23:
898
- _context10.next = 25;
840
+ case 21:
841
+ _context10.next = 23;
899
842
  return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
900
- case 25:
901
- _context10.next = 30;
843
+ case 23:
844
+ _context10.next = 28;
902
845
  break;
903
- case 27:
904
- _context10.prev = 27;
846
+ case 25:
847
+ _context10.prev = 25;
905
848
  _context10.t0 = _context10["catch"](0);
906
849
  console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
907
- case 30:
850
+ case 28:
908
851
  case "end":
909
852
  return _context10.stop();
910
853
  }
911
- }, _callee10, this, [[0, 27]]);
854
+ }, _callee10, this, [[0, 25]]);
912
855
  }));
913
856
  function loadPrepareConfig(_x10) {
914
857
  return _loadPrepareConfig.apply(this, arguments);
@@ -59,14 +59,12 @@ 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;
70
68
  /**
71
69
  * 判断是否是订单级别的固定金额折扣卡
72
70
  * @param discount 折扣
@@ -9,11 +9,6 @@ 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);
17
12
  export var uniqueById = function uniqueById(arr) {
18
13
  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
19
14
  var seen = new Set();
@@ -46,8 +41,8 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
46
41
  */
47
42
  export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
48
43
  var _discount$metadata;
49
- // 商品券和 Entitlement Pass 都是全额抵扣。
50
- if (isFullCoveragePass(discount)) {
44
+ // 商品券
45
+ if (discount.tag === 'good_pass') {
51
46
  return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
52
47
  }
53
48
 
@@ -444,51 +439,36 @@ var isInWeeklyRepeatForDate = function isInWeeklyRepeatForDate(targetDate, start
444
439
  };
445
440
 
446
441
  /**
447
- * 根据商品使用时间过滤优惠券列表(预约开始时间或普通商品的当前时间)
442
+ * 根据预约时间过滤优惠券列表
448
443
  * @param discountList 优惠券列表
449
- * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss),未确定时不提前过滤
444
+ * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
450
445
  * @returns 过滤后的优惠券列表
451
446
  */
452
447
  export var filterDiscountListByBookingTime = function filterDiscountListByBookingTime(discountList, bookingTime) {
453
- if (!bookingTime) return discountList;
448
+ if (!bookingTime) {
449
+ return discountList;
450
+ }
454
451
  return discountList.filter(function (discount) {
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;
452
+ var _discount$metadata2;
465
453
  if ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.validity_type) === "custom_schedule_validity") {
466
454
  var _discount$custom_sche;
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';
455
+ return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
468
456
  }
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';
476
- }
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';
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;
487
470
  }
488
- return undefined;
489
- } catch (error) {
490
- return 'time_limit';
491
- }
471
+ });
492
472
  };
493
473
  /**
494
474
  * 判断是否是订单级别的固定金额折扣卡
@@ -166,7 +166,7 @@ export function buildPlannerDiscountResult(params) {
166
166
  productDiscounts.forEach(function (discount) {
167
167
  var _product$product_id, _product$metadata;
168
168
  var type = discount.tag || discount.type;
169
- if (!['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
169
+ if (!['good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
170
170
  var discountId = resolvePlannerDiscountId(discount);
171
171
  applications.push({
172
172
  discountId: discountId,
@@ -218,7 +218,7 @@ function isLocalOrderId(orderId) {
218
218
  function isCustomerBoundDiscount(discount) {
219
219
  var _discount$type;
220
220
  var type = (_discount$type = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type !== void 0 ? _discount$type : discount === null || discount === void 0 ? void 0 : discount.tag;
221
- return type === 'entitlement_pass' || type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
221
+ return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
222
222
  }
223
223
  function filterCustomerBoundDiscounts(discountList) {
224
224
  if (!Array.isArray(discountList)) return [];
@@ -1,46 +1 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
7
- enumerable: true,
8
- get: function () {
9
- return _examples.BUY_X_GET_Y_FREE_STRATEGY;
10
- }
11
- });
12
- Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
13
- enumerable: true,
14
- get: function () {
15
- return _examples.ITEM_REWARD_STRATEGY;
16
- }
17
- });
18
- Object.defineProperty(exports, "PromotionAdapter", {
19
- enumerable: true,
20
- get: function () {
21
- return _adapter.PromotionAdapter;
22
- }
23
- });
24
- Object.defineProperty(exports, "PromotionEvaluator", {
25
- enumerable: true,
26
- get: function () {
27
- return _evaluator.PromotionEvaluator;
28
- }
29
- });
30
- Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
31
- enumerable: true,
32
- get: function () {
33
- return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
34
- }
35
- });
36
- Object.defineProperty(exports, "default", {
37
- enumerable: true,
38
- get: function () {
39
- return _adapter.default;
40
- }
41
- });
42
- var _evaluator = require("./evaluator");
43
- var _adapter = _interopRequireWildcard(require("./adapter"));
44
- var _examples = require("./examples");
45
- function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
46
- function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
1
+ "use strict";
@@ -28,8 +28,6 @@ export declare class WalletPassEvaluator {
28
28
  /** 检查代金券/折扣卡是否可用 并返回config */
29
29
  checkVoucherAvailability(input: EvaluatorInput): {
30
30
  isAvailable: boolean;
31
- reason: string | undefined;
32
- reasonCode: string | undefined;
33
31
  config: {
34
32
  [x: string]: any;
35
33
  };
@@ -256,8 +256,6 @@ class WalletPassEvaluator {
256
256
  const isAvailable = results[0]?.isApplicable || false;
257
257
  return {
258
258
  isAvailable,
259
- reason: results[0]?.reason,
260
- reasonCode: results[0]?.reasonCode,
261
259
  config: {
262
260
  ...results[0]?.strategyResult?.config?.metadata?.custom
263
261
  }