@pisell/pisellos 2.0.67 → 2.1.2

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

@@ -1,6 +1,5 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Product } from '../Product';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -8,20 +7,16 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultVersion: string;
     private store;
     private request;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, cacheId }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
         cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        schedule_datetime?: string;
-        with_count?: string[];
-        with_schedule?: number;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
@@ -30,13 +25,7 @@ export declare class ProductList extends BaseModule implements Module {
         channel?: string;
     }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product | undefined>;
+    getProduct(id: number): Promise<ProductData | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
-    /**
-     * 根据商品编码或条码搜索商品
-     * @param code 商品编码或条码
-     * @returns 匹配的商品列表，如果没有匹配则返回空数组
-     */
-    findProductsByCodeOrBarcode(code: string): ProductData[];
 }

package/lib/modules/ProductList/index.js

@@ -24,7 +24,6 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
-var import_Product = require("../Product");
 var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
@@ -33,54 +32,36 @@ var ProductList = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "productList";
     this.defaultVersion = "1.0.0";
+    this.otherParams = {};
   }
   async initialize(core, options) {
     var _a;
     this.core = core;
     this.store = options.store;
+    this.otherParams = options.otherParams || {};
     if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
-      this.store.list = options.initialState.list;
+      this.store.list = options.initialState.list.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
-      this.storeChange();
     } else {
       this.store.list = [];
-      this.store.productMap = /* @__PURE__ */ new Map();
       this.store.selectProducts = [];
     }
     this.request = core.getPlugin("request");
   }
   async storeChange(path, value) {
-    var _a;
-    (_a = this.store.list) == null ? void 0 : _a.forEach((product) => {
-      const productModule = this.store.productMap.get(`product-${product.id}`);
-      if (!productModule) {
-        const newProductModule = new import_Product.Product(
-          `product_${product.id.toString()}`
-        );
-        this.core.registerModule(newProductModule, { initialState: product });
-        this.store.productMap.set(product.id.toString(), newProductModule);
-      } else {
-        productModule.updateData(product);
-      }
-    });
   }
   async loadProducts({
     category_ids = [],
     product_ids = [],
     collection = [],
-    menu_list_ids = [],
-    customer_id: paramsCustomerId,
-    with_count = [],
-    schedule_datetime,
     schedule_date,
-    cacheId,
-    with_schedule
+    cacheId
   }) {
-    var _a;
+    var _a, _b;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
-      customer_id = paramsCustomerId || ((_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id);
+      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
     } catch (error) {
       console.error(error);
     }
@@ -106,17 +87,15 @@ var ProductList = class extends import_BaseModule.BaseModule {
         ids: product_ids,
         collection,
         front_end_cache_id: cacheId,
-        menu_list_ids,
-        with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
-        with_schedule,
-        schedule_datetime
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
       },
       { useCache: true }
     );
-    this.addProduct(productsData.data.list);
-    return productsData.data.list;
+    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.addProduct(sortedList);
+    return sortedList;
   }
   async loadProductsPrice({
     ids = [],
@@ -148,10 +127,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
       import_types.ProductListHooks.onGetProduct,
       this.store.list
     );
-    const product = this.store.productMap.get(`${id}`);
-    if (product)
-      return product;
-    return void 0;
+    const product = this.store.list.find((product2) => product2.id === id);
+    return product ? (0, import_lodash_es.cloneDeep)(product) : void 0;
   }
   async addProduct(products) {
     if (!this.store.list) {
@@ -165,29 +142,12 @@ var ProductList = class extends import_BaseModule.BaseModule {
         this.store.list[index] = n;
       }
     });
-    this.storeChange();
+    this.store.list.sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.core.effects.emit(`${this.name}:changed`, this.store.list);
   }
   async selectProducts(products) {
     this.store.selectProducts = products;
   }
