@pisell/pisellos 3.0.4 → 3.0.6

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

@@ -1,6 +1,6 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { Discount, DiscountModuleAPI } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { Discount, DiscountModuleAPI } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -15,7 +15,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setDiscountList(discountList: Discount[]): Promise<void>;
     getDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: "create";
+        action?: 'create';
         with_good_pass: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;

package/lib/modules/Discount/index.js

@@ -88,7 +88,9 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       available: 1,
       relation_product: 1
     });
-    const resultDiscountList = this.uniqueByProductId(this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || []) || [];
+    const resultDiscountList = this.uniqueByProductId(
+      this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || []
+    ) || [];
     return resultDiscountList;
   }
   filterEnabledDiscountList(discountList) {
@@ -129,7 +131,12 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   storeChange() {
     if (this.openCache) {
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["discountList"] });
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store: this.store,
+        cacheKey: ["discountList"]
+      });
     }
   }
 };

package/lib/modules/Guests/index.js

@@ -52,7 +52,10 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
       ...this.state.list[index],
       ...updates
     };
-    await this.core.effects.emit(import_types.GuestHooks.OnGuestUpdate, this.state.list[index]);
+    await this.core.effects.emit(
+      import_types.GuestHooks.OnGuestUpdate,
+      this.state.list[index]
+    );
     await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
   }
   async removeGuest(id) {

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

@@ -1,6 +1,7 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { OrderModuleAPI, CommitOrderParams } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { OrderModuleAPI, CommitOrderParams } from './types';
+import { CartItem } from '../Cart/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -8,7 +9,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private request;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    createOrder(params: CommitOrderParams["query"]): {
+    createOrder(params: CommitOrderParams['query']): {
         type: string;
         platform: string;
         sales_channel: string;
@@ -16,6 +17,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         bookings: any[];
         shop_note: string;
         schedule_date: string;
+        is_deposit: number;
     };
-    commitOrder(order: CommitOrderParams): Promise<void>;
+    checkBeforeSubmitOrder(params: {
+        cartItems: CartItem[];
+        type: 'holder' | 'account';
+    }): boolean;
+    submitOrder(order: CommitOrderParams): Promise<void>;
 }

package/lib/modules/Order/index.js

@@ -23,6 +23,7 @@ __export(Order_exports, {
 });
 module.exports = __toCommonJS(Order_exports);
 var import_BaseModule = require("../BaseModule");
+var import_utils = require("./utils");
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -42,22 +43,42 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       order_sales_channel: "online_store",
       bookings: [],
       shop_note: "",
-      schedule_date: ""
+      schedule_date: "",
+      is_deposit: 0
     };
+    let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
+        if (!item._origin.duration) {
+          const { duration, durationType } = (0, import_utils.generateDuration)(item);
+          item._origin.duration = duration;
+          item._origin.sub_type = durationType;
+        }
         order.bookings.push(item._origin);
+        if (item == null ? void 0 : item.deposit) {
+          is_deposit = 1;
+        }
       });
       const firstCartItem = params.cartItems[0];
       order.schedule_date = firstCartItem.start_date + " " + firstCartItem.start_time + ":00";
+      order.is_deposit = is_deposit;
     }
     return order;
   }
-  async commitOrder(order) {
+  checkBeforeSubmitOrder(params) {
+    const { cartItems, type } = params;
+    if (type === "holder") {
+      const hasNoHolderId = cartItems.some((item) => !item.holder_id);
+      if (hasNoHolderId) {
+        return false;
+      }
+    }
+    return true;
+  }
+  async submitOrder(order) {
     const { url, query } = order;
     const fetchUrl = url || "/order/appointment";
     const params = this.createOrder(query);
-    console.log(params);
     return this.request.post(fetchUrl, params);
   }
 };

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

