@pisell/pisellos 1.0.5 → 1.0.7

package/dist/solution/BookingByStep/utils/capacity.d.ts

@@ -0,0 +1,47 @@
+import { CartItem } from "../../../modules";
+import { CapacityItem, ResourceItem } from "./resources";
+/**
+ * @title: 基于选择的商品格式化容量
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any) => CapacityItem[];
+/**
+ * @title: 获取总容量
+ * @description:
+ * @param {object} capacity 为 formatDefaultCapacitys()的结果
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const getSumCapacity: ({ capacity }: {
+    capacity: CapacityItem[];
+}) => number;
+/**
+ * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity
+ *
+ * @export
+ * @param {CartItem} targetCartItem
+ * @return {*}
+ */
+export declare function getCapacityInfoByCartItem(targetCartItem: CartItem): {
+    formatCapacity: CapacityItem[];
+    currentCapacity: number;
+};
+/**
+ * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
+ * @description:
+ * @param {object} resource
+ * @return {*}
+ * @Author: jinglin.tan
+ */
+export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+/**
+ * 检查资源是否有足够的容量供额外使用
+ * @param currentCapacity - 当前已使用的容量
+ * @param requiredCapacity - 需要的额外容量
+ * @param maxCapacity - 最大允许容量
+ * @returns 如果资源可以容纳额外的容量则返回 true
+ */
+export declare const checkResourceCanUseByCapacity: (currentCapacity: number, requiredCapacity: number, maxCapacity: number) => boolean;

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

@@ -0,0 +1,132 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
+/**
+ * @title: 基于选择的商品格式化容量
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
+  var capacity = _ref.capacity,
+    product_bundle = _ref.product_bundle;
+  if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
+    return (product_bundle || []).map(function (d) {
+      var id = d.bundle_product_id;
+      var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
+        return item.product_id === id;
+      });
+      return {
+        id: id,
+        value: item ? d.num || 0 : 0,
+        name: (item === null || item === void 0 ? void 0 : item.name) || (d === null || d === void 0 ? void 0 : d.title)
+      };
+    });
+  }
+  if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'custom') {
+    return ((capacity === null || capacity === void 0 ? void 0 : capacity.custom) || []).map(function (d) {
+      return {
+        id: d.id,
+        value: d.min,
+        name: d.name
+      };
+    });
+  }
+
+  // 默认为1
+  return [{
+    id: 0,
+    value: 1,
+    name: ''
+  }];
+};
+
+/**
+ * @title: 获取总容量
+ * @description:
+ * @param {object} capacity 为 formatDefaultCapacitys()的结果
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export var getSumCapacity = function getSumCapacity(_ref2) {
+  var capacity = _ref2.capacity;
+  var sum = 0;
+  var _iterator = _createForOfIteratorHelper(capacity || []),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      sum += item.value;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return sum;
+};
+
+/**
+ * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity
+ *
+ * @export
+ * @param {CartItem} targetCartItem
+ * @return {*} 
+ */
+export function getCapacityInfoByCartItem(targetCartItem) {
+  var _targetCartItem$_prod;
+  var formatCapacity = formatDefaultCapacitys({
+    capacity: (_targetCartItem$_prod = targetCartItem._productOrigin) === null || _targetCartItem$_prod === void 0 ? void 0 : _targetCartItem$_prod.capacity,
+    product_bundle: targetCartItem._origin.product.product_bundle
+  });
+  var currentCapacity = getSumCapacity({
+    capacity: formatCapacity
+  });
+  return {
+    formatCapacity: formatCapacity,
+    currentCapacity: currentCapacity
+  };
+}
+
+/**
+ * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
+ * @description:
+ * @param {object} resource
+ * @return {*}
+ * @Author: jinglin.tan
+ */
+export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resource) {
+  if (resource.children && resource.children.length) {
+    var countCapacity = resource.capacity; // 100
+    resource.children.forEach(function (child, index) {
+      if (index === resource.children.length - 1) {
+        // 如果是最后一个资源，直接拿剩余未分配完的容量去占用
+        // 哪怕这个东西会超过资源本身的 capacity也得让他占，PRD 里有写
+        child.capacity = countCapacity;
+        return;
+      }
+      if (child.capacity <= countCapacity) {
+        countCapacity -= child.capacity; // 100 -  = 90
+      } else {
+        child.capacity = countCapacity; // 10
+        countCapacity = 0; // 0
+      }
+    });
+  }
+};
+
+/**
+ * 检查资源是否有足够的容量供额外使用
+ * @param currentCapacity - 当前已使用的容量
+ * @param requiredCapacity - 需要的额外容量
+ * @param maxCapacity - 最大允许容量
+ * @returns 如果资源可以容纳额外的容量则返回 true
+ */
+export var checkResourceCanUseByCapacity = function checkResourceCanUseByCapacity(currentCapacity, requiredCapacity, maxCapacity) {
+  // Handle edge cases early
+  if (currentCapacity < 0 || requiredCapacity < 0 || maxCapacity <= 0) {
+    return false;
+  }
+  return currentCapacity + requiredCapacity <= maxCapacity;
+};

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -97,7 +97,10 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
         } | undefined;
     } | undefined;
     hasFlexibleDuration?: boolean | undefined;
