@pisell/pisellos 3.0.41 → 3.0.43

package/lib/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/lib/solution/BookingByStep/utils/capacity.js

@@ -0,0 +1,106 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BookingByStep/utils/capacity.ts
+var capacity_exports = {};
+__export(capacity_exports, {
+  checkResourceCanUseByCapacity: () => checkResourceCanUseByCapacity,
+  checkSubResourcesCapacity: () => checkSubResourcesCapacity,
+  formatDefaultCapacitys: () => formatDefaultCapacitys,
+  getCapacityInfoByCartItem: () => getCapacityInfoByCartItem,
+  getSumCapacity: () => getSumCapacity
+});
+module.exports = __toCommonJS(capacity_exports);
+var formatDefaultCapacitys = ({
+  capacity,
+  product_bundle
+}) => {
+  if ((capacity == null ? void 0 : capacity.type) === "package") {
+    return (product_bundle || []).map((d) => {
+      const id = d.bundle_product_id;
+      const item = ((capacity == null ? void 0 : capacity.package) || []).find(
+        (item2) => item2.product_id === id
+      );
+      return {
+        id,
+        value: item ? d.num || 0 : 0,
+        name: (item == null ? void 0 : item.name) || (d == null ? void 0 : d.title)
+      };
+    });
+  }
+  if ((capacity == null ? void 0 : capacity.type) === "custom") {
+    return ((capacity == null ? void 0 : capacity.custom) || []).map((d) => {
+      return {
+        id: d.id,
+        value: d.min,
+        name: d.name
+      };
+    });
+  }
+  return [{ id: 0, value: 1, name: "" }];
+};
+var getSumCapacity = ({ capacity }) => {
+  let sum = 0;
+  for (let item of capacity || []) {
+    sum += item.value;
+  }
+  return sum;
+};
+function getCapacityInfoByCartItem(targetCartItem) {
+  var _a;
+  const formatCapacity = formatDefaultCapacitys({
+    capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
+    product_bundle: targetCartItem._origin.product.product_bundle
+  });
+  const currentCapacity = getSumCapacity({ capacity: formatCapacity });
+  return {
+    formatCapacity,
+    currentCapacity
+  };
+}
+var checkSubResourcesCapacity = (resource) => {
+  if (resource.children && resource.children.length) {
+    let countCapacity = resource.capacity;
+    resource.children.forEach((child, index) => {
+      if (index === resource.children.length - 1) {
+        child.capacity = countCapacity;
+        return;
+      }
+      if (child.capacity <= countCapacity) {
+        countCapacity -= child.capacity;
+      } else {
+        child.capacity = countCapacity;
+        countCapacity = 0;
+      }
+    });
+  }
+};
+var checkResourceCanUseByCapacity = (currentCapacity, requiredCapacity, maxCapacity) => {
+  if (currentCapacity < 0 || requiredCapacity < 0 || maxCapacity <= 0) {
+    return false;
+  }
+  return currentCapacity + requiredCapacity <= maxCapacity;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  checkResourceCanUseByCapacity,
+  checkSubResourcesCapacity,
+  formatDefaultCapacitys,
+  getCapacityInfoByCartItem,
+  getSumCapacity
+});

package/lib/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;
@@ -138,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;
@@ -180,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: 根据日期范围过滤日程
  *
@@ -248,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/lib/solution/BookingByStep/utils/resources.js