-  /**
-   * 根据商品编码或条码搜索商品
-   * @param code 商品编码或条码
-   * @returns 匹配的商品列表，如果没有匹配则返回空数组
-   */
-  findProductsByCodeOrBarcode(code) {
-    if (!code || typeof code !== "string") {
-      return [];
-    }
-    const trimmedCode = code.trim();
-    if (!trimmedCode) {
-      return [];
-    }
-    const matchingProducts = this.store.list.filter((product) => {
-      return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
-    });
-    return (0, import_lodash_es.cloneDeep)(matchingProducts);
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,7 +1,6 @@
 import { ProductData } from '../Product/types';
 export interface ProductListData {
     list: ProductData[];
-    productMap: Map<string, any>;
     selectProducts: ProductData[];
 }
 export declare enum ProductListHooks {

package/lib/modules/Rules/index.js

@@ -37,7 +37,6 @@ var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
-var import_lodash_es = require("lodash-es");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -189,23 +188,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
-          const discountType = discount.tag || discount.type;
-          const productData = {
+          applicableProducts.push({
             amount: product.price,
-            type: discountType,
-            tag: discountType,
+            type: discount.tag || discount.type,
+            tag: discount.tag || discount.type,
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value,
               product_id: originProduct.id
-            }
-          };
-          if (discountType !== "good_pass") {
-            productData.num = product.num || 1;
-          }
-          applicableProducts.push(productData);
+            },
+            num: product.num || 1
+          });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
       });
@@ -220,9 +215,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a2;
-        if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.total) <= 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
+        if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -247,7 +242,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }))) {
         isManualDiscount = false;
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+      if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,
@@ -314,21 +309,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           productOriginTotal = product.total;
         }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
-        const discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
-          type: discountType,
+          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
-          }
+          },
+          num: product.num || 1
         };