-    operating_day_boundary?: string | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -135,7 +138,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -154,7 +157,10 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
         } | undefined;
     } | undefined;
     hasFlexibleDuration?: boolean | undefined;
-    operating_day_boundary?: string | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源
@@ -174,37 +180,11 @@ export declare const getOthersSelectedResources: (cartItems: CartItem[], account
  * @Author: jinglin.tan
  */
 export declare const getOthersCartSelectedResources: (cartItems: CartItem[], cartItemId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
-interface CapacityItem {
+export interface CapacityItem {
     id: number;
     value: number;
     name: string;
 }
-/**
- * @title: 基于选择的商品格式化容量
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any) => CapacityItem[];
-/**
- * @title: 获取总容量
- * @description:
- * @param {object} capacity 为 formatDefaultCapacitys()的结果
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const getSumCapacity: ({ capacity }: {
-    capacity: CapacityItem[];
-}) => number;
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
 /**
  * @title: 根据日期范围过滤日程
  *
@@ -242,4 +222,22 @@ export declare function getResourcesIdsByProduct(product: ProductData): number[]
  * @return {*}
  */
 export declare function sortCombinedResources(resourcesList: ResourceItem[]): ResourceItem[];
+/**
+ * 传入一个资源组，根据 formid筛出相同类型的资源
+ *
+ * @export
+ * @param {ResourceItem[]} resources
+ * @param {string} form_id
+ * @return {*}
+ */
+export declare function filterResourcesByFormItem(resources: ResourceItem[], form_id: string): ResourceItem[];
+/**
+ * 传入两个资源，确认这两个资源是否有交集（包括组合资源）
+ *
+ * @export
+ * @param {ResourceItem} resource1
+ * @param {ResourceItem} resource2
+ * @return {*}
+ */
+export declare function checkTwoResourcesIntersection(resource1: ResourceItem, resource2: ResourceItem): true | undefined;
 export {};

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

@@ -463,7 +463,8 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
       }
       if (_status.usable) {
         // 如果有hasFlexibleDuration，且timeSlice.start_at 大于等于operating_day_boundary，则不添加时间切片
-        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= operating_day_boundary) {
+        var operatingBoundaryDateTime = (operating_day_boundary === null || operating_day_boundary === void 0 ? void 0 : operating_day_boundary.type) === 'start_time' ? '23:59' : operating_day_boundary === null || operating_day_boundary === void 0 ? void 0 : operating_day_boundary.time;
+        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= (operatingBoundaryDateTime || '23:59')) {
           break;
         }
         // 添加时间切片  09:00 ~ 10:00   09:20 ~ 10:20   09:00 ~ 10:00   09:20 ~ 10:20  11:00 ~ 12:00   11:20 ~ 12:20
@@ -701,99 +702,6 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
     return acc;
   }, []);
 };
