@pisell/pisellos 2.0.15 → 2.0.17

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

@@ -216,11 +216,6 @@ export declare const getProductDeposit: (params: {
     total: number;
     protocols: {
         id: number;
-        /**
-         * 格式化折扣到购物车
-         * @param params 参数
-         * @returns 格式化后的购物车
-         */
         title: string;
     }[];
 } | null;

package/dist/modules/Cart/utils.js

@@ -542,16 +542,18 @@ export var getProductDeposit = function getProductDeposit(params) {
 
   // 判定商品是否有定金规则
   if ((product === null || product === void 0 || (_product$custom_depos2 = product.custom_deposit_data) === null || _product$custom_depos2 === void 0 ? void 0 : _product$custom_depos2.has_deposit) == 1) {
-    var protocols = [];
     var total = new Decimal(0);
     var _ref2 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
       deposit_fixed = _ref2.deposit_fixed,
       deposit_percentage = _ref2.deposit_percentage,
-      deposit_policy_data = _ref2.deposit_policy_data;
-    // 协议数据
-    protocols.push.apply(protocols, _toConsumableArray(deposit_policy_data || []));
+      deposit_policy_data = _ref2.deposit_policy_data,
+      self_deposit_policy_ids = _ref2.self_deposit_policy_ids;
+    // 所有协议数据
+    var allProtocols = deposit_policy_data || [];
     // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
     var productHasDeposit = false;
+    // 关联的定金协议id
+    var protocolIds = [];
 
     // 判断主商品是否有定金规则
     if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
@@ -564,19 +566,22 @@ export var getProductDeposit = function getProductDeposit(params) {
         result = _handleProductDeposit.result;
       if (result) {
         total = depositTotal;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(self_deposit_policy_ids || []));
         productHasDeposit = true;
       }
     } else {
       if (bundle !== null && bundle !== void 0 && bundle.length) {
-        total = bundle.reduce(function (accumulator, currentBundleProduct) {
+        total = bundle.reduce(function (accumulator, currBundleProduct) {
+          var depositData = currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.custom_deposit_data;
           var _handleProductDeposit2 = handleProductDeposit({
-              depositData: currentBundleProduct === null || currentBundleProduct === void 0 ? void 0 : currentBundleProduct.custom_deposit_data,
-              total: currentBundleProduct.price,
-              num: currentBundleProduct.num
+              depositData: depositData,
+              total: currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.price,
+              num: (currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.num) || 1
             }),
             depositTotal = _handleProductDeposit2.depositTotal,
             result = _handleProductDeposit2.result;
           if (result) {
+            protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
             productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
@@ -585,6 +590,10 @@ export var getProductDeposit = function getProductDeposit(params) {
       }
     }
     if (productHasDeposit) {
+      var ids = new Set(protocolIds);
+      var protocols = allProtocols.filter(function (item) {
+        return ids.has(item.id);
+      });
       return {
         total: total.toNumber(),
         protocols: protocols

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

@@ -168,6 +168,8 @@ export interface ProductData {
         deposit_fixed?: string;
         /** 定金百分比 */
         deposit_percentage?: string;
+        /** 关联的定金协议id */
+        self_deposit_policy_ids?: number[];
         /** 定金协议数据 */
         deposit_policy_data?: Array<{
             /** 定金协议id */

package/dist/solution/BookingByStep/index.js

@@ -1072,65 +1072,67 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 更新购物车后，需要判定购物车里是否存在多个账号选择了相同资源的情况，如果是，且资源是单个预约，则要把选择了相同资源的 product._origin.resources 给去除
       var cartItems = this.store.cart.getItems();
       cartItems.forEach(function (item) {
-        var _item$_origin$resourc;
-        var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
-          // 检查当前资源是否与目标资源的任何资源匹配
-          return !targetCartItem._origin.resources.some(function (targetRes) {
-            // 如果新更新进来的资源不是单个预约，其实就不需要检测了资源重叠了，但是需要检测资源 capacity 是否足够
-            if (targetRes.resourceType !== 'single') {
-              var _item$_productOrigin2;
-              var _formatCapacity = formatDefaultCapacitys({
-                capacity: (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.capacity,
-                product_bundle: item._origin.product.product_bundle
-              });
-              var _currentCapacity = getSumCapacity({
-                capacity: _formatCapacity
-              });
-              var originResource = allOriginResources.find(function (n) {
-                return n.id === targetRes.id;
-              });
-              if (currentResourcesCapacityMap[targetRes.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
-                return true;
+        if (item._id !== targetCartItem._id) {
+          var _item$_origin$resourc;
+          var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
+            // 检查当前资源是否与目标资源的任何资源匹配
+            return !targetCartItem._origin.resources.some(function (targetRes) {
+              // 如果新更新进来的资源不是单个预约，其实就不需要检测了资源重叠了，但是需要检测资源 capacity 是否足够
+              if (targetRes.resourceType !== 'single') {
+                var _item$_productOrigin2;
+                var _formatCapacity = formatDefaultCapacitys({
+                  capacity: (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.capacity,
+                  product_bundle: item._origin.product.product_bundle
+                });
+                var _currentCapacity = getSumCapacity({
+                  capacity: _formatCapacity
+                });
+                var originResource = allOriginResources.find(function (n) {
+                  return n.id === targetRes.id;
+                });
+                if (currentResourcesCapacityMap[targetRes.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
+                  return true;
+                }
+                currentResourcesCapacityMap[targetRes.id] += _currentCapacity;
+                return false;
+              }
+              if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {
+                var _targetRes$metadata$c, _m$metadata$combined_;
+                // 检查主资源ID是否匹配
+                if (targetRes.id === m.id) return true;
+                // 检查组合资源的情况
+                if (((_targetRes$metadata$c = targetRes.metadata.combined_resource) === null || _targetRes$metadata$c === void 0 ? void 0 : _targetRes$metadata$c.status) === 1 && (
+                // 如果现在选择的是组合资源，需要判断
+                // 1、当前其他购物车里是否选了当前组合资源的子资源
+                // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
+                targetRes.metadata.combined_resource.resource_ids.includes(m.id) || targetRes.metadata.combined_resource.resource_ids.some(function (n) {
+                  return m.metadata.combined_resource.resource_ids.includes(n);
+                }))) return true;
+                if (((_m$metadata$combined_ = m.metadata.combined_resource) === null || _m$metadata$combined_ === void 0 ? void 0 : _m$metadata$combined_.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id)) return true;
               }
-              currentResourcesCapacityMap[targetRes.id] += _currentCapacity;
               return false;
-            }
-            if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {
-              var _targetRes$metadata$c, _m$metadata$combined_;
-              // 检查主资源ID是否匹配
-              if (targetRes.id === m.id) return true;
-              // 检查组合资源的情况
-              if (((_targetRes$metadata$c = targetRes.metadata.combined_resource) === null || _targetRes$metadata$c === void 0 ? void 0 : _targetRes$metadata$c.status) === 1 && (
-              // 如果现在选择的是组合资源，需要判断
-              // 1、当前其他购物车里是否选了当前组合资源的子资源
-              // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
-              targetRes.metadata.combined_resource.resource_ids.includes(m.id) || targetRes.metadata.combined_resource.resource_ids.some(function (n) {
-                return m.metadata.combined_resource.resource_ids.includes(n);
-              }))) return true;
-              if (((_m$metadata$combined_ = m.metadata.combined_resource) === null || _m$metadata$combined_ === void 0 ? void 0 : _m$metadata$combined_.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id)) return true;
-            }
-            return false;
-          });
-        });
-        // session 类商品应该只调用清空 resource 的方法
-        if (item.start_time) {
-          var start_time = item.start_time;
-          var end_time = item.end_time;
-          var start_date = item.start_date;
-          var end_date = item.end_date;
-          _this5.store.cart.updateItem({
-            _id: item._id,
-            resources: resources,
-            date: {
-              startTime: dayjs("".concat(start_date, " ").concat(start_time)).format('YYYY-MM-DD HH:mm'),
-              endTime: dayjs("".concat(end_date, " ").concat(end_time)).format('YYYY-MM-DD HH:mm')
-            }
-          });
-        } else {
-          _this5.store.cart.updateItem({
-            _id: item._id,
-            resources: resources
+            });
           });
+          // session 类商品应该只调用清空 resource 的方法
+          if (item.start_time) {
+            var start_time = item.start_time;
+            var end_time = item.end_time;
+            var start_date = item.start_date;
+            var end_date = item.end_date;
+            _this5.store.cart.updateItem({
+              _id: item._id,
+              resources: resources,
+              date: {
+                startTime: dayjs("".concat(start_date, " ").concat(start_time)).format('YYYY-MM-DD HH:mm'),
+                endTime: dayjs("".concat(end_date, " ").concat(end_time)).format('YYYY-MM-DD HH:mm')
+              }
+            });
+          } else {
+            _this5.store.cart.updateItem({
+              _id: item._id,
+              resources: resources
+            });
+          }
         }
       });
     }

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

@@ -216,11 +216,6 @@ export declare const getProductDeposit: (params: {
     total: number;
     protocols: {
         id: number;
-        /**
-         * 格式化折扣到购物车
-         * @param params 参数
-         * @returns 格式化后的购物车
-         */
         title: string;
     }[];
 } | null;

package/lib/modules/Cart/utils.js

@@ -441,11 +441,16 @@ var getProductDeposit = (params) => {
   const { cartItem, product, bundle, options } = params;
   const num = (params == null ? void 0 : params.num) || 1;
   if (((_a = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _a.has_deposit) == 1) {
-    const protocols = [];
     let total = new import_decimal.default(0);
-    const { deposit_fixed, deposit_percentage, deposit_policy_data } = (product == null ? void 0 : product.custom_deposit_data) || {};
-    protocols.push(...deposit_policy_data || []);
+    const {
+      deposit_fixed,
+      deposit_percentage,
+      deposit_policy_data,
+      self_deposit_policy_ids
+    } = (product == null ? void 0 : product.custom_deposit_data) || {};
+    const allProtocols = deposit_policy_data || [];
     let productHasDeposit = false;
+    const protocolIds = [];
     if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
       const { depositTotal, result } = handleProductDeposit({
         depositData: product == null ? void 0 : product.custom_deposit_data,
@@ -454,17 +459,20 @@ var getProductDeposit = (params) => {
       });
       if (result) {
         total = depositTotal;
+        protocolIds.push(...self_deposit_policy_ids || []);
         productHasDeposit = true;
       }
     } else {
       if (bundle == null ? void 0 : bundle.length) {
-        total = bundle.reduce((accumulator, currentBundleProduct) => {
+        total = bundle.reduce((accumulator, currBundleProduct) => {
+          const depositData = currBundleProduct == null ? void 0 : currBundleProduct.custom_deposit_data;
           const { depositTotal, result } = handleProductDeposit({
-            depositData: currentBundleProduct == null ? void 0 : currentBundleProduct.custom_deposit_data,
-            total: currentBundleProduct.price,
-            num: currentBundleProduct.num
+            depositData,
+            total: currBundleProduct == null ? void 0 : currBundleProduct.price,
+            num: (currBundleProduct == null ? void 0 : currBundleProduct.num) || 1
           });
           if (result) {
+            protocolIds.push(...(depositData == null ? void 0 : depositData.self_deposit_policy_ids) || []);
             productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
@@ -473,6 +481,8 @@ var getProductDeposit = (params) => {
       }
     }
     if (productHasDeposit) {
+      const ids = new Set(protocolIds);
+      const protocols = allProtocols.filter((item) => ids.has(item.id));
       return { total: total.toNumber(), protocols };
     }
     return null;

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

@@ -168,6 +168,8 @@ export interface ProductData {
         deposit_fixed?: string;
         /** 定金百分比 */
         deposit_percentage?: string;
+        /** 关联的定金协议id */
+        self_deposit_policy_ids?: number[];
         /** 定金协议数据 */
         deposit_policy_data?: Array<{
             /** 定金协议id */

package/lib/solution/BookingByStep/index.js

@@ -530,62 +530,64 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     cartItems.forEach((item) => {
       var _a2;
-      const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
-        return !targetCartItem._origin.resources.some((targetRes) => {
-          var _a3, _b, _c;
-          if (targetRes.resourceType !== "single") {
-            const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
-              capacity: (_a3 = item._productOrigin) == null ? void 0 : _a3.capacity,
-              product_bundle: item._origin.product.product_bundle
-            });
-            const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
-            const originResource = allOriginResources.find((n) => n.id === targetRes.id);
-            if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
-              return true;
+      if (item._id !== targetCartItem._id) {
+        const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
+          return !targetCartItem._origin.resources.some((targetRes) => {
+            var _a3, _b, _c;
+            if (targetRes.resourceType !== "single") {
+              const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+                capacity: (_a3 = item._productOrigin) == null ? void 0 : _a3.capacity,
+                product_bundle: item._origin.product.product_bundle
+              });
+              const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+              const originResource = allOriginResources.find((n) => n.id === targetRes.id);
+              if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
+                return true;
+              }
+              currentResourcesCapacityMap[targetRes.id] += currentCapacity;
+              return false;
+            }
+            if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
+              if (targetRes.id === m.id)
+                return true;
+              if (((_b = targetRes.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && // 如果现在选择的是组合资源，需要判断
+              // 1、当前其他购物车里是否选了当前组合资源的子资源
+              // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
+              (targetRes.metadata.combined_resource.resource_ids.includes(
+                m.id
+              ) || targetRes.metadata.combined_resource.resource_ids.some(
+                (n) => {
+                  return m.metadata.combined_resource.resource_ids.includes(
+                    n
+                  );
+                }
+              )))
+                return true;
+              if (((_c = m.metadata.combined_resource) == null ? void 0 : _c.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
+                return true;
             }
-            currentResourcesCapacityMap[targetRes.id] += currentCapacity;
             return false;
-          }
-          if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
-            if (targetRes.id === m.id)
-              return true;
-            if (((_b = targetRes.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && // 如果现在选择的是组合资源，需要判断
-            // 1、当前其他购物车里是否选了当前组合资源的子资源
-            // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
-            (targetRes.metadata.combined_resource.resource_ids.includes(
-              m.id
-            ) || targetRes.metadata.combined_resource.resource_ids.some(
-              (n) => {
-                return m.metadata.combined_resource.resource_ids.includes(
-                  n
-                );
-              }
-            )))
-              return true;
-            if (((_c = m.metadata.combined_resource) == null ? void 0 : _c.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
-              return true;
-          }
-          return false;
-        });
-      });
-      if (item.start_time) {
-        const start_time = item.start_time;
-        const end_time = item.end_time;
-        const start_date = item.start_date;
-        const end_date = item.end_date;
-        this.store.cart.updateItem({
-          _id: item._id,
-          resources,
-          date: {
-            startTime: (0, import_dayjs.default)(`${start_date} ${start_time}`).format("YYYY-MM-DD HH:mm"),
-            endTime: (0, import_dayjs.default)(`${end_date} ${end_time}`).format("YYYY-MM-DD HH:mm")
-          }
-        });
-      } else {
-        this.store.cart.updateItem({
-          _id: item._id,
-          resources
+          });
         });
+        if (item.start_time) {
+          const start_time = item.start_time;
+          const end_time = item.end_time;
+          const start_date = item.start_date;
+          const end_date = item.end_date;
+          this.store.cart.updateItem({
+            _id: item._id,
+            resources,
+            date: {
+              startTime: (0, import_dayjs.default)(`${start_date} ${start_time}`).format("YYYY-MM-DD HH:mm"),
+              endTime: (0, import_dayjs.default)(`${end_date} ${end_time}`).format("YYYY-MM-DD HH:mm")
+            }
+          });
+        } else {
+          this.store.cart.updateItem({
+            _id: item._id,
+            resources
+          });
+        }
       }
     });
   }

package/package.json

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