@pisell/pisellos 3.0.34 → 3.0.36

package/lib/modules/Cart/utils/cartResource.js

@@ -0,0 +1,124 @@
+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/Cart/utils/cartResource.ts
+var cartResource_exports = {};
+__export(cartResource_exports, {
+  deleteResourceFromCartItem: () => deleteResourceFromCartItem,
+  formatResourceToCartItem: () => formatResourceToCartItem,
+  formatResourceToCartItemOrigin: () => formatResourceToCartItemOrigin
+});
+module.exports = __toCommonJS(cartResource_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var formatResourceToCartItem = (params) => {
+  const { cartItem, resources } = params;
+  if (resources && (resources == null ? void 0 : resources.length)) {
+    const firstResource = resources[0];
+    cartItem.resource_id = firstResource == null ? void 0 : firstResource.id;
+    cartItem.relation_form_name = firstResource == null ? void 0 : firstResource.main_field;
+    if (firstResource.startTime && firstResource.endTime) {
+      cartItem.start_date = (0, import_dayjs.default)(firstResource.startTime).format("YYYY-MM-DD");
+      cartItem.start_time = (0, import_dayjs.default)(firstResource.startTime).format("HH:mm");
+      cartItem.end_date = (0, import_dayjs.default)(firstResource.endTime).format("YYYY-MM-DD");
+      cartItem.end_time = (0, import_dayjs.default)(firstResource.endTime).format("HH:mm");
+    }
+  } else {
+    cartItem.resource_id = void 0;
+    cartItem.relation_form_name = void 0;
+    cartItem.start_date = void 0;
+    cartItem.start_time = void 0;
+    cartItem.end_date = void 0;
+    cartItem.end_time = void 0;
+  }
+  const oringin = formatResourceToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  cartItem._resourceOrigin = resources;
+  return cartItem;
+};
+var formatResourceToCartItemOrigin = (params) => {
+  const { cartItem, resources } = params;
+  let origin = cartItem._origin;
+  if (resources && (resources == null ? void 0 : resources.length)) {
+    origin.resources = [];
+    const checkResourcesFormat = (resources2, arr) => {
+      resources2.forEach((resource) => {
+        var _a;
+        const childArr = [];
+        if ((_a = resource == null ? void 0 : resource.children) == null ? void 0 : _a.length) {
+          checkResourcesFormat(resource.children, childArr);
+        }
+        const obj = {
+          relation_type: "form",
+          like_status: "common",
+          id: resource.id,
+          main_field: resource.main_field,
+          resourceType: resource.resourceType,
+          form_id: resource.form_id,
+          relation_id: resource.id,
+          capacity: (resource == null ? void 0 : resource.capacity) || 0,
+          metadata: (resource == null ? void 0 : resource.metadata) || {}
+          // 后端可以在这里挂一个前端用于计算的数据
+        };
+        if (childArr.length) {
+          obj.children = childArr;
+        }
+        arr.push(obj);
+      });
+    };
+    checkResourcesFormat(resources, origin.resources);
+    const { startTime, endTime } = resources[0];
+    if (startTime && endTime) {
+      origin.select_date = (0, import_dayjs.default)(startTime).format("YYYY-MM-DD");
+      origin.start_date = (0, import_dayjs.default)(startTime).format("YYYY-MM-DD");
+      origin.start_time = (0, import_dayjs.default)(startTime).format("HH:mm");
+      origin.end_date = (0, import_dayjs.default)(endTime).format("YYYY-MM-DD");
+      origin.end_time = (0, import_dayjs.default)(endTime).format("HH:mm");
+    }
+  } else if ((resources == null ? void 0 : resources.length) === 0) {
+    origin.resources = [];
+    origin.select_date = null;
+    origin.start_date = null;
+    origin.start_time = null;
+    origin.end_date = null;
+    origin.end_time = null;
+  }
+  return origin;
+};
+var deleteResourceFromCartItem = (cartItem) => {
+  cartItem.resource_id = void 0;
+  cartItem.relation_form_name = void 0;
+  delete cartItem._resourceOrigin;
+  cartItem._origin.resources = null;
+  return cartItem;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  deleteResourceFromCartItem,
+  formatResourceToCartItem,
+  formatResourceToCartItemOrigin
+});

package/lib/modules/Cart/utils/index.d.ts

