@pisell/pisellos 2.1.51 → 2.1.53

package/dist/modules/Discount/index.d.ts

@@ -21,6 +21,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
+        with_wallet_pass_holder: 0 | 1;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/dist/modules/Discount/index.js

@@ -188,7 +188,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 tags: ['good_pass', 'product_discount_card'],
                 available: 1,
                 relation_product: 1,
-                with: ['extensionData'],
+                with: ['extensionData', 'holder.detail'],
                 order_behavior_count: 1,
                 order_behavior_count_customer_id: customerId || 1
               });

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.d.ts

@@ -12,18 +12,25 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, }: {
+    private checkHolderMatch;
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, }: {
+    calcDiscount({ discountList, productList, holders, }: {
         discountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/dist/modules/Rules/index.js

@@ -29,6 +29,9 @@ import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils"
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
+
+// 临时变量
+var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -91,6 +94,25 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       return this.store.rulesList;
     }
 
+    // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
+  }, {
+    key: "checkHolderMatch",
+    value: function checkHolderMatch(discount, product, holders) {
+      var _discount$holder;
+      // 非表单类型 holder 视为匹配
+      if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
+      // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
+      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
+      var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+      // 商品不需要选holder，则不对比holder，直接返回true，
+      if (!product.isNeedHolder) return true;
+      // 商品需要holder，但父预约及商品都无holder，返回false
+      if (!orderHolderId && !productHolderId) return false;
+
+      // 最终直接匹配 holder 是否相同
+      return (productHolderId || orderHolderId) === discount.holder.holder_id;
+    }
+
     // 判断discountList 是否可以对当前productList生效
   }, {
     key: "isDiscountListAvailable",
@@ -98,7 +120,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this2 = this;
       var oldDiscountList = _ref.oldDiscountList,
         newDiscountList = _ref.newDiscountList,
-        productList = _ref.productList;
+        productList = _ref.productList,
+        holders = _ref.holders;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
         return {
@@ -128,7 +151,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
-        productList: _toConsumableArray(productList)
+        productList: _toConsumableArray(productList),
+        holders: holders
       }, {
         scan: true
       });
@@ -170,7 +194,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function calcDiscount(_ref2, options) {
       var _this3 = this;
       var discountList = _ref2.discountList,
-        productList = _ref2.productList;
+        productList = _ref2.productList,
+        holders = _ref2.holders;
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -408,10 +433,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         addModeDiscount.forEach(function (discount) {
           var _product, _product2, _product3, _product4, _flatItem$bundleItem;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
+          // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
+          var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
+          var isHolderMatch = _this3.checkHolderMatch(discount, {
+            isNeedHolder: _tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.isNeedHolder,
+            holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
+          }, holders);
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (((_product = product) === null || _product === void 0 ? void 0 : _product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
-          var isLimitedProduct = limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id);
+          var isLimitedProduct = (limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (discount) {
@@ -520,6 +551,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
+
+          // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
+          var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
+          var isHolderMatch = _this3.checkHolderMatch(discount, {
+            isNeedHolder: _tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.isNeedHolder,
+            holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
+          }, holders);
+          // 如果 holder 不匹配，则不适用
+          if (!isHolderMatch) return false;
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           if (!timeLimit) {
@@ -660,7 +700,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: []
               }))]);
             } else {
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
+                price: product.price,
+                main_product_selling_price: product.price
+              } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: product.origin_total || product.total,
                 price: product.price,
@@ -673,7 +716,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: [],
-              price: flatItem.bundleItem.original_price,
+              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
           }

package/dist/modules/Rules/types.d.ts

@@ -22,6 +22,9 @@ export interface RulesModuleAPI {
     calcDiscount: (params: {
         discountList: any[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }) => DiscountResult;
 }
 type ProductDetail = {
@@ -39,6 +42,7 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
+    holder_id?: number | string;
     vouchersApplicable?: boolean;
     startDate?: any;
 };

package/dist/solution/BookingByStep/utils/capacity.js

@@ -344,8 +344,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            var _time$event_list;
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute') && ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) === 0;
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
           });
           if (availableTimes.length > 0) {
             availableResourceCount++;

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

@@ -21,6 +21,9 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setHolders(holders: {
+        form_record_id: number;
+    }[]): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -51,6 +51,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList: [],
       discount: null,
       rules: null,
+      holders: [],
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: []
@@ -285,7 +286,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }() // 计算优惠券
+    }() // 设置holders
+  }, {
+    key: "setHolders",
+    value: function setHolders(holders) {
+      this.store.holders = holders;
+    }
+
+    // 计算优惠券
   }, {
     key: "calcDiscount",
     value: function calcDiscount(productList, options) {
@@ -299,7 +307,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       }
       var _ref = rulesModule.calcDiscount({
           productList: productList,
-          discountList: this.getDiscountList()
+          discountList: this.getDiscountList(),
+          holders: this.store.holders || []
         }, options) || {
           productList: productList,
           discountList: this.getDiscountList()
@@ -437,7 +446,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
-                newDiscountList: withScanList
+                newDiscountList: withScanList,
+                holders: this.store.holders || []
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -720,7 +730,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 customer_id: customerId,
                 action: 'create',
                 with_good_pass: 1,
-                with_discount_card: 1
+                with_discount_card: 1,
+                with_wallet_pass_holder: 1
               });
             case 4:
               goodPassList = _context9.sent;

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

