@pisell/pisellos 0.0.14 → 0.0.15

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

@@ -36,6 +36,10 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      * 获取购物车商品
      */
     getItems(): CartItem[];
+    /**
+     * 根据账户ID获取购物车
+     */
+    getCartByAccount(account_id: string | number): CartItem[];
     /**
      * 移除购物车商品
      */
@@ -45,9 +49,9 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      */
     clearCartByAccount(account_id: string): void;
     /**
-     * 根据账户ID获取购物车
+     * 清除购物车商品中的信息
      */
-    getCartByAccount(account_id: string | number): CartItem[];
+    deleteCartItemInfo(types: "resource" | "time"): void;
     /**
      * 清除购物车
      */

package/dist/modules/Cart/index.js

@@ -22,8 +22,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 { CartHooks } from "./types";
-import { createCartItemOrigin, formatAccountToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
+import { createCartItemOrigin, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
 import { cloneDeep } from "lodash-es";
 export * from "./types";
 
@@ -75,9 +74,9 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("购物车模块需要 window 插件支持");
             case 9:
-              this.store.temp = {};
+              // this.store.temp = {};
               console.log("[CartModule] 初始化完成");
-            case 11:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -127,11 +126,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
 
               // 触发事件
               _context2.next = 8;
-              return this.core.effects.emit(CartHooks.OnAddItem, cartItem);
+              return this.core.effects.emit("".concat(this.name, ":onAddItem"), cartItem);
             case 8:
-              _context2.next = 10;
-              return this.core.effects.emit("".concat(this.name, ":changed"), items);
-            case 10:
             case "end":
               return _context2.stop();
           }
@@ -165,22 +161,19 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               this.store.list = _toConsumableArray(items);
               // 触发事件
               _context3.next = 6;
-              return this.core.effects.emit(CartHooks.OnCartUpdateItem, tempCartItem);
+              return this.core.effects.emit("".concat(this.name, ":onUpdateItem"), tempCartItem);
             case 6:
-              _context3.next = 8;
-              return this.core.effects.emit("".concat(this.name, ":changed"), items);
-            case 8:
-              _context3.next = 13;
+              _context3.next = 11;
               break;
-            case 10:
-              _context3.prev = 10;
+            case 8:
+              _context3.prev = 8;
               _context3.t0 = _context3["catch"](0);
               console.error("[CartModule] 更新购物车商品失败", _context3.t0);
-            case 13:
+            case 11:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 10]]);
+        }, _callee3, this, [[0, 8]]);
       }));
       function updateItem(_x4) {
         return _updateItem.apply(this, arguments);
@@ -254,11 +247,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              this.store.list = items || [];
-              // 触发事件
-              _context4.next = 3;
-              return this.core.effects.emit("".concat(this.name, ":changed"), items);
-            case 3:
+              this.store.list = _toConsumableArray(items || []);
+            case 1:
             case "end":
               return _context4.stop();
           }
@@ -279,6 +269,17 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
       return this.store.list;
     }
 