@@ -1,4 +1,4 @@
-import { CartItem } from "../Cart/types";
+import { CartItem } from '../Cart/types';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -25,10 +25,17 @@ export interface OrderModuleAPI {
      * @param params 订单信息
      * @returns 订单信息
      */
-    createOrder: (params: CommitOrderParams["query"]) => any;
+    createOrder: (params: CommitOrderParams['query']) => any;
+    /**
+     * 检查购物车提交订单前是否符合条件
+     */
+    checkBeforeSubmitOrder: (params: {
+        cartItems: CartItem[];
+        type: 'holder' | 'account';
+    }) => boolean;
     /**
      * 提交订单
      * @param params 订单信息
      */
-    commitOrder: (params: CommitOrderParams) => Promise<void>;
+    submitOrder: (params: CommitOrderParams) => Promise<void>;
 }

package/lib/modules/Order/utils.d.ts

@@ -0,0 +1,10 @@
+import { CartItem } from "../Cart";
+/**
+ * 通过 session 类商品的开始时间结束时间生成商品的时长
+ * @param {CartItem} cartItem
+ * @return {*}
+ */
+export declare const generateDuration: (cartItem: CartItem) => {
+    duration: number;
+    durationType: string;
+};

package/lib/modules/Order/utils.js

@@ -0,0 +1,45 @@
+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)
+    __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 __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/modules/Order/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  generateDuration: () => generateDuration
+});
+module.exports = __toCommonJS(utils_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var generateDuration = (cartItem) => {
+  const startDate = (0, import_dayjs.default)(`${cartItem.start_date} ${cartItem.start_time}`);
+  const endDate = (0, import_dayjs.default)(`${cartItem.end_date} ${cartItem.end_time}`);
+  const duration = endDate.diff(startDate, "minutes");
+  return { duration, durationType: "minutes" };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateDuration
+});

package/lib/modules/Payment/index.js