-/**
- * @title: 基于选择的商品格式化容量
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref7) {
-  var capacity = _ref7.capacity,
-    product_bundle = _ref7.product_bundle;
-  if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
-    return (product_bundle || []).map(function (d) {
-      var id = d.bundle_product_id;
-      var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id;
-      });
-      return {
-        id: id,
-        value: item ? d.num || 0 : 0,
-        name: (item === null || item === void 0 ? void 0 : item.name) || (d === null || d === void 0 ? void 0 : d.title)
-      };
-    });
-  }
-  if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'custom') {
-    return ((capacity === null || capacity === void 0 ? void 0 : capacity.custom) || []).map(function (d) {
-      return {
-        id: d.id,
-        value: d.min,
-        name: d.name
-      };
-    });
-  }
-
-  // 默认为1
-  return [{
-    id: 0,
-    value: 1,
-    name: ''
-  }];
-};
-
-/**
- * @title: 获取总容量
- * @description:
- * @param {object} capacity 为 formatDefaultCapacitys()的结果
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export var getSumCapacity = function getSumCapacity(_ref8) {
-  var capacity = _ref8.capacity;
-  var sum = 0;
-  var _iterator2 = _createForOfIteratorHelper(capacity || []),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var item = _step2.value;
-      sum += item.value;
-    }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
-  return sum;
-};
-
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resource) {
-  if (resource.children && resource.children.length) {
-    var countCapacity = resource.capacity; // 100
-    resource.children.forEach(function (child, index) {
-      if (index === resource.children.length - 1) {
-        // 如果是最后一个资源，直接拿剩余未分配完的容量去占用
-        // 哪怕这个东西会超过资源本身的 capacity也得让他占，PRD 里有写
-        child.capacity = countCapacity;
-        return;
-      }
-      if (child.capacity <= countCapacity) {
-        countCapacity -= child.capacity; // 100 -  = 90
-      } else {
-        child.capacity = countCapacity; // 10
-        countCapacity = 0; // 0
-      }
-    });
-  }
-};
-
 /**
  * @title: 根据日期范围过滤日程
  *
@@ -891,4 +799,41 @@ export function sortCombinedResources(resourcesList) {
     return aIsCombined === bIsCombined ? 0 : aIsCombined ? 1 : -1;
   });
   return newResourcesList;
+}
+
+/**
+ * 传入一个资源组，根据 formid筛出相同类型的资源
+ *
+ * @export
+ * @param {ResourceItem[]} resources
+ * @param {string} form_id
+ * @return {*}
+ */
+export function filterResourcesByFormItem(resources, form_id) {
+  return resources.filter(function (n) {
+    return n.form_id === form_id;
+  });
+}
+
+/**
+ * 传入两个资源，确认这两个资源是否有交集（包括组合资源）
+ *
+ * @export
+ * @param {ResourceItem} resource1
+ * @param {ResourceItem} resource2
+ * @return {*} 
+ */
+export function checkTwoResourcesIntersection(resource1, resource2) {
+  var _resource1$metadata$c, _resource2$metadata$c;
+  // 检查主资源ID是否匹配
+  if (resource1.id === resource2.id) return true;
+  // 检查组合资源的情况
+  if (((_resource1$metadata$c = resource1.metadata.combined_resource) === null || _resource1$metadata$c === void 0 ? void 0 : _resource1$metadata$c.status) === 1 && (
+  // 如果现在选择的是组合资源，需要判断
+  // 1、当前其他购物车里是否选了当前组合资源的子资源
+  // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
+  resource1.metadata.combined_resource.resource_ids.includes(resource2.id) || resource1.metadata.combined_resource.resource_ids.some(function (n) {
+    return resource2.metadata.combined_resource.resource_ids.includes(n);
+  }))) return true;
+  if (((_resource2$metadata$c = resource2.metadata.combined_resource) === null || _resource2$metadata$c === void 0 ? void 0 : _resource2$metadata$c.status) === 1 && resource2.metadata.combined_resource.resource_ids.includes(resource2.id)) return true;
 }

package/dist/solution/BookingByStep/utils/timeslots.d.ts

@@ -1,3 +1,4 @@
+import { Dayjs } from "dayjs";
 import { ResourceItem, TimeSliceItem } from "./resources";
 /**
  * 计算资源在指定时间段内的总可用时间（以分钟为单位）
@@ -23,3 +24,13 @@ export declare function findFastestAvailableResource({ resources, currentCapacit
     currentCapacity?: number;
     countMap?: Record<number, number>;
 }): ResourceItem | null;
+/**
+ * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段
+ *
+ * @export
+ * @param {TimeSliceItem[]} times
+ * @param {Dayjs} startTime
+ * @param {Dayjs} endTime
+ * @return {*}
+ */
+export declare function filterConditionTimeSlots(times: TimeSliceItem[], startTime: Dayjs, endTime: Dayjs): TimeSliceItem[];

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

@@ -206,4 +206,19 @@ export function findFastestAvailableResource(_ref2) {
     }
   }
   return selectedResource;
