@pisell/pisellos 2.1.173 → 2.1.174

package/dist/solution/BookingByStep/types.d.ts

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
@@ -23,6 +23,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'scanOrderLogger':
       return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'holder':
+      return new HolderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

package/dist/solution/ScanOrder/index.js

@@ -857,7 +857,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var tempOrder = this.store.order.ensureTempOrder();
         tempOrder.metadata = _objectSpread(_objectSpread({}, tempOrder.metadata || {}), {}, {
           shop_service_data: _objectSpread(_objectSpread({}, (tempOrder.metadata || {}).shop_service_data || {}), {}, {
-            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : 'take_away',
+            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : '',
             pickup_reference_mode: mode
           })
         });

package/dist/solution/ScanOrder/types.d.ts

@@ -34,6 +34,7 @@ export interface ScanOrderOrderProductIdentity {
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
     product_option_item?: any[];
     product_bundle?: any[];
+    shop_id?: number | string;
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;

package/dist/solution/ShopDiscount/index.d.ts

@@ -12,6 +12,8 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private store;
     private options;
     private hooks?;
+    private entitlementPassEnabled;
+    setEntitlementPassEnabled(enabled: boolean): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     destroy(): Promise<void>;
@@ -42,6 +44,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";

package/dist/solution/ShopDiscount/index.js

@@ -31,6 +31,9 @@ import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, is
 import { UnavailableReason } from "../../modules/Rules/types";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
+import { isEntitlementPass } from "../../modules/Discount/entitlementPass";
+import { getDiscountLifecycleReason } from "../../modules/Discount/availability";
+import { mergeEntitlementDiscountLists, retainScannedEntitlements, withCommittedEntitlementDetails } from "../../modules/Discount/entitlementState";
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -47,6 +50,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "options", {});
     _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