-        if ((selectedDiscount2.tag || selectedDiscount2.type) !== "good_pass") {
-          discountDetail.num = product.num || 1;
-        }
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
         if (product.isClient) {

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

@@ -39,7 +39,6 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
-    vouchersApplicable?: boolean;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/modules/index.d.ts

@@ -3,7 +3,6 @@ export * from './ProductList';
 export * from './Cart';
 export * from './Account';
 export * from './AccountList';
-export * from './Customer';
 export * from './Date';
 export * from './Guests';
 export * from './Order';

package/lib/modules/index.js

@@ -21,7 +21,6 @@ __reExport(modules_exports, require("./ProductList"), module.exports);
 __reExport(modules_exports, require("./Cart"), module.exports);
 __reExport(modules_exports, require("./Account"), module.exports);
 __reExport(modules_exports, require("./AccountList"), module.exports);
-__reExport(modules_exports, require("./Customer"), module.exports);
 __reExport(modules_exports, require("./Date"), module.exports);
 __reExport(modules_exports, require("./Guests"), module.exports);
 __reExport(modules_exports, require("./Order"), module.exports);
@@ -37,7 +36,6 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Cart"),
   ...require("./Account"),
   ...require("./AccountList"),
-  ...require("./Customer"),
   ...require("./Date"),
   ...require("./Guests"),
   ...require("./Order"),

package/lib/plugins/window.d.ts

@@ -13,7 +13,6 @@ export interface WindowPlugin extends Plugin {
     navigator: Partial<Navigator>;
     document: Partial<Document>;
     history: History;
-    interaction?: any;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/solution/BookingByStep/index.js

@@ -390,7 +390,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let { products, startDate, endDate, type, useCache = true } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -407,14 +407,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (this.store.currentProduct) {
       tempProducts = [
         {
-          ...this.store.currentProduct.getData(),
-          _schedule: this.store.currentProduct.getOtherParams()["schedule"]
+          ...this.store.currentProduct,
+          _schedule: (_a = this.store.currentProductMeta) == null ? void 0 : _a["schedule"]
         }
       ];
     }
     let dateRange = this.store.date.getDateRange();
-    const tempStartDate = startDate || ((_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.date);
-    const tempEndDate = endDate || ((_b = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _b.date) || ((_c = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _c.date);
+    const tempStartDate = startDate || ((_b = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _b.date);
+    const tempEndDate = endDate || ((_c = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _c.date) || ((_d = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _d.date);
     if (!tempProducts.length) {
       return [];
     }
@@ -1596,15 +1596,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约
   async openProductDetail(productId) {
-    const targetProduct = await this.store.products.getProduct(productId);
-    if (targetProduct) {
-      const targetProductData = targetProduct.getData();
-      this.store.currentProduct = targetProduct;
+    const targetProductData = await this.store.products.getProduct(productId);
+    if (targetProductData) {
+      this.store.currentProduct = targetProductData;
+      this.store.currentProductMeta = {};
       if (targetProductData["schedule.ids"]) {
         const newScheduleArr = this.getScheduleDataByIds(
           targetProductData["schedule.ids"]
         );
-        targetProduct.setOtherParams("schedule", newScheduleArr);
+        if (!this.store.currentProductMeta)
+          this.store.currentProductMeta = {};
+        this.store.currentProductMeta.schedule = newScheduleArr;
       } else if (targetProductData.duration) {
         const dateRange = this.store.date.getDateRange();
         if (!(dateRange == null ? void 0 : dateRange.length))
@@ -1618,8 +1620,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
   }
   closeProductDetail() {
-    var _a;
-    (_a = this.store.currentProduct) == null ? void 0 : _a.setOtherParams("schedule", []);
+    if (this.store.currentProductMeta) {
+      this.store.currentProductMeta.schedule = [];
+    }
     this.store.currentProduct = void 0;
   }
   getTimeslotBySchedule({
@@ -1628,9 +1631,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const targetProduct = this.store.currentProduct;
-    const targetProductData = product || (targetProduct == null ? void 0 : targetProduct.getData());
+    const targetProductData = product || targetProduct;
     let targetSchedules = [];
     if (scheduleIds == null ? void 0 : scheduleIds.length) {
       targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
@@ -1650,7 +1653,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     );
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
-      resources || ((_c = (_b = (_a = this.store.currentProduct) == null ? void 0 : _a.getData()) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+      resources || ((_b = (_a = this.store.currentProduct) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [],
       selectedResources,
       1
     );
@@ -1671,9 +1674,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const firstEnabledResourceId = (_f = (_e = (_d = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.find(
+    const firstEnabledResourceId = (_e = (_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
       (n) => n.status === 1
-    )) == null ? void 0 : _f.id;
+    )) == null ? void 0 : _e.id;
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
@@ -1747,9 +1750,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return this.otherData[key];
   }
   async getProductTypeById(id) {
-    const product = await this.store.products.getProduct(id);
-    if (product) {
-      return product.getProductType();
+    var _a;
+    const productData = await this.store.products.getProduct(id);
+    if (productData) {
+      if (productData.duration) {
+        return "duration";
+      }
+      if ((_a = productData["schedule.ids"]) == null ? void 0 : _a.length) {
+        return "session";
+      }
+      return "normal";
     }
     return "normal";
   }
@@ -1910,7 +1920,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return results;
   }
   async getAvailableDateForSessionOptimize(params = {}) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     let { startDate, endDate } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -1926,7 +1936,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       tempEndDate = endDate || "";
     }
     endDate = tempEndDate;
-    const cache = (_a = this.store.currentProduct) == null ? void 0 : _a.getOtherParams()["timeSlotBySchedule"];
+    const cache = (_a = this.store.currentProductMeta) == null ? void 0 : _a["timeSlotBySchedule"];
     if (cache) {
       if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
         this.store.date.setDateList(cache.dateList);
@@ -1937,8 +1947,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     }
     let tempProducts;
-    tempProducts = (_b = this.store.currentProduct) == null ? void 0 : _b.getData();
-    const schedule = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["schedule"];
+    tempProducts = this.store.currentProduct;
+    const schedule = (_b = this.store.currentProductMeta) == null ? void 0 : _b["schedule"];
     const filteredSchedule = (0, import_resources.filterScheduleByDateRange)(
       schedule,
       startDate || "",
@@ -1955,7 +1965,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let dates = [];
     let currentDate = (0, import_dayjs.default)(startDate);
     let firstAvailableDate = "";
-    const openResources = ((_e = (_d = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.filter(
+    const openResources = ((_d = (_c = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.filter(
       (m) => m.status === 1
     )) || [];
     const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
@@ -2056,12 +2066,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     dates = (0, import_utils3.handleAvailableDateByResource)(res.data, dates);
     this.store.date.setDateList(dates);
-    (_f = this.store.currentProduct) == null ? void 0 : _f.setOtherParams("timeSlotBySchedule", {
+    if (!this.store.currentProductMeta)
+      this.store.currentProductMeta = {};
+    this.store.currentProductMeta.timeSlotBySchedule = {
       dateList: dates,
       firstAvailableDate,
       startDate,
       endDate: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD")
-    });
+    };
     return {
       dateList: dates,
       firstAvailableDate

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,7 +11,8 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct?: Product;
+    currentProduct?: ProductData;
+    currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];

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

@@ -215,7 +215,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                         // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
                         metadata: {
                           ...resourcesMap[id].metadata,
-                          combined_resource: resourcesMap[id].combined_resource
+                          combined_resource: resourcesMap[id].combined_resource,
+                          form_name: item.title,
+                          resource_name: resourcesMap[id].main_field
                         }
                       })
                     );
@@ -230,7 +232,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                 children: combiningResources,
                 metadata: {
                   ...resourcesMap[d].metadata,
-                  combined_resource: resourcesMap[d].combined_resource
+                  combined_resource: resourcesMap[d].combined_resource,
+                  form_name: item.title,
+                  resource_name: resourcesMap[d].main_field
                 }
               })
             );
@@ -259,7 +263,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                         // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
                         metadata: {
                           ...resourcesMap[id].metadata,
-                          combined_resource: resourcesMap[id].combined_resource
+                          combined_resource: resourcesMap[id].combined_resource,
+                          form_name: item.title,
+                          resource_name: resourcesMap[id].main_field
                         }
                       })
                     );
@@ -275,7 +281,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                 children: combiningResources,
                 metadata: {
                   ...resourcesMap[d].metadata,
-                  combined_resource: resourcesMap[d].combined_resource
+                  combined_resource: resourcesMap[d].combined_resource,
+                  form_name: item.title,
+                  resource_name: resourcesMap[d].main_field
                 }
               })
             );

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore } from '../../types';
-import { Product, ProductData } from '../../modules/';
+import { ProductData } from '../../modules/';
 import { BaseModule } from '../../modules/BaseModule';
 export * from './types';
 export declare class BuyTicketsImpl extends BaseModule implements Module {
@@ -16,7 +16,7 @@ export declare class BuyTicketsImpl extends BaseModule implements Module {
     loadProductsByCategory(categoryId: number): Promise<void>;
     destroy(): Promise<void>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product>;
+    getProduct(id: number): Promise<ProductData>;
     listSubmit(data: Record<string, any>): Promise<{
         status: boolean;
         data: any;

package/lib/solution/BuyTickets/index.js

@@ -98,7 +98,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       return mainProduct;
     if (otherProduct)
       return otherProduct;
-    return Promise.reject("Not fund product for id: " + id);
+    throw new Error(`Product not found: ${id}`);
   }
   // 商品列表页提交
   async listSubmit(data) {

package/lib/solution/ShopDiscount/index.js

@@ -38,7 +38,6 @@ 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 import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -338,7 +337,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
-      return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
+      return Number(product == null ? void 0 : product.total) === 0 && (Number(product == null ? void 0 : product.origin_total) === 0 || !(product == null ? void 0 : product.origin_total));
     };
     const allUsedProductIds = newDiscountList.map((n) => {
       var _a2;

package/lib/solution/index.d.ts

@@ -1,4 +1,3 @@
 export * from './BuyTickets';
 export * from './BookingByStep';
-export * from './BookingTicket';
 export * from './ShopDiscount';

package/lib/solution/index.js

@@ -18,12 +18,10 @@ var solution_exports = {};
 module.exports = __toCommonJS(solution_exports);
 __reExport(solution_exports, require("./BuyTickets"), module.exports);
 __reExport(solution_exports, require("./BookingByStep"), module.exports);
-__reExport(solution_exports, require("./BookingTicket"), module.exports);
 __reExport(solution_exports, require("./ShopDiscount"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./BuyTickets"),
   ...require("./BookingByStep"),
-  ...require("./BookingTicket"),
   ...require("./ShopDiscount")
 });

package/lib/types/index.d.ts

@@ -38,9 +38,7 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        on: (event: string, callback: (payload: any) => void) => () => void;
-        once: (event: string, callback: (payload: any) => void) => () => void;
-        off: (event: string, callback: (payload: any) => void) => void;
+        on: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;
             data: any;

package/package.json

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

package/dist/modules/Customer/constants.d.ts

@@ -1,7 +0,0 @@
-export declare const SORT_BY = "id";
-export declare const DEFAULT_PAGE_SIZE = 20;
-export declare const DEFAULT_CUSTOMER: {
-    id: number;
-    nickname: string;
-    name: string;
-};