@@ -72,12 +72,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     await this.core.effects.emit(import_types.PaymentHooks.OnPaymentRefund, payment);
   }
   getAvailablePaymentMethods() {
-    return [
-      "credit_card",
-      "debit_card",
-      "alipay",
-      "wechat_pay"
-    ];
+    return ["credit_card", "debit_card", "alipay", "wechat_pay"];
   }
   async checkPaymentStatus(paymentId) {
     const payment = this.state.paymentHistory.find((p) => p.id === paymentId);

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

@@ -2,16 +2,26 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { ProductData, ProductMedia, ProductTag, ProductCategory, ProductBundleGroup } from './types';
 export * from './types';
+/**
+ * 商品详情模块
+ * 除了跟商品列表模块组合外，还会提供单独的商品详情页的一些方法
+ *
+ * @export
+ * @class Product
+ * @extends {BaseModule}
+ * @implements {Module}
+ */
 export declare class Product extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    protected otherParams: any;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**
      * 获取商品数据
      */
-    getData(): ProductData | null;
+    getData(): ProductData;
     /**
      * 获取商品ID
      */
@@ -36,4 +46,7 @@ export declare class Product extends BaseModule implements Module {
      * 获取商品分类
      */
     getCategories(): ProductCategory[];
+    setOtherParams(key: string, value: any): void;
+    getOtherParams(): any;
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/Product/index.js

@@ -30,6 +30,9 @@ var Product = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "product";
     this.defaultVersion = "1.0.0";
+    this.otherParams = {
+      scheduler: []
+    };
   }
   async initialize(core, options) {
     this.core = core;
@@ -79,6 +82,22 @@ var Product = class extends import_BaseModule.BaseModule {
   getCategories() {
     return this.store.categories;
   }
+  setOtherParams(key, value) {
+    this.otherParams[key] = value;
+  }
+  getOtherParams() {
+    return this.otherParams;
+  }
+  getProductType() {
+    var _a;
+    if (this.store.duration) {
+      return "duration";
+    }
+    if ((_a = this.store["schedule.ids"]) == null ? void 0 : _a.length) {
+      return "session";
+    }
+    return "normal";
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -17,7 +17,7 @@ export interface ProductData {
     /** 商品slug */
     slug: string;
     /** draft:草稿;published:已发布;pending:待发布;archived:已归档 */
-    status: "draft" | "published" | "pending" | "archived";
+    status: 'draft' | 'published' | 'pending' | 'archived';
     /** 库存数量 */
     stock_quantity: number;
     /** 销售数量 */
@@ -152,6 +152,30 @@ export interface ProductData {
     options?: any[];
     /** 商品原信息 */
     origin?: any;
+    /** 容量 */
+    capacity?: any;
+    /** 商品套餐 */
+    product_bundle?: any;
+    /** 日程ids */
+    'schedule.ids'?: number[];
+    /** 商品日程信息，前端临时用，随时需要回收的 */
+    _schedule?: any;
+    /** 商品定金信息 */
+    custom_deposit_data?: {
+        /** 商品是否包含定金 1:是 0:否 */
+        has_deposit: 0 | 1;
+        /** 定金固定金额 */
+        deposit_fixed?: string;
+        /** 定金百分比 */
+        deposit_percentage?: string;
+        /** 定金协议数据 */
+        deposit_policy_data?: Array<{
+            /** 定金协议id */
+            id: number;
+            /** 定金协议标题 */
+            title: string;
+        }>;
+    };
 }
 /**
  * 商品媒体信息接口
@@ -414,7 +438,7 @@ export interface ProductResourceItem {
     /** 资源标题 */
     title: string;
     /** 资源编码 */
-    code: "resource";
+    code: 'resource';
     /** 默认资源 */
     default_resource?: number[];
     /** 可选资源 */
@@ -423,7 +447,7 @@ export interface ProductResourceItem {
     resource_type_id: number;
     /** 选择类型 */
     select_type?: {
-        type: "single";
+        type: 'single';
         min: 1;
         max: 1;
     };

package/lib/modules/ProductList/index.js

@@ -35,29 +35,43 @@ var ProductList = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
   }
   async initialize(core, options) {
+    var _a;
     this.core = core;
     this.store = options.store;
-    this.store.productMap = /* @__PURE__ */ new Map();
-    this.store.list = [];
-    this.store.selectProducts = [];
-    this.storeChange();
+    if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
+      this.store.list = options.initialState.list;
+      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 = [];
+    }
   }
   async storeChange(path, value) {
     var _a;
     (_a = this.store.list) == null ? void 0 : _a.forEach((product) => {
       if (!this.store.productMap.has(`product-${product.id}`)) {
-        const newProductModule = new import_Product.Product(`product_${product.id.toString()}`);
+        const newProductModule = new import_Product.Product(
+          `product_${product.id.toString()}`
+        );
         this.core.registerModule(newProductModule, { initialState: product });
         this.store.productMap.set(product.id.toString(), newProductModule);
       }
     });
   }
   async getProducts() {
-    await this.core.effects.emit(import_types.ProductListHooks.onGetProducts, this.store.list);
+    await this.core.effects.emit(
+      import_types.ProductListHooks.onGetProducts,
+      this.store.list
+    );
     return (0, import_lodash_es.cloneDeep)(this.store.list);
   }
   async getProduct(id) {
-    await this.core.effects.emit(import_types.ProductListHooks.onGetProduct, this.store.list);
+    await this.core.effects.emit(
+      import_types.ProductListHooks.onGetProduct,
+      this.store.list
+    );
     const product = this.store.productMap.get(`${id}`);
     if (product)
       return product;

package/lib/modules/Resource/index.js

@@ -78,7 +78,10 @@ var ResourceListModule = class extends import_BaseModule.BaseModule {
       ...this.store.list[index],
       ...updates
     };
-    await this.core.effects.emit(import_types.ResourceHooks.OnResourceChange, this.store.list[index]);
+    await this.core.effects.emit(
+      import_types.ResourceHooks.OnResourceChange,
+      this.store.list[index]
+    );
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -26,6 +26,7 @@ export interface Resource {
     startTime?: string;
     endTime?: string;
     resourceType?: string;
+    children?: Resource[];
 }
 /**
  * 资源列表状态

package/lib/modules/Resource/utils.js

@@ -24,10 +24,13 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var getResourcesMap = (resourceList) => {
-  return resourceList.reduce((pre, item) => {
-    pre[item.id] = item;
-    return pre;
-  }, {});
+  return resourceList.reduce(
+    (pre, item) => {
+      pre[item.id] = item;
+      return pre;
+    },
+    {}
+  );
 };
 var getResourcesByIds = (resourcesMap, ids) => {
   return (ids || []).map((id) => resourcesMap[id]);

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

@@ -1,6 +1,6 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { Rules, RulesModuleAPI, DiscountResult } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;

package/lib/modules/Rules/index.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
+var import_utils2 = require("../Cart/utils");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -174,53 +175,127 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         isManualDiscount = false;
       }
       if (applicableDiscounts.length === 0 || isManualDiscount) {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
-            ...isManualDiscount ? {} : {
-              total: product.origin_total || product.total,
-              price: product.price
-            },
-            discount_list: []
-          })
-        );
-        return;
-      }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
-        return;
-      }
-      usedDiscounts.set(selectedDiscount.id, true);
-      const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-      const discountDetail = {
-        amount: product.price,
-        type: selectedDiscount.tag,
-        discount: {
-          resource_id: selectedDiscount.id,
-          title: selectedDiscount.format_title,
-          original_amount: product.origin_total,
-          product_id: selectedDiscount.product_id
+        if (product.isClient) {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              ...isManualDiscount ? {} : {
+                origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+                  product: {
+                    original_price: product.original_price
+                  },
+                  bundle: product.bundle,
+                  options: product.options
+                }),
+                total: (0, import_utils2.getProductTotalPrice)({
+                  product: {
+                    price: product.price
+                  },
+                  bundle: product.bundle,
+                  options: product.options
+                }),
+                price: product.price
+              },
+              discount_list: []
+            })
+          );
+        } else {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              ...isManualDiscount ? {} : {
+                total: product.origin_total || product.total,
+                price: product.price
+              },
+              discount_list: []
+            })
+          );
+          return;
         }
-      };
-      appliedProducts.push(discountDetail);
-      appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-      processedProductsMap.set(
-        product._id,
-        this.hooks.setProduct(originProduct, {
-          discount_list: [discountDetail],
-          price: 0,
-          total: (product.origin_total || product.total) - product.price,
-          origin_total: product.origin_total || product.total
-        })
-      );
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
+          return;
+        }
+        usedDiscounts.set(selectedDiscount.id, true);
+        const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+        const discountDetail = {
+          amount: product.price,
+          type: selectedDiscount.tag,
+          discount: {
+            resource_id: selectedDiscount.id,
+            title: selectedDiscount.format_title,
+            original_amount: product.origin_total,
+            product_id: selectedDiscount.product_id
+          }
+        };
+        appliedProducts.push(discountDetail);
+        appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
+        if (product.isClient) {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              discount_list: [discountDetail],
+              price: 0,
+              origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: (0, import_utils2.getProductTotalPrice)({
+                product: {
+                  price: "0"
+                },
+                bundle: product.bundle,
+                options: product.options
+              })
+            })
+          );
+        } else {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              discount_list: [discountDetail],
+              price: 0,
+              total: (product.origin_total || product.total) - product.price,
+              origin_total: product.origin_total || product.total
+            })
+          );
+        }
+      }
     });
     const processedProductList = productList.map((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
-      return processedProductsMap.get(product._id) || this.hooks.setProduct(originProduct, {
-        discount_list: [],
-        total: product.total,
-        origin_total: product.origin_total,
-        price: product.price
-      });
+      const getDefaultProduct = () => {
+        if (product.isClient) {
+          this.hooks.setProduct(originProduct, {
+            discount_list: [],
+            price: product.price,
+            origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+              product: {
+                original_price: product.original_price
+              },
+              bundle: product.bundle,
+              options: product.options
+            }),
+            total: (0, import_utils2.getProductTotalPrice)({
+              product: {
+                price: product.price
+              },
+              bundle: product.bundle,
+              options: product.options
+            })
+          });
+        } else {
+          this.hooks.setProduct(originProduct, {
+            discount_list: [],
+            total: product.total,
+            origin_total: product.origin_total,
+            price: product.price
+          });
+        }
+      };
+      return processedProductsMap.get(product._id) || getDefaultProduct();
     });
     const updatedDiscountList = addModeDiscount.map((discount) => {
       const applicableProducts = discountApplicability.get(discount.id) || [];