@@ -0,0 +1,34 @@
+export * from './cartAccount';
+export * from './cartDate';
+export * from './cartDiscount';
+export * from './cartNote';
+export * from './cartProduct';
+export * from './cartRelationForms';
+export * from './cartResource';
+/**
+ * 生成一个唯一的 ID
+ */
+export declare const getUniqueId: (prefix?: string, maxLength?: number) => string;
+/**
+ * 创建购物车原始数据
+ */
+export declare const createCartItemOrigin: () => {
+    id: number;
+    number: number;
+    registration_type: string;
+    relation_products: never[];
+    is_all: boolean;
+    product: null;
+    sub_type: null;
+    duration: null;
+    like_status: string;
+    resources: null;
+    schedule_id: number;
+    start_date: null;
+    start_time: null;
+    select_date: null;
+    end_time: null;
+    end_date: null;
+    metadata: {};
+    holder: null;
+};

package/lib/modules/Cart/utils/index.js

@@ -0,0 +1,91 @@
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Cart/utils/index.ts
+var utils_exports = {};
+__export(utils_exports, {
+  createCartItemOrigin: () => createCartItemOrigin,
+  getUniqueId: () => getUniqueId
+});
+module.exports = __toCommonJS(utils_exports);
+__reExport(utils_exports, require("./cartAccount"), module.exports);
+__reExport(utils_exports, require("./cartDate"), module.exports);
+__reExport(utils_exports, require("./cartDiscount"), module.exports);
+__reExport(utils_exports, require("./cartNote"), module.exports);
+__reExport(utils_exports, require("./cartProduct"), module.exports);
+__reExport(utils_exports, require("./cartRelationForms"), module.exports);
+__reExport(utils_exports, require("./cartResource"), module.exports);
+var getUniqueId = (prefix = "", maxLength = 11) => {
+  return prefix + (Math.random() + "").replace(/\D/g, "").substring(0, maxLength);
+};
+var createCartItemOrigin = () => {
+  return {
+    // 新增为0
+    id: 0,
+    // 数量 固定为1
+    number: 1,
+    // 客户端报名所有活动;
+    registration_type: "all",
+    // 暂时不用
+    relation_products: [],
+    // 固定
+    is_all: false,
+    // 商品相关
+    product: null,
+    // 时长类型
+    sub_type: null,
+    // 时长
+    duration: null,
+    // 资源相关
+    // 资源状态 -固定
+    like_status: "common",
+    // 资源类型 - 固定--谭景琳备注：马天宇说现在平行资源是不传这个的
+    // relation_type: "form",
+    // 所选资源
+    resources: null,
+    // 日程id - 固定
+    schedule_id: 0,
+    // 所选开始时间
+    start_date: null,
+    // 所选开始时间
+    start_time: null,
+    // 所选开始时间
+    select_date: null,
+    // 所选结束时间
+    end_time: null,
+    // 所选结束时间
+    end_date: null,
+    // 额外信息
+    metadata: {},
+    // holder相关
+    holder: null
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createCartItemOrigin,
+  getUniqueId,
+  ...require("./cartAccount"),
+  ...require("./cartDate"),
+  ...require("./cartDiscount"),
+  ...require("./cartNote"),
+  ...require("./cartProduct"),
+  ...require("./cartRelationForms"),
+  ...require("./cartResource")
+});

package/lib/modules/Order/index.js

@@ -24,6 +24,7 @@ __export(Order_exports, {
 module.exports = __toCommonJS(Order_exports);
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
+var import_utils2 = require("../Product/utils");
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -36,6 +37,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.request = this.core.getPlugin("request");
   }
   createOrder(params) {
+    var _a;
     const order = {
       type: params.type || "appointment_booking",
       // 要从外面拿，virtual
@@ -57,7 +59,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           item._origin.duration = duration;
           item._origin.sub_type = durationType;
         }
-        if (order.type === "virtual") {
+        if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];
           order.relation_forms.push(...relationForms);
@@ -70,8 +72,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         }
       });
       if (order.type === "appointment_booking") {
-        const firstCartItem = params.cartItems[0];
-        order.schedule_date = firstCartItem.start_date + " " + firstCartItem.start_time + ":00";
+        const firstAppointmentCartItem = (_a = params.cartItems.filter((n) => !(0, import_utils2.isNormalProduct)(n._productOrigin))) == null ? void 0 : _a[0];
+        if (firstAppointmentCartItem) {
+          order.schedule_date = firstAppointmentCartItem.start_date + " " + firstAppointmentCartItem.start_time + ":00";
+        }
       }
       order.is_deposit = is_deposit;
     }

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