+    /**
+     * 根据账户ID获取购物车
+     */
+  }, {
+    key: "getCartByAccount",
+    value: function getCartByAccount(account_id) {
+      return this.store.list.filter(function (item) {
+        return item.holder_id === account_id;
+      });
+    }
+
     /**
      * 移除购物车商品
      */
@@ -295,7 +296,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.list = items;
               _context5.next = 4;
-              return this.core.effects.emit(CartHooks.OnCartRemove, items);
+              return this.core.effects.emit("".concat(this.name, ":onRemoveItem"), items);
             case 4:
             case "end":
               return _context5.stop();
@@ -314,20 +315,29 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearCartByAccount",
     value: function clearCartByAccount(account_id) {
-      this.store.list = this.store.list.filter(function (item) {
+      var items = this.store.list.filter(function (item) {
         return item.holder_id !== account_id;
       });
+      this.store.list = _toConsumableArray(items || []);
     }
 
     /**
-     * 根据账户ID获取购物车
+     * 清除购物车商品中的信息
      */
   }, {
-    key: "getCartByAccount",
-    value: function getCartByAccount(account_id) {
-      return this.store.list.filter(function (item) {
-        return item.holder_id === account_id;
+    key: "deleteCartItemInfo",
+    value: function deleteCartItemInfo(types) {
+      var list = this.store.list.map(function (item) {
+        // 清除购物车商品中的资源信息
+        if (types === "resource") {
+          item = deleteResourceFromCartItem(item);
+        } else if (types === "time") {
+          // 清除购物车商品中的时间信息
+          item = deleteTimeFromCartItem(item);
+        }
+        return item;
       });
+      this.store.list = _toConsumableArray(list);
     }
 
     /**

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

@@ -88,14 +88,14 @@ export interface CartItem {
     _origin: any;
     /** 商品原始数据 */
     _productOrigin?: ProductData;
+    /** 资源原始数据 */
+    _resourceOrigin?: Resource[];
 }
 /**
  * 购物车状态接口
  */
 export interface CartState {
     list: CartItem[];
-    total: number;
-    temp: Record<string, any>;
 }
 /**
  * 添加商品到购物车参数

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

@@ -90,6 +90,18 @@ export declare const formatResourceToCartItemOrigin: (params: {
     cartItem: CartItem;
     resources: Resource[];
 }) => any;
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
+/**
+ * 从购物车中删除时间
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
 /**
  * 格式化备注到购物车
  * @param params 参数

package/dist/modules/Cart/utils.js

@@ -209,6 +209,7 @@ export var formatResourceToCartItem = function formatResourceToCartItem(params)
   }
   var oringin = formatResourceToCartItemOrigin(params);
   cartItem._origin = oringin;
+  cartItem._resourceOrigin = resources;
   return cartItem;
 };
 export var formatResourceToCartItemOrigin = function formatResourceToCartItemOrigin(params) {
@@ -244,6 +245,54 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
   return origin;
 };
 
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cartItem) {
+  // 删除UI层的数据
+  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;
+
+  // 删除资源原始数据
+  delete cartItem._resourceOrigin;
+
+  // 删除原始数据
+  cartItem._origin.resources = null;
+  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;
+};
+
+/**
+ * 从购物车中删除时间
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
+  // 删除UI层的数据
+  cartItem.start_date = undefined;
+  cartItem.start_time = undefined;
+  cartItem.end_date = undefined;
+  cartItem.end_time = undefined;
+
+  // 删除原始数据
+  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;
+};
+
 /**
  * 格式化备注到购物车
  * @param params 参数

package/dist/modules/Summary/utils.js

@@ -24,9 +24,8 @@ export var calculateSubtotal = function calculateSubtotal(items) {
     return "0.00";
   }
   var subtotal = items.reduce(function (sum, item) {
-    var price = new Decimal(item.price || 0);
-    var quantity = new Decimal(item.num || 1);
-    return sum.plus(price.times(quantity));
+    var cartItemTotalPrice = new Decimal(item.total || 0);
+    return sum.plus(cartItemTotalPrice);
   }, new Decimal(0));
   return subtotal.toFixed(2);
 };
@@ -47,9 +46,9 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
     is_price_include_tax = _ref.is_price_include_tax,
     tax_rate = _ref.tax_rate;
   var totalTaxFee = items.reduce(function (sum, item) {
-    var price = new Decimal(item.price || 0);
+    var cartItemTotalPrice = new Decimal(item.total || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
-    var productTaxRate = price.times(taxRate).times((item === null || item === void 0 ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
+    var productTaxRate = cartItemTotalPrice.times(taxRate).times((item === null || item === void 0 ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);
   }, new Decimal(0));
   return totalTaxFee;

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

@@ -1,7 +1,7 @@
 import { Module, PisellCore } from "../../types";
 import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepState } from "./types";
-import { IUpdateItemParams, ProductData } from "../../modules";
+import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
 import { IStep } from "../../modules/Step/tyeps";
 import { TimeSliceItem } from "./utils/resources";
@@ -39,7 +39,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     removeAccount(id: string): void;
     setDateRange(dateRange: ITime[]): Promise<void>;
     getRangeDate(): Promise<string>;
-    getCart(): Promise<import("../../modules").CartItem[]>;
+    getCart(): Promise<CartItem[]>;
     getAvailableDate(params?: {
         products?: ProductData[];
         startDate?: string;
@@ -66,9 +66,17 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }): Promise<void>;
     getOtherParams(): Promise<Record<string, any>>;
     updateCart(params: IUpdateItemParams): void;
-    deleteCart(product_id: string): void;
+    deleteCart(cartItemId: string): void;
     clearCart(): void;
     clearCartByAccount(account_id: string): void;
+    /**
+     * 批量更新购物车
+     */
+    batchUpdateCart(paramsList: IUpdateItemParams[]): void;
+    /**
+     * 从购物车中按类别删除信息
+     */
+    deleteCartItemInfo(types: "resource" | "time"): void;
     destory(): void;
     getResourcesList(): any[];
     getResourceTimeSlot({ product, resources, currentResourceId, }: {

package/dist/solution/BookingByStep/index.js

@@ -637,7 +637,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 删除购物车里某个商品
   }, {
     key: "deleteCart",
-    value: function deleteCart(product_id) {}
+    value: function deleteCart(cartItemId) {
+      this.store.cart.removeItem(cartItemId);
+    }
 
     // 清空购物车
   }, {
@@ -652,6 +654,30 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function clearCartByAccount(account_id) {
       this.store.cart.clearCartByAccount(account_id);
     }
+
+    /**
+     * 批量更新购物车
+     */
+  }, {
+    key: "batchUpdateCart",
+    value: function batchUpdateCart(paramsList) {
+      var _this5 = this;
+      var cartItems = [];
+      paramsList.forEach(function (params) {
+        var cartItem = _this5.store.cart.formatCartItem(params);
+        cartItems.push(cartItem);
+      });
+      this.store.cart.batchSetItems(cartItems);
+    }
+
+    /**
+     * 从购物车中按类别删除信息
+     */
+  }, {
+    key: "deleteCartItemInfo",
+    value: function deleteCartItemInfo(types) {
+      this.store.cart.deleteCartItemInfo(types);
+    }
   }, {
     key: "destory",
     value: function destory() {
@@ -888,7 +914,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
-      var _this5 = this;
+      var _this6 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       dateRange.forEach(function (n) {
@@ -898,27 +924,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 一个账号一个账号处理
       var errorList = [];
       this.store.accountList.getAccounts().forEach(function (account) {
-        var cartItems = _this5.store.cart.getCartByAccount(account.getId());
+        var cartItems = _this6.store.cart.getCartByAccount(account.getId());
         // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-        var allCartItems = _this5.store.cart.getItems();
+        var allCartItems = _this6.store.cart.getItems();
         cartItems.forEach(function (item) {
           if (timeSlots) {
             // 如果传递了 timeSlots，代表是第二种资源，则直接拿 timeSlots 去匹配
-            var res = _this5.autoSelectAccountResources({
+            var res = _this6.autoSelectAccountResources({
               holder_id: item.holder_id,
               resources_code: resources_code,
               timeSlots: timeSlots
             });
             if (res !== null && res !== void 0 && res.selectedResource) {
-              console.log(_this5.store.cart.getItems());
-              _this5.store.cart.updateItem({
+              console.log(_this6.store.cart.getItems());
+              _this6.store.cart.updateItem({
                 _id: item._id,
                 // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
-                  return existingRes.resourceType !== res.selectedResource.resourceType;
+                  return existingRes.form_id !== res.selectedResource.form_id;
                 })), [res.selectedResource])
               });
-              console.log(_this5.store.cart.getItems());
+              console.log(_this6.store.cart.getItems());
             } else {
               // 如果没有可用的技师了，推到错误列表里让 UI 去提示
               errorList.push(item._id);
@@ -932,7 +958,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return n.code === resources_code;
             })) === null || _productResources$fin === void 0 ? void 0 : _productResources$fin.renderList;
             if (targetRenderList && targetRenderList.length > 0) {
-              _this5.store.cart.updateItem({
+              _this6.store.cart.updateItem({
                 _id: item._id,
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
                   return existingRes.resourceType !== targetRenderList[0].resourceType;
@@ -953,7 +979,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
-      var _this6 = this;
+      var _this7 = this;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
@@ -975,7 +1001,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // duration = 不同账号的最长时间
       this.store.accountList.getAccounts().forEach(function (account) {
         var accountDuration = 0;
-        var cartItems = _this6.store.cart.getCartByAccount(account.getId());
+        var cartItems = _this7.store.cart.getCartByAccount(account.getId());
         cartItems.forEach(function (item) {
           var _item$_productOrigin$, _item$_productOrigin3;
           accountDuration += (_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0;
@@ -1023,7 +1049,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTimeSlot",
     value: function submitTimeSlot(timeSlots) {
-      var _this7 = this;
+      var _this8 = this;
       var cartItems = this.store.cart.getItems();
       cartItems.forEach(function (item) {
         var newResources = cloneDeep(item._origin.resources);
@@ -1033,7 +1059,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           n.endTime = dayjs(n.startTime).add((_item$_productOrigin$2 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref8 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.type) !== null && _ref8 !== void 0 ? _ref8 : "minutes").format("YYYY-MM-DD HH:mm");
           delete n.times;
         });
-        _this7.store.cart.updateItem({
+        _this8.store.cart.updateItem({
           _id: item._id,
           resources: newResources
         });

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

@@ -36,6 +36,10 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      * 获取购物车商品
      */
     getItems(): CartItem[];
+    /**
+     * 根据账户ID获取购物车
+     */
+    getCartByAccount(account_id: string | number): CartItem[];
     /**
      * 移除购物车商品
      */
@@ -45,9 +49,9 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      */
     clearCartByAccount(account_id: string): void;
     /**
-     * 根据账户ID获取购物车
+     * 清除购物车商品中的信息
      */
-    getCartByAccount(account_id: string | number): CartItem[];
+    deleteCartItemInfo(types: "resource" | "time"): void;
     /**
      * 清除购物车
      */

package/lib/modules/Cart/index.js

@@ -24,7 +24,6 @@ __export(Cart_exports, {
 });
 module.exports = __toCommonJS(Cart_exports);
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
 __reExport(Cart_exports, require("./types"), module.exports);
@@ -50,7 +49,6 @@ var CartModule = class extends import_BaseModule.BaseModule {
     if (!this.window) {
       throw new Error("购物车模块需要 window 插件支持");
     }
-    this.store.temp = {};
     console.log("[CartModule] 初始化完成");
   }
   /**
@@ -71,8 +69,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
     }
     const items = [...this.store.list, cartItem];
     this.store.list = items;
-    await this.core.effects.emit(import_types.CartHooks.OnAddItem, cartItem);
-    await this.core.effects.emit(`${this.name}:changed`, items);
+    await this.core.effects.emit(`${this.name}:onAddItem`, cartItem);
   }
   /**
    * 更新购物车信息
@@ -87,8 +84,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
         return item;
       });
       this.store.list = [...items];
-      await this.core.effects.emit(import_types.CartHooks.OnCartUpdateItem, tempCartItem);
-      await this.core.effects.emit(`${this.name}:changed`, items);
+      await this.core.effects.emit(`${this.name}:onUpdateItem`, tempCartItem);
     } catch (error) {
       console.error("[CartModule] 更新购物车商品失败", error);
     }
@@ -127,8 +123,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 批量设置购物车数据
    */
   async batchSetItems(items) {
-    this.store.list = items || [];
-    await this.core.effects.emit(`${this.name}:changed`, items);
+    this.store.list = [...items || []];
   }
   /**
    * 获取购物车商品
@@ -136,25 +131,40 @@ var CartModule = class extends import_BaseModule.BaseModule {
   getItems() {
     return this.store.list;
   }
+  /**
+   * 根据账户ID获取购物车
+   */
+  getCartByAccount(account_id) {
+    return this.store.list.filter((item) => item.holder_id === account_id);
+  }
   /**
    * 移除购物车商品
    */
   async removeItem(id) {
     const items = this.store.list.filter((i) => i._id !== id);
     this.store.list = items;
-    await this.core.effects.emit(import_types.CartHooks.OnCartRemove, items);
+    await this.core.effects.emit(`${this.name}:onRemoveItem`, items);
   }
   /**
    * 根据账户ID清除购物车
    */
   clearCartByAccount(account_id) {
-    this.store.list = this.store.list.filter((item) => item.holder_id !== account_id);
+    const items = this.store.list.filter((item) => item.holder_id !== account_id);
+    this.store.list = [...items || []];
   }
   /**
-   * 根据账户ID获取购物车
+   * 清除购物车商品中的信息
    */
-  getCartByAccount(account_id) {
-    return this.store.list.filter((item) => item.holder_id === account_id);
+  deleteCartItemInfo(types) {
+    const list = this.store.list.map((item) => {
+      if (types === "resource") {
+        item = (0, import_utils.deleteResourceFromCartItem)(item);
+      } else if (types === "time") {
+        item = (0, import_utils.deleteTimeFromCartItem)(item);
+      }
+      return item;
+    });
+    this.store.list = [...list];
   }
   /**
    * 清除购物车

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

@@ -88,14 +88,14 @@ export interface CartItem {
     _origin: any;
     /** 商品原始数据 */
     _productOrigin?: ProductData;
+    /** 资源原始数据 */
+    _resourceOrigin?: Resource[];
 }
 /**
  * 购物车状态接口
  */
 export interface CartState {
     list: CartItem[];
-    total: number;
-    temp: Record<string, any>;
 }
 /**
  * 添加商品到购物车参数

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

@@ -90,6 +90,18 @@ export declare const formatResourceToCartItemOrigin: (params: {
     cartItem: CartItem;
     resources: Resource[];
 }) => any;
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
+/**
+ * 从购物车中删除时间
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
 /**
  * 格式化备注到购物车
  * @param params 参数

package/lib/modules/Cart/utils.js

@@ -30,6 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   createCartItemOrigin: () => createCartItemOrigin,
+  deleteResourceFromCartItem: () => deleteResourceFromCartItem,
+  deleteTimeFromCartItem: () => deleteTimeFromCartItem,
   formatAccountToCartItem: () => formatAccountToCartItem,
   formatAccountToCartItemOrigin: () => formatAccountToCartItemOrigin,
   formatBundle: () => formatBundle,
@@ -196,6 +198,7 @@ var formatResourceToCartItem = (params) => {
   }
   const oringin = formatResourceToCartItemOrigin(params);
   cartItem._origin = oringin;
+  cartItem._resourceOrigin = resources;
   return cartItem;
 };
 var formatResourceToCartItemOrigin = (params) => {
@@ -226,6 +229,34 @@ var formatResourceToCartItemOrigin = (params) => {
   }
   return origin;
 };
+var deleteResourceFromCartItem = (cartItem) => {
+  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;
+  delete cartItem._resourceOrigin;
+  cartItem._origin.resources = null;
+  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 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 formatNoteToCartItem = (params) => {
   const { cartItem, note } = params;
   cartItem.note = note;
@@ -340,6 +371,8 @@ var getProductOriginTotalPrice = (params) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createCartItemOrigin,
+  deleteResourceFromCartItem,
+  deleteTimeFromCartItem,
   formatAccountToCartItem,
   formatAccountToCartItemOrigin,
   formatBundle,

package/lib/modules/Summary/utils.js

@@ -52,9 +52,8 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
-    const quantity = new import_decimal.default(item.num || 1);
-    return sum.plus(price.times(quantity));
+    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    return sum.plus(cartItemTotalPrice);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
@@ -64,9 +63,9 @@ var calculateTaxFee = (shopInfo, items) => {
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   const totalTaxFee = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
-    const productTaxRate = price.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
+    const productTaxRate = cartItemTotalPrice.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);
   }, new import_decimal.default(0));
   return totalTaxFee;

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

@@ -1,7 +1,7 @@
 import { Module, PisellCore } from "../../types";
 import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepState } from "./types";
-import { IUpdateItemParams, ProductData } from "../../modules";
+import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
 import { IStep } from "../../modules/Step/tyeps";
 import { TimeSliceItem } from "./utils/resources";
@@ -39,7 +39,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     removeAccount(id: string): void;
     setDateRange(dateRange: ITime[]): Promise<void>;
     getRangeDate(): Promise<string>;
-    getCart(): Promise<import("../../modules").CartItem[]>;
+    getCart(): Promise<CartItem[]>;
     getAvailableDate(params?: {
         products?: ProductData[];
         startDate?: string;
@@ -66,9 +66,17 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }): Promise<void>;
     getOtherParams(): Promise<Record<string, any>>;
     updateCart(params: IUpdateItemParams): void;
-    deleteCart(product_id: string): void;
+    deleteCart(cartItemId: string): void;
     clearCart(): void;
     clearCartByAccount(account_id: string): void;
+    /**
+     * 批量更新购物车
+     */
+    batchUpdateCart(paramsList: IUpdateItemParams[]): void;
+    /**
+     * 从购物车中按类别删除信息
+     */
+    deleteCartItemInfo(types: "resource" | "time"): void;
     destory(): void;
     getResourcesList(): any[];
     getResourceTimeSlot({ product, resources, currentResourceId, }: {

package/lib/solution/BookingByStep/index.js

@@ -272,7 +272,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     this.store.cart.updateItem(params);
   }
   // 删除购物车里某个商品
-  deleteCart(product_id) {
+  deleteCart(cartItemId) {
+    this.store.cart.removeItem(cartItemId);
   }
   // 清空购物车
   clearCart() {
@@ -282,6 +283,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   clearCartByAccount(account_id) {
     this.store.cart.clearCartByAccount(account_id);
   }
+  /**
+   * 批量更新购物车
+   */
+  batchUpdateCart(paramsList) {
+    const cartItems = [];
+    paramsList.forEach((params) => {
+      const cartItem = this.store.cart.formatCartItem(params);
+      cartItems.push(cartItem);
+    });
+    this.store.cart.batchSetItems(cartItems);
+  }
+  /**
+   * 从购物车中按类别删除信息
+   */
+  deleteCartItemInfo(types) {
+    this.store.cart.deleteCartItemInfo(types);
+  }
   destory() {
     var _a, _b, _c, _d, _e, _f;
     (_a = this.store.cart) == null ? void 0 : _a.destory();
@@ -305,11 +323,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const arr = [];
     cartItems.forEach((cartItem) => {
-      const productResources = (0, import_resources.getResourcesByProduct)(
-        resourcesMap,
-        cartItem,
-        cartItems
-      );
+      const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, cartItem, cartItems);
       arr.push({
         id: cartItem.id,
         // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
@@ -484,7 +498,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
               resources: [
                 ...(item._origin.resources || []).filter(
-                  (existingRes) => existingRes.resourceType !== res.selectedResource.resourceType
+                  (existingRes) => existingRes.form_id !== res.selectedResource.form_id
                 ),
                 res.selectedResource
               ]
@@ -494,14 +508,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             errorList.push(item._id);
           }
         } else {
-          const productResources = (0, import_resources.getResourcesByProduct)(
-            resourcesMap,
-            item,
-            allCartItems
-          );
-          const targetRenderList = (_a = productResources.find(
-            (n) => n.code === resources_code
-          )) == null ? void 0 : _a.renderList;
+          const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, item, allCartItems);
+          const targetRenderList = (_a = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _a.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
             this.store.cart.updateItem({
               _id: item._id,
@@ -592,7 +600,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       newResources.forEach((n) => {
         var _a, _b, _c, _d;
         n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-        n.endTime = (0, import_dayjs.default)(n.startTime).add(((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0, ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes").format("YYYY-MM-DD HH:mm");
+        n.endTime = (0, import_dayjs.default)(n.startTime).add(
+          ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0,
+          ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
+        ).format("YYYY-MM-DD HH:mm");
         delete n.times;
       });
       this.store.cart.updateItem({

package/package.json

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