+}
+
+/**
+ * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段
+ *
+ * @export
+ * @param {TimeSliceItem[]} times
+ * @param {Dayjs} startTime
+ * @param {Dayjs} endTime
+ * @return {*} 
+ */
+export function filterConditionTimeSlots(times, startTime, endTime) {
+  return times.filter(function (n) {
+    return !dayjs(n.start_at).isAfter(dayjs(startTime)) && !dayjs(n.end_at).isBefore(dayjs(endTime));
+  });
 }

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

@@ -10,6 +10,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private window;
     private store;
     private options;
+    private hooks?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     destroy(): Promise<void>;

package/dist/solution/ShopDiscount/index.js

@@ -1,7 +1,5 @@
-var _excluded = ["wallet_pass_list"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -30,6 +28,7 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
+import Decimal from 'decimal.js';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -45,6 +44,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "options", {});
+    _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
     _this.store = {
       customer: null,
       productList: [],
@@ -59,12 +59,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var _options$otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.options = options;
               this.store = _objectSpread(_objectSpread({}, this.store), options.store || {});
+              this.hooks = (_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 || (_options$otherParams = _options$otherParams.rules) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.hooks;
               console.log('[ShopDiscount] 初始化完成');
 
               // 获取依赖的插件
@@ -75,7 +77,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 注册事件监听
               this.registerEventListeners();
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -196,7 +198,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         _this2.loadPrepareConfig({
           customerId: customer.id,
           action: 'create',
-          with_good_pass: 1
+          with_good_pass: 1,
+          with_discount_card: 1
         });
       });
     }
@@ -429,25 +432,42 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
-      var _this$store$discount5;
+      var _this3 = this,
+        _this$store$discount5;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
         if (item.booking_id) {
+          var _this3$hooks;
+          var product = (_this3$hooks = _this3.hooks) === null || _this3$hooks === void 0 ? void 0 : _this3$hooks.getProduct(item);
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id && discount.type === 'good_pass') {
-              var _discount$discount, _discount$discount2, _discount$discount3;
-              editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
-                isEditMode: true,
-                limited_relation_product_data: {},
-                savedAmount: discount.amount,
-                isAvailable: true,
-                id: ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id,
-                format_title: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.title) || discount.format_title,
-                isDisabled: true,
-                isSelected: true,
-                product_id: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.product_id) || discount.product_id
-              }));
+            if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
+              var index = editModeDiscountList.findIndex(function (n) {
+                var _discount$discount;
+                return n.id === ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id;
+              });
+              if (index !== -1) {
+                editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
+                  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.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                });
+              } else {
+                var _discount$discount2, _discount$discount3, _discount$discount4;
+                if (discount.type && !discount.tag) {
+                  discount.tag = discount.type;
+                }
+                editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  isEditMode: true,
+                  limited_relation_product_data: {},
+                  savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),
+                  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,
+                  isDisabled: true,
+                  isSelected: true,
+                  product_id: ((_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.product_id) || discount.product_id
+                }));
+              }
             }
           });
         }
@@ -455,6 +475,24 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
       })));
+      var allUsedProductIds = newDiscountList.map(function (n) {
+        var _n$appliedProductDeta;
+        return n.isSelected ? (_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
+          var _n$discount;
+          return (_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.product_id;
+        }) : [];
+      }).flat();
+      newDiscountList.forEach(function (item) {
+        var _item$applicableProdu;
+        var isAllProductUsed = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
+          return allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id);
+        });
+        if (!item.isSelected && isAllProductUsed) {
+          item.isDisabledForProductUsed = true;
+        } else {
+          item.isDisabledForProductUsed = false;
+        }
+      });
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
@@ -473,14 +511,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCustomerWallet",
     value: function () {
       var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
-        var result, _result$data, wallet_pass_list, customer;
+        var result, customer;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.prev = 0;
               _context7.next = 3;
-              return this.request.get("/customer/info/wallet/".concat(id), {
-                wallet_pass_tags: ['good_pass']
+              return this.request.get("/customer/info/".concat(id), {
+                with_trashed: 1
               });
             case 3:
               result = _context7.sent;
@@ -488,7 +526,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 _context7.next = 9;
                 break;
               }
-              _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
+              customer = Object.assign({}, (_objectDestructuringEmpty(result.data), result.data));
               this.setCustomer(customer);
               _context7.next = 9;
               return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
@@ -526,7 +564,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
-                with_good_pass: 1
+                with_good_pass: 1,
+                with_discount_card: 1
               });
             case 4:
               goodPassList = _context8.sent;