@pisell/pisellos 0.0.125 → 0.0.126

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

@@ -69,8 +69,10 @@ export interface CartItem {
     name?: string;
     /** 商品价格 */
     price?: number | string;
-    /** 商品总价 */
+    /** 单个商品包括商品本身价格+套餐价格+规格等价格得出来的 */
     total?: number | string;
+    /** 基于 total 乘以 商品数量的价格 */
+    summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
     /** 商品数量 */

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

@@ -61,6 +61,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       options: options,
       num: num
     });
+    cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product: product,
       bundle: bundle,
@@ -161,7 +162,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
     options = params.options;
-  var num = params.num || 1;
+  // const num = params.num || 1;
   var price = Number(product.price);
   if (bundle !== null && bundle !== void 0 && bundle.length) {
     price = bundle.reduce(function (accumulator, currentValue) {
@@ -175,7 +176,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 
 /**

package/dist/modules/Summary/utils.js

@@ -28,7 +28,7 @@ export var calculateSubtotal = function calculateSubtotal(items) {
     return '0.00';
   }
   var subtotal = items.reduce(function (sum, item) {
-    var cartItemTotalPrice = new Decimal(item.total || 0);
+    var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     return sum.plus(cartItemTotalPrice);
   }, new Decimal(0));
   return subtotal.toFixed(2);
@@ -50,7 +50,7 @@ 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 cartItemTotalPrice = new Decimal(item.total || 0);
+    var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
     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);

package/dist/solution/BookingByStep/index.js

@@ -2468,8 +2468,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
           // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
           // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
+
+          // n.start_at 是 2025-06-30 15:00 end_at 2025-06-30 17:00
+          // item.start 是 2025-06-30 16:00 item.end 是 2025-06-30 19:00
+          // 需要判断 n.start_at 和 n.end_at 是否在 item.start 和 item.end 之间
+          // 如果 n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
           var mTimes = m.times.filter(function (n) {
-            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute');
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {

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

@@ -69,8 +69,10 @@ export interface CartItem {
     name?: string;
     /** 商品价格 */
     price?: number | string;
-    /** 商品总价 */
+    /** 单个商品包括商品本身价格+套餐价格+规格等价格得出来的 */
     total?: number | string;
+    /** 基于 total 乘以 商品数量的价格 */
+    summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
     /** 商品数量 */

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

@@ -74,6 +74,7 @@ var formatProductToCartItem = (params) => {
     cartItem.price = product == null ? void 0 : product.price;
     cartItem.num = num;
     cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product,
       bundle,
@@ -163,7 +164,6 @@ var formatProductToCartItemOrigin = (params) => {
 };
 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) => {
@@ -175,7 +175,7 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options } = params;

package/lib/modules/Summary/utils.js

@@ -55,7 +55,7 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     return sum.plus(cartItemTotalPrice);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
@@ -66,7 +66,7 @@ var calculateTaxFee = (shopInfo, items) => {
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   const totalTaxFee = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
     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);

package/lib/solution/BookingByStep/index.js

@@ -1703,7 +1703,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         let currentResourcesCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         const mTimes = m.times.filter((n) => {
-          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute");
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
         });
         if (mTimes.length === 0) {
           return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.125",
+  "version": "0.0.126",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",
     "prepublishOnly": "npm run build",
-    "deploy": "yarn run build && yarn run changeset && yarn run version && npm run release"
+    "deploy": "npm run build && npm run changeset && npm run version && npm run release"
   },
   "repository": {
     "type": "git",
@@ -67,4 +67,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}