@@ -30,9 +30,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var resources_exports = {};
 __export(resources_exports, {
   checkSessionProductLeadTime: () => checkSessionProductLeadTime,
-  checkSubResourcesCapacity: () => checkSubResourcesCapacity,
+  checkTwoResourcesIntersection: () => checkTwoResourcesIntersection,
+  filterResourcesByFormItem: () => filterResourcesByFormItem,
   filterScheduleByDateRange: () => filterScheduleByDateRange,
-  formatDefaultCapacitys: () => formatDefaultCapacitys,
   formatResources: () => formatResources,
   getIsUsableByTimeItem: () => getIsUsableByTimeItem,
   getOthersCartSelectedResources: () => getOthersCartSelectedResources,
@@ -40,7 +40,6 @@ __export(resources_exports, {
   getResourcesByIds: () => getResourcesByIds,
   getResourcesByProduct: () => getResourcesByProduct,
   getResourcesIdsByProduct: () => getResourcesIdsByProduct,
-  getSumCapacity: () => getSumCapacity,
   getTimeSlicesByResource: () => getTimeSlicesByResource,
   getTimeSlicesByResources: () => getTimeSlicesByResources,
   getTimesIntersection: () => getTimesIntersection,
@@ -522,58 +521,6 @@ var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
     return acc;
   }, []);
 };
-var formatDefaultCapacitys = ({
-  capacity,
-  product_bundle
-}) => {
-  if ((capacity == null ? void 0 : capacity.type) === "package") {
-    return (product_bundle || []).map((d) => {
-      const id = d.bundle_product_id;
-      const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id
-      );
-      return {
-        id,
-        value: item ? d.num || 0 : 0,
-        name: (item == null ? void 0 : item.name) || (d == null ? void 0 : d.title)
-      };
-    });
-  }
-  if ((capacity == null ? void 0 : capacity.type) === "custom") {
-    return ((capacity == null ? void 0 : capacity.custom) || []).map((d) => {
-      return {
-        id: d.id,
-        value: d.min,
-        name: d.name
-      };
-    });
-  }
-  return [{ id: 0, value: 1, name: "" }];
-};
-var getSumCapacity = ({ capacity }) => {
-  let sum = 0;
-  for (let item of capacity || []) {
-    sum += item.value;
-  }
-  return sum;
-};
-var checkSubResourcesCapacity = (resource) => {
-  if (resource.children && resource.children.length) {
-    let countCapacity = resource.capacity;
-    resource.children.forEach((child, index) => {
-      if (index === resource.children.length - 1) {
-        child.capacity = countCapacity;
-        return;
-      }
-      if (child.capacity <= countCapacity) {
-        countCapacity -= child.capacity;
-      } else {
-        child.capacity = countCapacity;
-        countCapacity = 0;
-      }
-    });
-  }
-};
 function filterScheduleByDateRange(schedule, startDate, endDate) {
   if (!(schedule == null ? void 0 : schedule.length))
     return [];
@@ -637,12 +584,29 @@ function sortCombinedResources(resourcesList) {
   });
   return newResourcesList;
 }
