@pisell/pisellos 2.0.32 → 2.0.34

package/lib/solution/BookingByStep/index.js

@@ -43,6 +43,7 @@ var import_utils = require("../../modules/Resource/utils");
 var import_lodash_es = require("lodash-es");
 var import_utils2 = require("../../modules/Schedule/utils");
 var import_utils3 = require("../../modules/Date/utils");
+var import_utils4 = require("../../modules/Product/utils");
 var import_timeslots = require("./utils/timeslots");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
@@ -179,12 +180,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       {
         open_quotation: 1,
         open_bundle: 0,
-        extension_type: [
-          "product_appointment",
-          "appointment_ticket",
-          "session_product",
-          "session_ticket",
-          "normal"
+        exclude_extension_type: [
+          "product_party",
+          "product_event",
+          "product_series_event",
+          "product_package_ticket",
+          "ticket",
+          "event_item"
         ],
         with: ["category", "collection", "resourceRelation"],
         status: "published",
@@ -340,12 +342,30 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async storeProduct(productData) {
     const activeAccount = this.getActiveAccount();
-    const { bundle, options, origin, product_variant_id } = productData || {};
-    const product = { ...origin, product_variant_id };
+    const { bundle, options, origin, product_variant_id, quantity = 1, rowKey } = productData || {};
+    const cartItems = this.store.cart.getItems();
+    if (rowKey) {
+      const targetCartItem = cartItems.find((n) => {
+        var _a;
+        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
+      });
+      if (targetCartItem && (0, import_utils4.isNormalProduct)(targetCartItem._productOrigin)) {
+        this.store.cart.updateItem({
+          _id: targetCartItem._id,
+          product: {
+            ...targetCartItem._productOrigin
+          },
+          quantity: (targetCartItem.num || 1) + quantity
+        });
+        return;
+      }
+    }
+    const product = { ...origin, product_variant_id, rowKey };
     const addCartItem = {
       product,
       bundle,
-      options
+      options,
+      quantity
     };
     if (activeAccount) {
       addCartItem.account = activeAccount;
@@ -414,12 +434,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    * @param params
    */
   async fetchHolderAccountsAsync(params) {
-    var _a, _b, _c;
+    var _a, _b;
     const cartItems = this.store.cart.getItems();
     if (cartItems.length) {
       let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
       if (!date) {
-        date = ((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.start_date) || "";
+        const normalProductCartItem = cartItems.find((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+        date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
       }
       this.updateQuotationPriceAndCart(date);
     }
@@ -506,7 +527,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 如果用户登录
   async setLoginAccount(accountId, accountInfo) {
-    var _a, _b, _c;
+    var _a, _b;
     const account = this.store.accountList.getAccount(accountId);
     if (account) {
       let stateAccountId = account.getId();
@@ -525,7 +546,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (cartItems.length) {
         let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
         if (!date) {
-          date = ((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.start_date) || "";
+          const normalProductCartItem = cartItems.find((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+          date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
         }
         this.updateQuotationPriceAndCart(date);
       }
@@ -578,7 +600,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         item._origin.number = currentCapacity;
       }
     });
-    const type = this.otherParams.isRetailTemplate ? "virtual" : "appointment_booking";
+    let type = this.otherParams.isRetailTemplate ? "virtual" : "appointment_booking";
+    if ((0, import_utils4.areAllNormalProducts)(newCartItems.map((n) => n._productOrigin))) {
+      type = "virtual";
+    }
     return this.store.order.submitOrder({ query: { cartItems: newCartItems, type } });
   }
   // 拉起支付模块
@@ -755,7 +780,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    * @returns 不符合条件的购物车商品ID列表
    */
   checkCartItems(type) {
-    const cartItems = this.store.cart.getItems();
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const errorCartItemIds = [];
     cartItems.forEach((cartItem) => {
       const result = this.store.cart.checkCartItemByType(cartItem, type);
@@ -794,7 +819,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems();
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
       var _a, _b, _c;
@@ -923,7 +948,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems();
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
       var _a, _b, _c;
@@ -1037,7 +1062,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 给单个购物车里的商品获取资源列表
   getResourcesListByCartItem(id) {
     var _a, _b, _c;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     dateRange.forEach((n) => {
@@ -1120,6 +1145,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     capacity
   }) {
     var _a, _b, _c;
+    if ((0, import_utils4.isNormalProduct)(cartItem._productOrigin)) {
+      return {};
+    }
     const dateRange = this.store.date.getDateRange();
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     let accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
@@ -1423,7 +1451,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     };
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
       accountList.forEach((account) => {
         const cartItems2 = this.store.cart.getCartByAccount(account.getId());
@@ -1439,7 +1467,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     var _a, _b, _c, _d, _e, _f;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const resourceIds = [];
     let resourcesTypeId = void 0;
     let isSingleResource = false;
@@ -1537,7 +1565,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const itemsByAccount = cartItems.reduce(
       (acc, item) => {
         const holderId = item.holder_id;
@@ -1623,7 +1651,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const targetProduct = this.store.currentProduct;
     const targetProductData = product || (targetProduct == null ? void 0 : targetProduct.getData());
     let targetSchedules = [];
@@ -1657,15 +1685,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
     let allProductResources = productResources.flatMap((n) => n.renderList);
     allProductResources.sort((a, b) => {
-      var _a2, _b2, _c2, _d;
+      var _a2, _b2, _c2, _d2;
       const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
-      const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+      const bIsCombined = ((_d2 = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d2.status) === 1;
       if (aIsCombined && !bIsCombined)
         return 1;
       if (!aIsCombined && bIsCombined)
         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((n) => n.status === 1)) == null ? void 0 : _f.id;
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
@@ -1701,7 +1730,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false)) {
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false) && m.form_id === firstEnabledResourceId) {
           if (currentResourcesCount >= count) {
             count = currentResourcesCount;
           }
@@ -1728,7 +1757,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     date,
     account
   }) {
-    const { bundle, options, origin, product_variant_id } = product || {};
+    const { bundle, options, origin, product_variant_id, rowKey, quantity = 1 } = product || {};
     const productData = { ...origin, product_variant_id };
     if (!account) {
       const activeAccount = this.getActiveAccount();
@@ -1736,15 +1765,33 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         account = activeAccount;
       }
     }
+    if (rowKey) {
+      const cartItems = this.store.cart.getItems();
+      const targetCartItem = cartItems.find((n) => {
+        var _a;
+        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
+      });
+      if (targetCartItem && (0, import_utils4.isNormalProduct)(targetCartItem._productOrigin)) {
+        this.store.cart.updateItem({
+          _id: targetCartItem._id,
+          product: {
+            ...targetCartItem._productOrigin,
+            quantity: (targetCartItem.num || 1) + quantity
+          }
+        });
+        return;
+      }
+    }
     this.store.cart.addItem({
       product: productData,
       date,
       account,
       bundle,
-      options
+      options,
+      quantity
     });
     if (date) {
-      const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+      const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
       const cartItemsByDate = cartItems.filter(
         (n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day")
       );
@@ -1800,7 +1847,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems();
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const cartItem = cartItems.find((item) => item._id === cartItemId);
     if (!cartItem)
       return [];
@@ -2130,6 +2177,24 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       firstAvailableDate
     };
   }
+  isCartAllNormalProducts() {
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    return !cartItems.length;
+  }
+  isCartHasDurationProduct() {
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    return cartItems.some((n) => {
+      var _a;
+      return (_a = n._productOrigin) == null ? void 0 : _a.duration;
+    });
+  }
+  isTargetNormalProduct(product) {
+    return (0, import_utils4.isNormalProduct)(product);
+  }
+  isTargetCartIdNormalProduct(id) {
+    const cartItem = this.store.cart.getItems().find((n) => n._id === id);
+    return cartItem && (0, import_utils4.isNormalProduct)(cartItem._productOrigin);
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/ShopDiscount/index.js

@@ -27,7 +27,6 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
-var import_utils = require("./utils");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -173,7 +172,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isManualSelect: !isSelected
         };
       }
-      return discount;
+      return { ...discount, isManualSelect: !(discount == null ? void 0 : discount.isSelected) };
     });
     this.setDiscountList(newDiscountList);
     return this.calcDiscount(this.store.productList || [], {
@@ -288,13 +287,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         });
       }
     });
-    const newDiscountList = (0, import_utils.uniqueById)(
-      [
-        ...editModeDiscountList,
-        ...discountList.filter((item) => !item.isDisabled)
-      ],
-      "product_id"
-    );
+    const newDiscountList = [
+      ...editModeDiscountList,
+      ...discountList.filter((item) => !item.isDisabled)
+    ];
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
     this.emitDiscountListChange(newDiscountList);
     return newDiscountList;

package/package.json

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

package/dist/modules/Cart/utils.d.ts

@@ -1,258 +0,0 @@
-import { Account } from '../Account';
-import { ProductData } from '../Product/types';
-import { Resource } from '../Resource/types';
-import { CartItem, IDiscount } from './types';
-import Decimal from 'decimal.js';
-/**
- * 生成一个唯一的 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;
-    relation_type: string;
-    resources: null;
-    schedule_id: number;
-    start_date: null;
-    start_time: null;
-    select_date: null;
-    end_time: null;
-    end_date: null;
-    metadata: {};
-    holder: null;
-};
-/**
- * 格式化商品到购物车
- * @param product 商品
- * @returns 格式化后的商品
- */
-export declare const formatProductToCartItem: (params: {
-    cartItem: CartItem;
-    product: ProductData;
-    bundle?: any;
-    options?: any;
-    product_variant_id?: number;
-}) => CartItem;
-export declare const formatProductToCartItemOrigin: (params: {
-    cartItem: CartItem;
-    product: ProductData;
-    bundle?: any;
-    options?: any;
-    product_variant_id?: number;
-}) => any;
-/**
- * 格式化折扣到购物车
- * @param params 参数
- * @returns 格式化后的购物车
- */
-export declare const formatDiscountToCartItem: (params: {
-    cartItem: CartItem;
-    discounts: IDiscount[];
-}) => CartItem;
-/**
- * 格式化折扣到购物车原始数据
- * @param params 参数
- * @returns 格式化后的购物车原始数据
- */
-export declare const formatDiscountToCartItemOrigin: (params: {
-    cartItem: CartItem;
-    discounts: IDiscount[];
-}) => any;
-/**
- * 格式化账户到购物车
- * @param account 账户
- * @returns 格式化后的账户
- */
-export declare const formatAccountToCartItem: (params: {
-    cartItem: CartItem;
-    account: Account;
-}) => CartItem;
-export declare const formatAccountToCartItemOrigin: (params: {
-    cartItem: CartItem;
-    account: Account;
-}) => any;
-/**
- * 格式化资源到购物车
- * @param resource 资源
- * @returns 格式化后的资源
- */
-export declare const formatResourceToCartItem: (params: {
-    cartItem: CartItem;
-    resources: Resource[];
-}) => CartItem;
-export declare const formatResourceToCartItemOrigin: (params: {
-    cartItem: CartItem;
-    resources: Resource[];
-}) => any;
-/**
- * 格式化关联表单到购物车
- * @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 date 开始时间和结束时间
- * @returns 格式化后的日期
- */
-export declare const formatDateToCartItem: (params: {
-    cartItem: CartItem;
-    date: {
-        startTime: string;
-        endTime: string;
-    };
-}) => CartItem;
-/**
- * 格式化日期到购物车原始数据
- * @param date 开始时间和结束时间
- * @returns 格式化后的日期原始数据
- */
-export declare const formatDateToCartItemOrigin: (params: {
-    cartItem: CartItem;
-    date: {
-        startTime: string;
-        endTime: string;
-    };
-}) => any;
-/**
- * 格式化备注到购物车
- * @param params 参数
- * @returns 格式化后的购物车
- */
-export declare const formatNoteToCartItem: (params: {
-    cartItem: CartItem;
-    note: string;
-}) => CartItem;
-/**
- * 格式化备注到购物车原始数据
- * @param params 参数
- * @returns 格式化后的购物车原始数据
- */
-export declare const formatNoteToCartItemOrigin: (params: {
-    cartItem: CartItem;
-    note: string;
-}) => any;
-/**
- * 格式化套餐规格信息
- * @param options 套餐规格信息
- * @returns 格式化后的套餐规格信息
- */
-export declare const formatOptions: (options: any) => any;
-export declare const formatOptionsToOrigin: (options: any) => any;
-/**
- * 格式化商品套餐信息
- * @param bundle 商品套餐信息
- * @returns 格式化后的商品套餐信息
- */
-export declare const formatBundle: (bundle: any) => any;
-export declare const formatBundleToOrigin: (bundle: any) => any;
-/**
- * 判断是否是普通商品
- * @param product 商品
- * @returns 是否是普通商品
- */
-export declare const isNormalProduct: (product: any) => boolean;
-/**
- * 获取商品总价
- * @description 当前总价计算基于商品数量为1
- * @param item 商品
- * @returns 商品总价
- */
-export declare const getProductTotalPrice: (params: {
-    product: ProductData;
-    bundle?: any;
-    options?: any;
-    num?: number;
-}) => number;
-/**
- * 获取商品原始总价
- * @description 当前总价计算基于商品数量为1
- * @param item 商品
- * @returns 商品原始总价
- */
-export declare const getProductOriginTotalPrice: (params: {
-    product: ProductData;
-    bundle?: any;
-    options?: any;
-    num?: number;
-}) => number | undefined;
-/**
- * 获取商品定金
- * @description 定金基于商品售价来算，最终乘商品数量
- * 1、如果套餐主商品有定金规则，则定金为：（套餐商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
- * 2、如果套餐主商品没有定金规则，子商品有定金规则，则定金为：（套餐子商品售价 * 套餐子商品定金百分比 + 套餐子商品定金固定金额）* 商品数量，最终将所有子商品定金相加
- * 3、普通商品/单规格商品/组合规则商品，定金规则：（商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
- * @param params 参数
- * @returns 商品定金
- */
-export declare const getProductDeposit: (params: {
-    cartItem: CartItem;
-    product: ProductData;
-    bundle?: any;
-    options?: any;
-    num?: number;
-}) => {
-    total: number;
-    protocols: {
-        id: number;
-        title: string;
-    }[];
-} | null;
-/**
- * 计算商品定金
- * @param params 参数
- * @returns 商品定金
- */
-export declare const handleProductDeposit: (params: {
-    depositData: {
-        deposit_fixed?: string;
-        deposit_percentage?: string;
-    };
-    total: string | number;
-    num: number;
-}) => {
-    result: boolean;
-    depositTotal: Decimal;
-};
-/**
- * 从购物车中删除资源相关信息
- * @param cartItem 购物车
- * @returns 删除后的购物车
- */
-export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
-/**
- * 从购物车中删除时间
- * @param cartItem 购物车
- * @returns 删除后的购物车
- */
-export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
-/**
- * 从购物车中删除关联表单信息
- * @param cartItem 购物车
- * @returns 删除后的购物车
- */
-export declare const deleteRelationFormsFromCartItem: (cartItem: CartItem) => CartItem;
-export declare const deleteHolderFromCartItem: (cartItem: CartItem) => CartItem;