@pisell/pisellos 3.0.35 → 3.0.36

package/lib/modules/Cart/{utils.js → utils/cartProduct.js}

@@ -26,92 +26,48 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/modules/Cart/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  createCartItemOrigin: () => createCartItemOrigin,
-  deleteHolderFromCartItem: () => deleteHolderFromCartItem,
-  deleteRelationFormsFromCartItem: () => deleteRelationFormsFromCartItem,
-  deleteResourceFromCartItem: () => deleteResourceFromCartItem,
-  deleteTimeFromCartItem: () => deleteTimeFromCartItem,
-  formatAccountToCartItem: () => formatAccountToCartItem,
-  formatAccountToCartItemOrigin: () => formatAccountToCartItemOrigin,
+// src/modules/Cart/utils/cartProduct.ts
+var cartProduct_exports = {};
+__export(cartProduct_exports, {
   formatBundle: () => formatBundle,
   formatBundleToOrigin: () => formatBundleToOrigin,
-  formatDateToCartItem: () => formatDateToCartItem,
-  formatDateToCartItemOrigin: () => formatDateToCartItemOrigin,
-  formatDiscountToCartItem: () => formatDiscountToCartItem,
-  formatDiscountToCartItemOrigin: () => formatDiscountToCartItemOrigin,
-  formatNoteToCartItem: () => formatNoteToCartItem,
-  formatNoteToCartItemOrigin: () => formatNoteToCartItemOrigin,
   formatOptions: () => formatOptions,
   formatOptionsToOrigin: () => formatOptionsToOrigin,
   formatProductToCartItem: () => formatProductToCartItem,
   formatProductToCartItemOrigin: () => formatProductToCartItemOrigin,
-  formatRelationFormsToCartItem: () => formatRelationFormsToCartItem,
-  formatRelationFormsToCartItemOrigin: () => formatRelationFormsToCartItemOrigin,
-  formatResourceToCartItem: () => formatResourceToCartItem,
-  formatResourceToCartItemOrigin: () => formatResourceToCartItemOrigin,
   getProductDeposit: () => getProductDeposit,
   getProductOriginTotalPrice: () => getProductOriginTotalPrice,
   getProductTotalPrice: () => getProductTotalPrice,
-  getUniqueId: () => getUniqueId,
   handleProductDeposit: () => handleProductDeposit,
-  isNormalProduct: () => isNormalProduct
+  handleVariantProduct: () => handleVariantProduct
 });
-module.exports = __toCommonJS(utils_exports);
-var import_dayjs = __toESM(require("dayjs"));
+module.exports = __toCommonJS(cartProduct_exports);
 var import_decimal = __toESM(require("decimal.js"));