@@ -23,6 +23,11 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    holders?: {
+        form_record_id: number;
+        form_id?: number;
+        main_field?: string;
+    }[];
     originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];

package/lib/modules/Discount/index.d.ts

@@ -21,6 +21,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
+        with_wallet_pass_holder: 0 | 1;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -109,7 +109,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       tags: ["good_pass", "product_discount_card"],
       available: 1,
       relation_product: 1,
-      with: ["extensionData"],
+      with: ["extensionData", "holder.detail"],
       order_behavior_count: 1,
       order_behavior_count_customer_id: customerId || 1
     });

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Rules/index.d.ts

@@ -12,18 +12,25 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, }: {
+    private checkHolderMatch;
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, }: {
+    calcDiscount({ discountList, productList, holders, }: {
         discountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/lib/modules/Rules/index.js

@@ -57,11 +57,25 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   getRulesList() {
     return this.store.rulesList;
   }
+  // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
+  checkHolderMatch(discount, product, holders) {
+    var _a;
+    if (((_a = discount.holder) == null ? void 0 : _a.holder_type) !== "form")
+      return true;
+    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : void 0;
+    const productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+    if (!product.isNeedHolder)
+      return true;
+    if (!orderHolderId && !productHolderId)
+      return false;
+    return (productHolderId || orderHolderId) === discount.holder.holder_id;
+  }
   // 判断discountList 是否可以对当前productList生效
   isDiscountListAvailable({
     oldDiscountList,
     newDiscountList,
-    productList
+    productList,
+    holders
   }) {
     if (!newDiscountList || newDiscountList.length === 0) {
       return {
@@ -88,7 +102,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     ]), "product_id");
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
-      productList: [...productList]
+      productList: [...productList],
+      holders
     }, {
       scan: true
     });
@@ -120,7 +135,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   calcDiscount({
     discountList,
-    productList
+    productList,
+    holders
   }, options) {
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
@@ -271,9 +287,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       addModeDiscount.forEach((discount) => {
         var _a, _b, _c, _d, _e, _f;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
+        const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
+        const isHolderMatch = this.checkHolderMatch(
+          discount,
+          {
+            isNeedHolder: _tempVar == null ? void 0 : _tempVar.isNeedHolder,
+            holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
+          },
+          holders
+        );
         let timeLimit = true;
         timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
-        const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
+        const isLimitedProduct = (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
         const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
         if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
@@ -353,6 +378,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
+        const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
+        const isHolderMatch = this.checkHolderMatch(
+          discount,
+          {
+            isNeedHolder: _tempVar == null ? void 0 : _tempVar.isNeedHolder,
+            holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
+          },
+          holders
+        );
+        if (!isHolderMatch)
+          return false;
         let timeLimit = true;
         timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
         if (!timeLimit) {
@@ -467,7 +503,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             processedProductsMap.set(
               product._id,
               [this.hooks.setProduct(originProduct, {
-                ...isManualDiscount ? {} : {
+                ...isManualDiscount ? {
+                  price: product.price,
+                  main_product_selling_price: product.price
+                } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total: product.origin_total || product.total,
                   price: product.price,
@@ -481,7 +520,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
             discount_list: [],
-            price: flatItem.bundleItem.original_price,
+            price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
         }

package/lib/modules/Rules/types.d.ts

@@ -22,6 +22,9 @@ export interface RulesModuleAPI {
     calcDiscount: (params: {
         discountList: any[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }) => DiscountResult;
 }
 type ProductDetail = {
@@ -39,6 +42,7 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
+    holder_id?: number | string;
     vouchersApplicable?: boolean;
     startDate?: any;
 };

package/lib/solution/BookingByStep/utils/capacity.js

@@ -249,8 +249,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       let availableResourceCount = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          var _a2;
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && ((_a2 = time.event_list) == null ? void 0 : _a2.length) === 0;
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           availableResourceCount++;

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

@@ -21,6 +21,9 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setHolders(holders: {
+        form_record_id: number;
+    }[]): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -51,6 +51,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       productList: [],
       discount: null,
       rules: null,
+      holders: [],
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: []
@@ -191,6 +192,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
+  // 设置holders
+  setHolders(holders) {
+    this.store.holders = holders;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
     this.store.productList = productList;
@@ -201,7 +206,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     let { productList: newProductList, discountList: newDiscountList } = rulesModule.calcDiscount(
       {
         productList,
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        holders: this.store.holders || []
       },
       options
     ) || { productList, discountList: this.getDiscountList() };
@@ -290,7 +296,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       } = rulesModule.isDiscountListAvailable({
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
-        newDiscountList: withScanList
+        newDiscountList: withScanList,
+        holders: this.store.holders || []
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -475,7 +482,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         customer_id: customerId,
         action: "create",
         with_good_pass: 1,
-        with_discount_card: 1
+        with_discount_card: 1,
+        with_wallet_pass_holder: 1
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

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

@@ -23,6 +23,11 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    holders?: {
+        form_record_id: number;
+        form_id?: number;
+        main_field?: string;
+    }[];
     originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.51",
+  "version": "2.1.53",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",