+function filterResourcesByFormItem(resources, form_id) {
+  return resources.filter((n) => n.form_id === form_id);
+}
+function checkTwoResourcesIntersection(resource1, resource2) {
+  var _a, _b;
+  if (resource1.id === resource2.id)
+    return true;
+  if (((_a = resource1.metadata.combined_resource) == null ? void 0 : _a.status) === 1 && // 如果现在选择的是组合资源，需要判断
+  // 1、当前其他购物车里是否选了当前组合资源的子资源
+  // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
+  (resource1.metadata.combined_resource.resource_ids.includes(resource2.id) || resource1.metadata.combined_resource.resource_ids.some((n) => {
+    return resource2.metadata.combined_resource.resource_ids.includes(n);
+  })))
+    return true;
+  if (((_b = resource2.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && resource2.metadata.combined_resource.resource_ids.includes(resource2.id))
+    return true;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkSessionProductLeadTime,
-  checkSubResourcesCapacity,
+  checkTwoResourcesIntersection,
+  filterResourcesByFormItem,
   filterScheduleByDateRange,
-  formatDefaultCapacitys,
   formatResources,
   getIsUsableByTimeItem,
   getOthersCartSelectedResources,
@@ -650,7 +614,6 @@ function sortCombinedResources(resourcesList) {
   getResourcesByIds,
   getResourcesByProduct,
   getResourcesIdsByProduct,
-  getSumCapacity,
   getTimeSlicesByResource,
   getTimeSlicesByResources,
   getTimesIntersection,

package/lib/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/lib/solution/BookingByStep/utils/timeslots.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var timeslots_exports = {};
 __export(timeslots_exports, {
   calculateResourceAvailableTime: () => calculateResourceAvailableTime,
+  filterConditionTimeSlots: () => filterConditionTimeSlots,
   findFastestAvailableResource: () => findFastestAvailableResource
 });
 module.exports = __toCommonJS(timeslots_exports);
@@ -152,8 +153,14 @@ function findFastestAvailableResource({
   }
   return selectedResource;
 }
+function filterConditionTimeSlots(times, startTime, endTime) {
+  return times.filter((n) => {
+    return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(endTime));
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calculateResourceAvailableTime,
+  filterConditionTimeSlots,
   findFastestAvailableResource
 });

package/lib/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>;
@@ -37,6 +38,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
+        type: "server" | "clientCalc";
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/lib/solution/ShopDiscount/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/solution/ShopDiscount/index.ts
@@ -27,6 +37,7 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
+var import_decimal = __toESM(require("decimal.js"));
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -43,9 +54,11 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // =========== 生命周期方法 ===========
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.options = options;
     this.store = { ...this.store, ...options.store || {} };
+    this.hooks = (_b = (_a = options.otherParams) == null ? void 0 : _a.rules) == null ? void 0 : _b.hooks;
     console.log("[ShopDiscount] 初始化完成");
     this.initializePlugins();
     this.registerDependentModules();
@@ -118,7 +131,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.loadPrepareConfig({
           customerId: customer.id,
           action: "create",
-          with_good_pass: 1
+          with_good_pass: 1,
+          with_discount_card: 1
         });
       }
     );
@@ -191,6 +205,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {
+          type: "clientCalc",
+          isAvailable: false,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
+      if (!resultDiscountList.length) {
+        return {
+          type: "server",
           isAvailable: false,
           productList: this.store.productList || [],
           discountList: this.getDiscountList()
@@ -225,6 +248,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         }
       }
       return {
+        type: "clientCalc",
         isAvailable: isAvailable || false,
         productList: newProductList || this.store.productList || [],
         discountList: newDiscountList || this.getDiscountList()
@@ -232,6 +256,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error("[ShopDiscount] 扫码出错:", error);
       return {
+        type: "clientCalc",
         isAvailable: false,
         productList: this.store.productList || [],
         discountList: this.getDiscountList()
@@ -267,22 +292,39 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const productList = this.store.productList || [];
     const editModeDiscountList = [];
     productList.forEach((item) => {
+      var _a2;
       if (item.booking_id) {
+        const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
         (item.discount_list || []).forEach((discount) => {
-          var _a2, _b, _c;
-          if (discount.id && discount.type === "good_pass") {
-            editModeDiscountList.push({
-              ...discount,
-              isEditMode: true,
-              limited_relation_product_data: {},
-              savedAmount: discount.amount,
-              isAvailable: true,
-              id: ((_a2 = discount.discount) == null ? void 0 : _a2.resource_id) || discount.id,
-              format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
-              isDisabled: true,
-              isSelected: true,
-              product_id: ((_c = discount.discount) == null ? void 0 : _c.product_id) || discount.product_id
+          var _a3, _b, _c;
+          if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
+            const index = editModeDiscountList.findIndex((n) => {
+              var _a4;
+              return n.id === (((_a4 = discount.discount) == null ? void 0 : _a4.resource_id) || discount.id);
             });
+            if (index !== -1) {
+              editModeDiscountList[index] = {
+                ...editModeDiscountList[index],
+                amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+              };
+            } else {
+              if (discount.type && !discount.tag) {
+                discount.tag = discount.type;
+              }
+              editModeDiscountList.push({
+                ...discount,
+                isEditMode: true,
+                limited_relation_product_data: {},
+                savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),
+                isAvailable: true,
+                id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
+                format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
+                isDisabled: true,
+                isSelected: true,
+                product_id: ((_c = discount.discount) == null ? void 0 : _c.product_id) || discount.product_id
+              });
+            }
           }
         });
       }
@@ -291,6 +333,33 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       ...editModeDiscountList,
       ...discountList.filter((item) => !item.isDisabled)
     ];
+    const allUsedProductIds = newDiscountList.map((n) => {
+      var _a2;
+      return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
+        var _a3;
+        return (_a3 = n2.discount) == null ? void 0 : _a3.product_id;
+      }) : [];
+    }).flat();
+    newDiscountList.forEach((item) => {
+      var _a2;
+      const isProductFree = (id) => {
+        var _a3;
+        const targetProduct = productList.find((n) => n.id === id);
+        const product = (_a3 = this.hooks) == null ? void 0 : _a3.getProduct(targetProduct);
+        return Number(product == null ? void 0 : product.total) === 0;
+      };
+      const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
+        var _a3;
+        const sameIdTimes = ((_a3 = item.applicableProductIds) == null ? void 0 : _a3.filter((n) => n === id).length) || 1;
+        const targetIdTimes = (allUsedProductIds == null ? void 0 : allUsedProductIds.filter((n) => n === id).length) || 0;
+        return targetIdTimes >= sameIdTimes || isProductFree(id);
+      });
+      if (!item.isSelected && isAllProductUsedOrFree) {
+        item.isDisabledForProductUsed = true;
+      } else {
+        item.isDisabledForProductUsed = false;
+      }
+    });
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
     this.emitDiscountListChange(newDiscountList);
     return newDiscountList;
@@ -303,11 +372,11 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   // 获取客户钱包信息
   async getCustomerWallet(id) {
     try {
-      const result = await this.request.get(`/customer/info/wallet/${id}`, {
-        wallet_pass_tags: ["good_pass"]
+      const result = await this.request.get(`/customer/info/${id}`, {
+        with_trashed: 1
       });
       if (result == null ? void 0 : result.data) {
-        const { wallet_pass_list, ...customer } = result.data;
+        const { ...customer } = result.data;
         this.setCustomer(customer);
         await this.core.effects.emit(
           import_types.ShopDiscountHooks.onScanCustomerChange,
@@ -326,12 +395,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: "create",
-        with_good_pass: 1
+        with_good_pass: 1,
+        with_discount_card: 1
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );
-      const newDiscountList = [...scanDiscount, ...goodPassList || []];
+      const scanDiscountIds = scanDiscount.map((n) => n.id);
+      const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
+      const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
       this.setDiscountList(newDiscountList || []);
       if ((_d = this.store.productList) == null ? void 0 : _d.length) {
         const result = this.calcDiscount(this.store.productList);

package/package.json

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