@@ -2,6 +2,8 @@
  * 商品基本信息接口
  */
 export interface ProductData {
+    /** 商品数量 */
+    quantity?: number;
     /** 商品id */
     id: number;
     /** 商品所属账户id */
@@ -180,6 +182,8 @@ export interface ProductData {
             title: string;
         }>;
     };
+    /** 购物车行键，用于唯一标识购物车中的商品，用于相同 SKU商品合并 */
+    rowKey?: string;
 }
 /**
  * 商品媒体信息接口

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

@@ -0,0 +1,17 @@
+import type { ProductData } from './types';
+/**
+ * 传入单个商品信息，通过商品上是否有 duration 或者 schedule.ids 来判断是否是普通商品
+ *
+ * @export
+ * @param {ProductData} product
+ * @return {*}  {boolean}
+ */
+export declare function isNormalProduct(product: ProductData): boolean;
+/**
+ * 传入多个商品信息，确定这些商品是否都是普通商品
+ *
+ * @export
+ * @param {ProductData[]} products
+ * @return {*}  {boolean}
+ */
+export declare function areAllNormalProducts(products: ProductData[]): boolean;

package/lib/modules/Product/utils.js

@@ -0,0 +1,46 @@
+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/modules/Product/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  areAllNormalProducts: () => areAllNormalProducts,
+  isNormalProduct: () => isNormalProduct
+});
+module.exports = __toCommonJS(utils_exports);
+function isNormalProduct(product) {
+  var _a;
+  if (product.duration) {
+    return false;
+  }
+  if ((_a = product["schedule.ids"]) == null ? void 0 : _a.length) {
+    return false;
+  }
+  return true;
+}
+function areAllNormalProducts(products) {
+  if (!products.length) {
+    return false;
+  }
+  return products.every((product) => isNormalProduct(product));
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  areAllNormalProducts,
+  isNormalProduct
+});

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

@@ -14,5 +14,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
     getAvailabilityScheduleDateList(): ScheduleAvailabilityDateItem[];
+    setOtherProductsIds(ids: number[]): void;
+    getOtherProductsIds(): number[];
     storeChange(): void;
 }

package/lib/modules/Schedule/index.js

@@ -63,6 +63,12 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
   getAvailabilityScheduleDateList() {
     return this.store.availabilityDateList;
   }
+  setOtherProductsIds(ids) {
+    this.store.otherProductsIds = ids;
+  }
+  getOtherProductsIds() {
+    return this.store.otherProductsIds;
+  }
   storeChange() {
     if (this.openCache) {
       const store = (0, import_lodash_es.cloneDeep)(this.store);

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

@@ -2,6 +2,7 @@ import dayjs from 'dayjs';
 export interface ScheduleState {
     scheduleList: ScheduleItem[];
     availabilityDateList: ScheduleAvailabilityDateItem[];
+    otherProductsIds: number[];
 }
 export type ScheduleAvailabilityDateItem = {
     date: string;

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

@@ -42,12 +42,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 更新step
      */
     updateStep(key: string, step: IStep): void;
-    loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
+    loadProducts({ category_ids, product_ids, collection, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
-        schedule_ids?: number[];
-        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
@@ -173,6 +171,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         }[]>;
         capacity?: number;
     }): {
+        selectedResource?: undefined;
+        timeSlots?: undefined;
+    } | {
         selectedResource: any;
         timeSlots?: undefined;
     } | {
@@ -200,6 +201,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         start_at: dayjs.Dayjs;
         end_at: dayjs.Dayjs;
         count: number;
+        left: number;
     }[];
     addProductToCart({ product, date, account, }: {
         product: ProductData;
@@ -211,7 +213,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }): void;
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *
@@ -247,4 +249,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         dateList: any;
         firstAvailableDate: any;
     }>;
+    isCartAllNormalProducts(): boolean;
+    isCartHasDurationProduct(): boolean;
+    isTargetNormalProduct(product: ProductData): boolean;
+    isTargetCartIdNormalProduct(id: string): boolean | undefined;
 }