-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
-  };
+var import_utils = require("../../Product/utils");
+var handleVariantProduct = (product) => {
+  if (product == null ? void 0 : product.product_variant_id) {
+    const targetVariant = product.variant.find(
+      (n) => n.id === product.product_variant_id
+    );
+    if (targetVariant) {
+      product.price = targetVariant.price;
+      product.original_price = targetVariant.original_price;
+      product.is_charge_tax = targetVariant.is_charge_tax;
+    }
+  }
+  return product;
 };
 var formatProductToCartItem = (params) => {
   var _a, _b;
-  const { cartItem, product, bundle, options, product_variant_id } = params;
-  const num = 1;
+  const {
+    cartItem,
+    product,
+    bundle,
+    options,
+    product_variant_id,
+    quantity = 1
+  } = params;
+  const num = quantity;
   if (product) {
     cartItem.id = product == null ? void 0 : product.id;
     cartItem.name = product == null ? void 0 : product.title;
@@ -127,7 +83,7 @@ var formatProductToCartItem = (params) => {
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
     cartItem.duration = product == null ? void 0 : product.duration;
-    cartItem.isNormalProduct = isNormalProduct(product);
+    cartItem.isNormalProduct = (0, import_utils.isNormalProduct)(product);
     cartItem.is_charge_tax = product == null ? void 0 : product.is_charge_tax;
   }
   if (bundle == null ? void 0 : bundle.length) {
@@ -137,17 +93,25 @@ var formatProductToCartItem = (params) => {
     cartItem.options = formatOptions(options);
   }
   if (product_variant_id) {
-    const sku_key = (_a = product.variant.find((n) => n.id === product_variant_id)) == null ? void 0 : _a.sku_key;
+    const sku_key = (_a = product.variant.find(
+      (n) => n.id === product_variant_id
+    )) == null ? void 0 : _a.sku_key;
     if (sku_key) {
       const sku_key_arr = sku_key.split("_");
       const product_option_string = [];
       sku_key_arr.forEach((item) => {
         var _a2;
         const keyMap = item.split(":");
-        const targetVariantGroup = product.variant_group.find((n) => String(n.position_id) === keyMap[0]);
-        const targetVariantItem = (_a2 = targetVariantGroup == null ? void 0 : targetVariantGroup.variant_item) == null ? void 0 : _a2.find((n) => String(n.position_id) === keyMap[1]);
+        const targetVariantGroup = product.variant_group.find(
+          (n) => String(n.position_id) === keyMap[0]
+        );
+        const targetVariantItem = (_a2 = targetVariantGroup == null ? void 0 : targetVariantGroup.variant_item) == null ? void 0 : _a2.find(
+          (n) => String(n.position_id) === keyMap[1]
+        );
         if (targetVariantGroup && targetVariantItem) {
-          product_option_string.push(`${targetVariantGroup.name}:${targetVariantItem.name}`);
+          product_option_string.push(
+            `${targetVariantGroup.name}:${targetVariantItem.name}`
+          );
         }
       });
       cartItem.product_option_string = product_option_string.join(", ");
@@ -168,12 +132,19 @@ var formatProductToCartItem = (params) => {
 };
 var formatProductToCartItemOrigin = (params) => {
   var _a, _b, _c, _d;
-  const { cartItem, product, bundle, options, product_variant_id } = params;
+  const {
+    cartItem,
+    product,
+    bundle,
+    options,
+    product_variant_id,
+    quantity = 1
+  } = params;
   let origin = cartItem._origin;
   if (product) {
     origin.product = {
       ...origin.product || {},
-      num: 1,
+      num: quantity,
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: ((_a = origin.product) == null ? void 0 : _a.product_bundle) || [],
@@ -190,176 +161,40 @@ var formatProductToCartItemOrigin = (params) => {
   }
   return origin;
 };
-var formatDiscountToCartItem = (params) => {
-  const { cartItem } = params;
-  const oringin = formatDiscountToCartItemOrigin(params);
-  cartItem._origin = oringin;
-  return cartItem;
-};
-var formatDiscountToCartItemOrigin = (params) => {
-  const { cartItem, discounts } = params;
-  const origin = cartItem._origin;
-  if (discounts && (discounts == null ? void 0 : discounts.length)) {
-    if (!origin.product) {
-      origin.product = {};
-    }
-    origin.product.discount_list = discounts;
-  } else {
-    if (!origin.product) {
-      origin.product = {};
-    }
-    origin.product.discount_list = [];
-  }
-  return origin;
-};
-var formatAccountToCartItem = (params) => {
-  const { cartItem, account } = params;
-  if (account) {
-    cartItem.holder_id = account.id;
-    cartItem.holder_title = account.username;
+var getProductTotalPrice = (params) => {
+  const { product, bundle, options } = params;
+  const num = params.num || 1;
+  let price = Number(product.price);
+  if (bundle == null ? void 0 : bundle.length) {
+    price = bundle.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
   }
-  const oringin = formatAccountToCartItemOrigin(params);
-  cartItem._origin = oringin;
-  return cartItem;
-};
-var formatAccountToCartItemOrigin = (params) => {
-  const { cartItem, account } = params;
-  let origin = cartItem._origin;
-  if (account) {
-    if ((account == null ? void 0 : account.type) === "holder") {
-      const { customer_id, form_id, form_record_id } = (account == null ? void 0 : account._origin) || {};
-      origin.holder = {
-        customer_id,
-        form_id,
-        form_record: form_record_id ? [form_record_id] : null
-      };
-    } else {
-      origin.metadata.account = account;
-    }
+  if (options == null ? void 0 : options.length) {
+    price = options.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
   }
-  return origin;
+  return price * num;
 };
-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;
+var getProductOriginTotalPrice = (params) => {
+  const { product, bundle, options } = params;
+  const num = (params == null ? void 0 : params.num) || 1;
+  let price = Number(product.original_price);
+  if (isNaN(price) || price === 0) {
+    return 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;
+  if (bundle == null ? void 0 : bundle.length) {
+    price = bundle.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
   }
-  return origin;
-};
-var formatRelationFormsToCartItem = (params) => {
-  const { cartItem } = params;
-  const oringin = formatRelationFormsToCartItemOrigin(params);
-  cartItem._origin = oringin;
-  return cartItem;
-};
-var formatRelationFormsToCartItemOrigin = (params) => {
-  const { cartItem, relationForms } = params;
-  const origin = cartItem._origin;
-  origin.relation_forms = relationForms;
-  return origin;
-};
-var formatDateToCartItem = (params) => {
-  const { cartItem, date } = params;
-  cartItem.start_date = (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD");
-  cartItem.start_time = (0, import_dayjs.default)(date.startTime).format("HH:mm");
-  cartItem.end_date = (0, import_dayjs.default)(date.endTime).format("YYYY-MM-DD");
-  cartItem.end_time = (0, import_dayjs.default)(date.endTime).format("HH:mm");
-  const oringin = formatDateToCartItemOrigin(params);
-  cartItem._origin = oringin;
-  return cartItem;
-};
-var formatDateToCartItemOrigin = (params) => {
-  const { cartItem, date } = params;
-  const origin = cartItem._origin;
-  origin.select_date = (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD");
-  origin.start_date = (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD");
-  origin.start_time = (0, import_dayjs.default)(date.startTime).format("HH:mm");
-  origin.end_date = (0, import_dayjs.default)(date.endTime).format("YYYY-MM-DD");
-  origin.end_time = (0, import_dayjs.default)(date.endTime).format("HH:mm");
-  return origin;
-};
-var formatNoteToCartItem = (params) => {
-  const { cartItem, note } = params;
-  cartItem.note = note;
-  const oringin = formatNoteToCartItemOrigin(params);
-  cartItem._origin = oringin;
-  return cartItem;
-};
-var formatNoteToCartItemOrigin = (params) => {
-  const { cartItem, note } = params;
-  const origin = cartItem._origin;
-  if (!origin.product) {
-    origin.product = {};
+  if (options == null ? void 0 : options.length) {
+    price = options.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
   }
-  origin.product.note = note;
-  return origin;
+  return price * num;
 };
 var formatOptions = (options) => {
   if (!(options == null ? void 0 : options.length))
@@ -420,44 +255,6 @@ var formatBundleToOrigin = (bundle) => {
     };
   });
 };
-var isNormalProduct = (product) => {
-  return (product == null ? void 0 : product.extension_type) !== "product_appointment";
-};
-var getProductTotalPrice = (params) => {
-  const { product, bundle, options } = params;
-  const num = params.num || 1;
-  let price = Number(product.price);
-  if (bundle == null ? void 0 : bundle.length) {
-    price = bundle.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
-  if (options == null ? void 0 : options.length) {
-    price = options.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
-  return price * num;
-};
-var getProductOriginTotalPrice = (params) => {
-  const { product, bundle, options } = params;
-  const num = (params == null ? void 0 : params.num) || 1;
-  let price = Number(product.original_price);
-  if (isNaN(price) || price === 0) {
-    return void 0;
-  }
-  if (bundle == null ? void 0 : bundle.length) {
-    price = bundle.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
-  if (options == null ? void 0 : options.length) {
-    price = options.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
-  return price * num;
-};
 var getProductDeposit = (params) => {
   var _a;
   const { cartItem, product, bundle, options } = params;
@@ -526,64 +323,17 @@ var handleProductDeposit = (params) => {
   }
   return { result: false, depositTotal: new import_decimal.default(0) };
 };
-var deleteResourceFromCartItem = (cartItem) => {
-  cartItem.resource_id = void 0;
-  cartItem.relation_form_name = void 0;
-  delete cartItem._resourceOrigin;
-  cartItem._origin.resources = null;
-  return cartItem;
-};
-var deleteTimeFromCartItem = (cartItem) => {
-  cartItem.start_date = void 0;
-  cartItem.start_time = void 0;
-  cartItem.end_date = void 0;
-  cartItem.end_time = void 0;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
-  return cartItem;
-};
-var deleteRelationFormsFromCartItem = (cartItem) => {
-  cartItem._origin.relation_forms = null;
-  return cartItem;
-};
-var deleteHolderFromCartItem = (cartItem) => {
-  cartItem.holder_id = void 0;
-  cartItem.holder_title = void 0;
-  cartItem._origin.holder = null;
-  return cartItem;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createCartItemOrigin,
-  deleteHolderFromCartItem,
-  deleteRelationFormsFromCartItem,
-  deleteResourceFromCartItem,
-  deleteTimeFromCartItem,
-  formatAccountToCartItem,
-  formatAccountToCartItemOrigin,
   formatBundle,
   formatBundleToOrigin,
-  formatDateToCartItem,
-  formatDateToCartItemOrigin,
-  formatDiscountToCartItem,
-  formatDiscountToCartItemOrigin,
-  formatNoteToCartItem,
-  formatNoteToCartItemOrigin,
   formatOptions,
   formatOptionsToOrigin,
   formatProductToCartItem,
   formatProductToCartItemOrigin,
-  formatRelationFormsToCartItem,
-  formatRelationFormsToCartItemOrigin,
-  formatResourceToCartItem,
-  formatResourceToCartItemOrigin,
   getProductDeposit,
   getProductOriginTotalPrice,
   getProductTotalPrice,
-  getUniqueId,
   handleProductDeposit,
-  isNormalProduct
+  handleVariantProduct
 });

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

@@ -0,0 +1,26 @@
+import { CartItem } from '../types';
+/**
+ * 格式化关联表单到购物车
+ * @param params 参数
+ * @returns 格式化后的购物车
+ */
+export declare const formatRelationFormsToCartItem: (params: {
+    cartItem: CartItem;
+    relationForms: {
+        form_id: number;
+        form_record_ids: number[];
+    }[];
+}) => CartItem;
+export declare const formatRelationFormsToCartItemOrigin: (params: {
+    cartItem: CartItem;
+    relationForms: {
+        form_id: number;
+        form_record_ids: number[];
+    }[];
+}) => any;
+/**
+ * 从购物车中删除关联表单信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteRelationFormsFromCartItem: (cartItem: CartItem) => CartItem;

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

@@ -0,0 +1,48 @@
+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/Cart/utils/cartRelationForms.ts
+var cartRelationForms_exports = {};
+__export(cartRelationForms_exports, {
+  deleteRelationFormsFromCartItem: () => deleteRelationFormsFromCartItem,
+  formatRelationFormsToCartItem: () => formatRelationFormsToCartItem,
+  formatRelationFormsToCartItemOrigin: () => formatRelationFormsToCartItemOrigin
+});
+module.exports = __toCommonJS(cartRelationForms_exports);
+var formatRelationFormsToCartItem = (params) => {
+  const { cartItem } = params;
+  const oringin = formatRelationFormsToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  return cartItem;
+};
+var formatRelationFormsToCartItemOrigin = (params) => {
+  const { cartItem, relationForms } = params;
+  const origin = cartItem._origin;
+  origin.relation_forms = relationForms;
+  return origin;
+};
+var deleteRelationFormsFromCartItem = (cartItem) => {
+  cartItem._origin.relation_forms = null;
+  return cartItem;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  deleteRelationFormsFromCartItem,
+  formatRelationFormsToCartItem,
+  formatRelationFormsToCartItemOrigin
+});

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

@@ -0,0 +1,21 @@
+import { Resource } from '../../Resource/types';
+import { CartItem } from '../types';
+/**
+ * 格式化资源到购物车
+ * @param resource 资源
+ * @returns 格式化后的资源
+ */
+export declare const formatResourceToCartItem: (params: {
+    cartItem: CartItem;
+    resources: Resource[];
+}) => CartItem;
+export declare const formatResourceToCartItemOrigin: (params: {
+    cartItem: CartItem;
+    resources: Resource[];
+}) => any;
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;