+    _defineProperty(_assertThisInitialized(_this), "entitlementPassEnabled", false);
     _this.store = {
       customer: null,
       productList: [],
@@ -64,6 +68,21 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
   // =========== 生命周期方法 ===========
   _createClass(ShopDiscountImpl, [{
+    key: "setEntitlementPassEnabled",
+    value:
+    // 由使用多次卡的预约组件显式开启，其他入口沿用原券流程。
+    function setEntitlementPassEnabled(enabled) {
+      var _this$store$rules;
+      this.entitlementPassEnabled = enabled;
+      (_this$store$rules = this.store.rules) === null || _this$store$rules === void 0 || _this$store$rules.setEntitlementPassEnabled(enabled);
+      if (!enabled) {
+        var _this$store$discount;
+        (_this$store$discount = this.store.discount) === null || _this$store$discount === void 0 || _this$store$discount.setDiscountList(this.getDiscountList().filter(function (item) {
+          return !isEntitlementPass(item);
+        }));
+      }
+    }
+  }, {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
@@ -100,14 +119,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "destroy",
     value: function () {
       var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$store$discount, _this$store$rules;
+        var _this$store$discount2, _this$store$rules2;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.store.productList = [];
               this.store.customer = null;
-              (_this$store$discount = this.store.discount) === null || _this$store$discount === void 0 || _this$store$discount.destroy();
-              (_this$store$rules = this.store.rules) === null || _this$store$rules === void 0 || _this$store$rules.destroy();
+              (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 || _this$store$discount2.destroy();
+              (_this$store$rules2 = this.store.rules) === null || _this$store$rules2 === void 0 || _this$store$rules2.destroy();
               this.core.effects.offByModuleDestroy(this.name);
               _context2.next = 7;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
@@ -128,14 +147,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "clear",
     value: function () {
       var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$store$discount2, _this$store$rules2;
+        var _this$store$discount3, _this$store$rules3;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.store.productList = [];
               this.store.customer = null;
-              (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 || _this$store$discount2.clear();
-              (_this$store$rules2 = this.store.rules) === null || _this$store$rules2 === void 0 || _this$store$rules2.clear();
+              (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 || _this$store$discount3.clear();
+              (_this$store$rules3 = this.store.rules) === null || _this$store$rules3 === void 0 || _this$store$rules3.clear();
               console.log('[ShopDiscount] clear');
             case 5:
             case "end":
@@ -200,9 +219,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var _this2 = this;
       this.core.effects.only("".concat(this.name, ":onCustomerChange"), function (customer) {
         var _this2$options$otherP;
-        if ((_this2$options$otherP = _this2.options.otherParams) !== null && _this2$options$otherP !== void 0 && _this2$options$otherP.cacheId && _this2.getDiscountList().length) {
-          return;
-        }
+        if (!_this2.entitlementPassEnabled && (_this2$options$otherP = _this2.options.otherParams) !== null && _this2$options$otherP !== void 0 && _this2$options$otherP.cacheId && _this2.getDiscountList().length) return;
         _this2.loadPrepareConfig({
           customerId: customer.id,
           action: 'create',
@@ -269,17 +286,28 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setCustomer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(customer) {
         var _this$store$customer;
+        var _this$store$discount4, retained;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!(((_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 ? void 0 : _this$store$customer.id) !== customer.id)) {
-                _context4.next = 4;
+                _context4.next = 8;
                 break;
               }
               this.store.customer = customer;
-              _context4.next = 4;
+              if (!this.entitlementPassEnabled) {
+                _context4.next = 6;
+                break;
+              }
+              retained = this.getDiscountList().filter(function (item) {
+                return !isEntitlementPass(item) || item.isEditMode || item.isScan && String(item.customer_id) === String(customer.id);
+              });
+              _context4.next = 6;
+              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(retained);
+            case 6:
+              _context4.next = 8;
               return this.core.effects.emit("".concat(this.name, ":onCustomerChange"), customer);
-            case 4:
+            case 8:
             case "end":
               return _context4.stop();
           }
@@ -330,6 +358,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         },
         newProductList = _ref.productList,
         newDiscountList = _ref.discountList;
+      if (this.entitlementPassEnabled) this.store.productList = newProductList || productList;
       if (newDiscountList) {
         newDiscountList = this.setDiscountList(newDiscountList);
       }
@@ -394,13 +423,13 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "batchSearchByProductIds",
     value: function () {
       var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(productIds) {
-        var _this$store$discount3;
+        var _this$store$discount5;
         var resultDiscountList, currentDiscountList, newDiscountList;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearchByProductIds(productIds);
+              return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.batchSearchByProductIds(productIds);
             case 2:
               _context5.t0 = _context5.sent;
               if (_context5.t0) {
@@ -434,15 +463,16 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
-        var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+        var _this$store$discount6, _this$store$bookingSu2, _find, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, evaluatedDiscountList, isAvailable, unavailableReason, isAccepted, _this$options$otherPa6, ids, retainable, _this$store$discount7;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.prev = 0;
               _context6.next = 3;
-              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, {
+              return (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.batchSearch(code, {
                 customerId: customerId,
-                orderId: this.store.orderId
+                orderId: this.store.orderId,
+                withEntitlementPass: this.entitlementPassEnabled
               });
             case 3:
               _context6.t0 = _context6.sent;
@@ -490,7 +520,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               currentSelectedDiscountList = this.getDiscountList().filter(function (n) {
                 return n.isSelected;
               });
-              if (!(currentSelectedDiscountList.length && currentSelectedDiscountList.some(function (n) {
+              if (!(!withScanList.some(isEntitlementPass) && currentSelectedDiscountList.length && currentSelectedDiscountList.some(function (n) {
                 return withScanList.some(function (m) {
                   return m.id === n.id;
                 });
@@ -515,30 +545,58 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
-              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
+              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, evaluatedDiscountList = _ref2.evaluatedDiscountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
+              isAccepted = isAvailable;
               if (!isAvailable) {
-                _context6.next = 25;
+                _context6.next = 27;
                 break;
               }
+              if (this.entitlementPassEnabled) this.setProductList(newProductList || []);
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
-              this.setProductList(newProductList || []);
+              if (!this.entitlementPassEnabled) this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context6.next = 25;
+                _context6.next = 27;
                 break;
               }
-              _context6.next = 25;
+              _context6.next = 27;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 25:
+            case 27:
+              if (!isAvailable) {
+                ids = new Set(withScanList.map(function (item) {
+                  return String(item.id);
+                }));
+                retainable = (evaluatedDiscountList || []).filter(function (item) {
+                  return ids.has(String(item.id)) && isEntitlementPass(item) && !getDiscountLifecycleReason(item);
+                });
+                if (retainable.length) {
+                  this.setDiscountList(retainScannedEntitlements(this.getDiscountList(), retainable));
+                  isAccepted = true;
+                }
+              }
+              if (!this.entitlementPassEnabled) {
+                _context6.next = 32;
+                break;
+              }
+              this.store.originalDiscountList = this.getDiscountList();
+              _context6.next = 32;
+              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.setOriginalDiscountList(this.getDiscountList());
+            case 32:
               return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
-                productList: newProductList || this.store.productList || [],
-                discountList: newDiscountList || this.getDiscountList(),
-                unavailableReason: unavailableReason
+                isAccepted: isAccepted,
+                productList: isAvailable ? newProductList : this.store.productList || [],
+                discountList: this.getDiscountList(),
+                unavailableReason: unavailableReason,
+                unavailableReasonKey: ((_find = (evaluatedDiscountList || []).find(function (item) {
+                  return withScanList.some(function (scanned) {
+                    return String(scanned.id) === String(item.id);
+                  }) && item.reasonCode;
+                })) === null || _find === void 0 ? void 0 : _find.reasonCode) || unavailableReasonKey
               });
-            case 28:
-              _context6.prev = 28;
+            case 35:
+              _context6.prev = 35;
               _context6.t1 = _context6["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context6.t1);
               return _context6.abrupt("return", {
@@ -548,11 +606,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 32:
+            case 39:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 28]]);
+        }, _callee6, this, [[0, 35]]);
       }));
       function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);
@@ -562,8 +620,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscountApplicableProductTotalPrice",
     value: function calcDiscountApplicableProductTotalPrice(discount) {
-      var _this$store$discount5;
-      return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.calcDiscountApplicableProductTotalPrice(discount);
+      var _this$store$discount8;
+      return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.calcDiscountApplicableProductTotalPrice(discount);
     }
 
     // =========== 私有辅助方法 ===========
@@ -608,7 +666,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
       var _this3 = this,
-        _this$store$discount6;
+        _this$hooks,
+        _this$store$discount9;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
@@ -649,8 +708,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }
       });
-      var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
-        return !item.isDisabled;
+      var newDiscountList = this.entitlementPassEnabled ? withCommittedEntitlementDetails([].concat(_toConsumableArray(editModeDiscountList.filter(function (item) {
+        return !isEntitlementPass(item);
+      })), _toConsumableArray(discountList.filter(function (item) {
+        return isEntitlementPass(item) || !item.isDisabled;
+      }))), productList, ((_this$hooks = this.hooks) === null || _this$hooks === void 0 ? void 0 : _this$hooks.getProduct) || function (item) {
+        return item;
+      }) : [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
+        return !item.isDisabled && !isEntitlementPass(item);
       })));
       var isProductFree = function isProductFree(id) {
         var _this3$hooks2;
@@ -691,7 +756,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           item.isDisabledForProductUsed = false;
         }
       });
-      (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
+      (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 || _this$store$discount9.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
     }
@@ -700,8 +765,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDiscountList",
     value: function getDiscountList() {
-      var _this$store$discount7;
-      return ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
+      var _this$store$discount10;
+      return ((_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.getDiscountList()) || [];
     }
 
     // 获取客户钱包信息
@@ -709,7 +774,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCustomerWallet",
     value: function () {
       var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
-        var _result, customer;
+        var _result, customer, customerUpdate;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -721,25 +786,32 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             case 3:
               _result = _context8.sent;
               if (!(_result !== null && _result !== void 0 && _result.data)) {
-                _context8.next = 9;
+                _context8.next = 12;
                 break;
               }
               customer = Object.assign({}, (_objectDestructuringEmpty(_result.data), _result.data));
-              this.setCustomer(customer);
-              _context8.next = 9;
+              customerUpdate = this.setCustomer(customer);
+              if (!this.entitlementPassEnabled) {
+                _context8.next = 10;
+                break;
+              }
+              _context8.next = 10;
+              return customerUpdate;
+            case 10:
+              _context8.next = 12;
               return this.core.effects.emit("".concat(this.name, ":onScanCustomerChange"), customer);
-            case 9:
-              _context8.next = 14;
+            case 12:
+              _context8.next = 17;
               break;
-            case 11:
-              _context8.prev = 11;
+            case 14:
+              _context8.prev = 14;
               _context8.t0 = _context8["catch"](0);
               console.error('[ShopDiscount] 获取客户钱包信息出错:', _context8.t0);
-            case 14:
+            case 17:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 11]]);
+        }, _callee8, this, [[0, 14]]);
       }));
       function getCustomerWallet(_x8) {
         return _getCustomerWallet.apply(this, arguments);
@@ -783,68 +855,79 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this4 = this;
+        var _this$getCustomer2, _this$store$discount11, _this$getCustomer3, _this$store$discount12, _this$store$discount13, _this$store$productLi2, entitlementPassEnabled, orderId, customerId, goodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _context10.prev = 0;
+              entitlementPassEnabled = this.entitlementPassEnabled;
               orderId = this.store.orderId;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context10.next = 5;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
+              _context10.next = 6;
+              return (_this$store$discount11 = this.store.discount) === null || _this$store$discount11 === void 0 ? void 0 : _this$store$discount11.loadPrepareConfig(_objectSpread(_objectSpread({
                 customer_id: customerId,
                 action: orderId ? 'edit' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
-                with_wallet_pass_holder: 1,
+                with_wallet_pass_holder: 1
+              }, this.entitlementPassEnabled ? {
+                with_entitlement_pass: 1,
+                filter_order_wallet_pass_usage: 0
+              } : {}), {}, {
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
               } : {}));
-            case 5:
+            case 6:
               goodPassList = _context10.sent;
-              scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
-                return item.isScan;
-              }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
-              scanDiscountIds = scanDiscount.map(function (n) {
-                return n.id;
-              });
-              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
-                return !scanDiscountIds.includes(n.id);
-              });
-              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
+              if (!(entitlementPassEnabled !== this.entitlementPassEnabled)) {
+                _context10.next = 9;
+                break;
+              }
+              return _context10.abrupt("return");
+            case 9:
+              if (!(entitlementPassEnabled && (String(customerId) !== String((_this$getCustomer3 = this.getCustomer()) === null || _this$getCustomer3 === void 0 ? void 0 : _this$getCustomer3.id) || String(orderId) !== String(this.store.orderId)))) {
+                _context10.next = 11;
+                break;
+              }
+              return _context10.abrupt("return");
+            case 11:
+              newDiscountList = mergeEntitlementDiscountLists(this.getDiscountList(), goodPassList || [], (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 ? void 0 : _this$store$discount12.getOriginalDiscountList()); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 13;
-              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 13:
+              _context10.next = 15;
+              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setOriginalDiscountList(newDiscountList);
+            case 15:
               // 根据当前预约时间过滤优惠券列表
-              filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+              filteredDiscountList = newDiscountList.filter(function (item) {
+                return isEntitlementPass(item) || _this4.filterDiscountListByBookingTime([item], _this4.store.currentBookingTime).length > 0;
+              });
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context10.next = 20;
+                _context10.next = 22;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 20;
-              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 20:
               _context10.next = 22;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 22:
-              _context10.next = 27;
-              break;
+              _context10.next = 24;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
             case 24:
-              _context10.prev = 24;
+              _context10.next = 29;
+              break;
+            case 26:
+              _context10.prev = 26;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 27:
+            case 29:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 24]]);
+        }, _callee10, this, [[0, 26]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/ShopDiscount/utils.d.ts

@@ -89,3 +89,4 @@ export declare const calculateOrderLevelDiscountAllocation: (discount: Discount,
     discountAmount: number;
     difference: number;
 }>;
+export declare const getDiscountTimeUnavailableReason: (discount: Discount, useTime: string) => 'not_started' | 'time_limit' | 'outside_schedule' | undefined;

package/dist/solution/ShopDiscount/utils.js

@@ -9,6 +9,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 import Decimal from "decimal.js";
 import dayjs from "dayjs";
+import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
+import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
+import { isEntitlementPass, isFullCoveragePass } from "../../modules/Discount/entitlementPass";
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
 export var uniqueById = function uniqueById(arr) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
@@ -42,7 +47,7 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
   var _discount$metadata;
   // 商品券
-  if (discount.tag === 'good_pass') {
+  if (isFullCoveragePass(discount)) {
     return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 
@@ -450,6 +455,7 @@ export var filterDiscountListByBookingTime = function filterDiscountListByBookin
   }
   return discountList.filter(function (discount) {
     var _discount$metadata2;
+    if (isEntitlementPass(discount)) return !getDiscountTimeUnavailableReason(discount, bookingTime);
     if ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.validity_type) === "custom_schedule_validity") {
       var _discount$custom_sche;
       return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
@@ -596,4 +602,37 @@ export var calculateOrderLevelDiscountAllocation = function calculateOrderLevelD
     }
   }
   return result;
+};
+export var getDiscountTimeUnavailableReason = function getDiscountTimeUnavailableReason(discount, useTime) {
+  var useTimeDayjs = dayjs(useTime);
+  if (!useTimeDayjs.isValid()) return 'time_limit';
+  try {
+    var _discount$metadata5, _discount$extension_d, _discount$custom_sche3;
+    if ((discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.validity_type) === "custom_schedule_validity") {
+      var _discount$custom_sche2;
+      return getDateIsInSchedule(useTime, ((_discount$custom_sche2 = discount.custom_schedule_snapshot) === null || _discount$custom_sche2 === void 0 ? void 0 : _discount$custom_sche2.data) || []) ? undefined : 'outside_schedule';
+    }
+    var isHasStart = !!discount.start_date && !!discount.start_time;
+    var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
+
+    // 开始时刻包含在有效期内。
+    if (isHasStart) {
+      if (!startDate.isValid()) return 'time_limit';
+      if (useTimeDayjs.isBefore(startDate)) return 'not_started';
+    }
+
+    // 到期时刻不再可用；expire_time 为空时为长期有效。
+    var expireTime = discount.expire_time ? dayjs(discount.expire_time) : null;
+    var isBeforeExpire = expireTime ? expireTime.isValid() && useTimeDayjs.isBefore(expireTime) : true;
+    if (!isBeforeExpire) return 'time_limit';
+    var validity = (_discount$extension_d = discount.extension_data) === null || _discount$extension_d === void 0 || (_discount$extension_d = _discount$extension_d.find(function (field) {
+      return field.field_key === 'valid_times';
+    })) === null || _discount$extension_d === void 0 ? void 0 : _discount$extension_d.value;
+    if ((validity === null || validity === void 0 ? void 0 : validity.restrict_use_by_schedule) === true && !getDateIsInSchedule(useTime, ((_discount$custom_sche3 = discount.custom_schedule_snapshot) === null || _discount$custom_sche3 === void 0 ? void 0 : _discount$custom_sche3.data) || [])) {
+      return 'outside_schedule';
+    }
+    return undefined;
+  } catch (error) {
+    return 'time_limit';
+  }
 };