@pisell/pisellos 2.1.172 → 2.1.174

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: [],
@@ -57,13 +61,28 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       currentBookingTime: "",
       filteredDiscountList: [],
       bookingSubject: undefined,
-      orderTotalAmount: 0
+      orderId: undefined
     };
     return _this;
   }
 
   // =========== 生命周期方法 ===========
   _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();
           }
@@ -289,14 +317,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }()
-  }, {
-    key: "setOriginTotalAmount",
-    value: function setOriginTotalAmount(amount) {
-      this.store.orderTotalAmount = amount;
-    }
-
-    // 设置holders
+    }() // 设置holders
   }, {
     key: "setHolders",
     value: function setHolders(holders) {
@@ -307,6 +328,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setBookingSubject(bookingSubject) {
       this.store.bookingSubject = bookingSubject;
     }
+  }, {
+    key: "setOrderId",
+    value: function setOrderId(id) {
+      this.store.orderId = id;
+    }
 
     // 计算优惠券
   }, {
@@ -324,7 +350,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref = rulesModule.calcDiscount({
           productList: productList,
           discountList: this.getDiscountList(),
-          orderTotalAmount: this.store.orderTotalAmount || 0,
           holders: this.store.holders || [],
           isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
@@ -333,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);
       }
@@ -397,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) {
@@ -437,25 +463,33 @@ 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, resultDiscountList, 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, customerId);
+              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,
+                withEntitlementPass: this.entitlementPassEnabled
+              });
             case 3:
               _context6.t0 = _context6.sent;
               if (_context6.t0) {
                 _context6.next = 6;
                 break;
               }
-              _context6.t0 = [];
+              _context6.t0 = {
+                discountList: [],
+                unavailableReasonKey: null
+              };
             case 6:
-              resultDiscountList = _context6.t0;
+              resultDiscountWithReason = _context6.t0;
+              resultDiscountList = resultDiscountWithReason.discountList, unavailableReasonKey = resultDiscountWithReason.unavailableReasonKey;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context6.next = 10;
+                _context6.next = 11;
                 break;
               }
               return _context6.abrupt("return", {
@@ -465,18 +499,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 10:
+            case 11:
               if (resultDiscountList.length) {
-                _context6.next = 12;
+                _context6.next = 13;
                 break;
               }
               return _context6.abrupt("return", {
                 type: "server",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                unavailableReasonKey: unavailableReasonKey
               });
-            case 12:
+            case 13:
               withScanList = resultDiscountList.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
@@ -485,12 +520,12 @@ 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;
                 });
               }))) {
-                _context6.next = 16;
+                _context6.next = 17;
                 break;
               }
               return _context6.abrupt("return", {
@@ -499,42 +534,69 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 16:
+            case 17:
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
-                orderTotalAmount: this.store.orderTotalAmount || 0,
                 holders: this.store.holders || [],
                 isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
                 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 = 24;
+                _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 = 24;
+                _context6.next = 27;
                 break;
               }
-              _context6.next = 24;
+              _context6.next = 27;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 24:
+            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 27:
-              _context6.prev = 27;
+            case 35:
+              _context6.prev = 35;
               _context6.t1 = _context6["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context6.t1);
               return _context6.abrupt("return", {
@@ -544,11 +606,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 31:
+            case 39:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 27]]);
+        }, _callee6, this, [[0, 35]]);
       }));
       function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);
@@ -558,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);
     }
 
     // =========== 私有辅助方法 ===========
@@ -604,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) {
@@ -618,27 +681,21 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
-                var _editModeDiscountList, _discount$metadata, _discount$metadata2;
+                var _discount$metadata;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
-                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
-                    num: ((editModeDiscountList === null || editModeDiscountList === void 0 || (_editModeDiscountList = editModeDiscountList[index]) === null || _editModeDiscountList === void 0 || (_editModeDiscountList = _editModeDiscountList.metadata) === null || _editModeDiscountList === void 0 ? void 0 : _editModeDiscountList.num) || 1) + (((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || 1)
-                  }),
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$metadata3, _discount$metadata4, _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
-                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
-                    num: ((_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.num) || 1
-                  }),
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.product_discount_difference) || 0).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
@@ -651,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;
@@ -693,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;
     }
@@ -702,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()) || [];
     }
 
     // 获取客户钱包信息
@@ -711,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:
@@ -723,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);
@@ -785,65 +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, 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 = 4;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig({
+              _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: 'create',
+                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
-              });
-            case 4:
+              }, orderId ? {
+                order_id: orderId
+              } : {}));
+            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 = 12;
-              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 12:
+              _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 = 19;
+                _context10.next = 22;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 19;
+              _context10.next = 22;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 19:
-              _context10.next = 21;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
-            case 21:
-              _context10.next = 26;
+            case 22:
+              _context10.next = 24;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+            case 24:
+              _context10.next = 29;
               break;
-            case 23:
-              _context10.prev = 23;
+            case 26:
+              _context10.prev = 26;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 26:
+            case 29:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 23]]);
+        }, _callee10, this, [[0, 26]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -23,7 +23,6 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
-    orderTotalAmount?: number;
     holders?: {
         form_record_id: number;
         form_id?: number;
@@ -36,6 +35,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/dist/solution/ShopDiscount/types.js

@@ -8,5 +8,4 @@ export var ShopDiscountHooks = /*#__PURE__*/function (ShopDiscountHooks) {
   ShopDiscountHooks["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";
   return ShopDiscountHooks;
-}({});
-;
+}({});

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;