@pisell/pisellos 3.0.35 → 3.0.36

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

@@ -0,0 +1,102 @@
+import dayjs from 'dayjs';
+/**
+ * 格式化资源到购物车
+ * @param resource 资源
+ * @returns 格式化后的资源
+ */
+export var formatResourceToCartItem = function formatResourceToCartItem(params) {
+  var cartItem = params.cartItem,
+    resources = params.resources;
+  if (resources && resources !== null && resources !== void 0 && resources.length) {
+    var firstResource = resources[0];
+    cartItem.resource_id = firstResource === null || firstResource === void 0 ? void 0 : firstResource.id;
+    cartItem.relation_form_name = firstResource === null || firstResource === void 0 ? void 0 : firstResource.main_field;
+    if (firstResource.startTime && firstResource.endTime) {
+      cartItem.start_date = dayjs(firstResource.startTime).format('YYYY-MM-DD');
+      cartItem.start_time = dayjs(firstResource.startTime).format('HH:mm');
+      cartItem.end_date = dayjs(firstResource.endTime).format('YYYY-MM-DD');
+      cartItem.end_time = dayjs(firstResource.endTime).format('HH:mm');
+    }
+  } else {
+    cartItem.resource_id = undefined;
+    cartItem.relation_form_name = undefined;
+    cartItem.start_date = undefined;
+    cartItem.start_time = undefined;
+    cartItem.end_date = undefined;
+    cartItem.end_time = undefined;
+  }
+  var oringin = formatResourceToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  cartItem._resourceOrigin = resources;
+  return cartItem;
+};
+export var formatResourceToCartItemOrigin = function formatResourceToCartItemOrigin(params) {
+  var cartItem = params.cartItem,
+    resources = params.resources;
+  var origin = cartItem._origin;
+  if (resources && resources !== null && resources !== void 0 && resources.length) {
+    origin.resources = [];
+    // 接口只需要部分字段，需要处理
+    var checkResourcesFormat = function checkResourcesFormat(resources, arr) {
+      resources.forEach(function (resource) {
+        var _resource$children;
+        var childArr = [];
+        if (resource !== null && resource !== void 0 && (_resource$children = resource.children) !== null && _resource$children !== void 0 && _resource$children.length) {
+          checkResourcesFormat(resource.children, childArr);
+        }
+        var 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 || resource === void 0 ? void 0 : resource.capacity) || 0,
+          metadata: (resource === null || resource === void 0 ? void 0 : resource.metadata) || {} // 后端可以在这里挂一个前端用于计算的数据
+        };
+        if (childArr.length) {
+          obj.children = childArr;
+        }
+        arr.push(obj);
+      });
+    };
+    checkResourcesFormat(resources, origin.resources);
+    var _resources$ = resources[0],
+      startTime = _resources$.startTime,
+      endTime = _resources$.endTime;
+    if (startTime && endTime) {
+      origin.select_date = dayjs(startTime).format('YYYY-MM-DD');
+      origin.start_date = dayjs(startTime).format('YYYY-MM-DD');
+      origin.start_time = dayjs(startTime).format('HH:mm');
+      origin.end_date = dayjs(endTime).format('YYYY-MM-DD');
+      origin.end_time = dayjs(endTime).format('HH:mm');
+    }
+  } else if ((resources === null || resources === void 0 ? 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;
+};
+
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cartItem) {
+  // 删除UI层的数据
+  cartItem.resource_id = undefined;
+  cartItem.relation_form_name = undefined;
+
+  // 删除资源原始数据
+  delete cartItem._resourceOrigin;
+
+  // 删除原始数据
+  cartItem._origin.resources = null;
+  return cartItem;
+};

package/dist/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/dist/modules/Cart/utils/index.js

@@ -0,0 +1,63 @@
+export * from "./cartAccount";
+export * from "./cartDate";
+export * from "./cartDiscount";
+export * from "./cartNote";
+export * from "./cartProduct";
+export * from "./cartRelationForms";
+export * from "./cartResource";
+
+/**
+ * 生成一个唯一的 ID
+ */
+export var getUniqueId = function getUniqueId() {
+  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 11;
+  return prefix + (Math.random() + '').replace(/\D/g, '').substring(0, maxLength);
+};
+
+/**
+ * 创建购物车原始数据
+ */
+export var createCartItemOrigin = function 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
+  };
+};

package/dist/modules/Order/index.js

@@ -23,6 +23,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { generateDuration } from "./utils";
+import { isNormalProduct } from "../Product/utils";
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -83,8 +84,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             item._origin.duration = duration;
             item._origin.sub_type = durationType;
           }
-          // 零售都视为普通商品
-          if (order.type === 'virtual') {
+          // 购物车是否为普通商品
+          if (isNormalProduct(item._origin)) {
             var _order$relation_forms;
             order.relation_products.push(item._origin.product);
             var relationForms = item._origin.relation_forms || [];
@@ -98,8 +99,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
         if (order.type === 'appointment_booking') {
-          var firstCartItem = params.cartItems[0];
-          order.schedule_date = firstCartItem.start_date + ' ' + firstCartItem.start_time + ':00';
+          var _params$cartItems$fil;
+          var firstAppointmentCartItem = (_params$cartItems$fil = params.cartItems.filter(function (n) {
+            return !isNormalProduct(n._productOrigin);
+          })) === null || _params$cartItems$fil === void 0 ? void 0 : _params$cartItems$fil[0];
+          if (firstAppointmentCartItem) {
+            order.schedule_date = firstAppointmentCartItem.start_date + ' ' + firstAppointmentCartItem.start_time + ':00';
+          }
         }
         order.is_deposit = is_deposit;
       }

package/dist/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/dist/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/dist/modules/Product/utils.js

@@ -0,0 +1,41 @@
+/**
+ * 传入单个商品信息，通过商品上是否有 duration 或者 schedule.ids 来判断是否是普通商品
+ *
+ * @export
+ * @param {ProductData} product
+ * @return {*}  {boolean}
+ */
+export function isNormalProduct(product) {
+  var _product$scheduleIds;
+  // 如果有 duration 配置，则不是普通商品
+  if (product.duration) {
+    return false;
+  }
+
+  // 如果有 schedule.ids 且长度大于0，则不是普通商品
+  if ((_product$scheduleIds = product['schedule.ids']) !== null && _product$scheduleIds !== void 0 && _product$scheduleIds.length) {
+    return false;
+  }
+
+  // 既没有 duration 也没有 schedule.ids，则是普通商品
+  return true;
+}
+
+/**
+ * 传入多个商品信息，确定这些商品是否都是普通商品
+ *
+ * @export
+ * @param {ProductData[]} products
+ * @return {*}  {boolean}
+ */
+export function areAllNormalProducts(products) {
+  // 如果数组为空，返回 true
+  if (!products.length) {
+    return false;
+  }
+
+  // 检查所有商品是否都是普通商品
+  return products.every(function (product) {
+    return isNormalProduct(product);
+  });
+}

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

@@ -171,6 +171,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         }[]>;
         capacity?: number;
     }): {
+        selectedResource?: undefined;
+        timeSlots?: undefined;
+    } | {
         selectedResource: any;
         timeSlots?: undefined;
     } | {
@@ -210,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
      *
@@ -246,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;
 }