@pisell/pisellos 0.0.85 → 0.0.87

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

@@ -25,7 +25,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
     }, options?: {
         isSelected?: boolean;
-        discountId: number;
+        discountId?: number;
+        scan?: boolean;
     }): DiscountResult;
     destroy(): Promise<void>;
     clear(): Promise<void>;

package/dist/modules/Rules/index.js

@@ -111,6 +111,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList)
+      }, {
+        scan: true
       });
 
       // 检查是否有产品使用了新折扣
@@ -308,7 +310,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan)) {
           return;
         }
 
@@ -366,7 +368,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var product = _this3.hooks.getProduct(originProduct);
         var getDefaultProduct = function getDefaultProduct() {
           if (product.isClient) {
-            _this3.hooks.setProduct(originProduct, {
+            return _this3.hooks.setProduct(originProduct, {
               discount_list: [],
               price: product.price,
               origin_total: getProductOriginTotalPrice({
@@ -385,7 +387,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               })
             });
           } else {
-            _this3.hooks.setProduct(originProduct, {
+            return _this3.hooks.setProduct(originProduct, {
               discount_list: [],
               total: product.total,
               origin_total: product.origin_total,

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/Rules/index.d.ts

@@ -25,7 +25,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
     }, options?: {
         isSelected?: boolean;
-        discountId: number;
+        discountId?: number;
+        scan?: boolean;
     }): DiscountResult;
     destroy(): Promise<void>;
     clear(): Promise<void>;

package/lib/modules/Rules/index.js

@@ -65,6 +65,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList]
+    }, {
+      scan: true
     });
     let hasApplicableDiscount = false;
     const newDiscountIds = newDiscountList.map((discount) => discount.id);
@@ -213,7 +215,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return;
       }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan)) {
         return;
       }
       usedDiscounts.set(selectedDiscount.id, true);
@@ -268,7 +270,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const product = this.hooks.getProduct(originProduct);
       const getDefaultProduct = () => {
         if (product.isClient) {
-          this.hooks.setProduct(originProduct, {
+          return this.hooks.setProduct(originProduct, {
             discount_list: [],
             price: product.price,
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
@@ -287,7 +289,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             })
           });
         } else {
-          this.hooks.setProduct(originProduct, {
+          return this.hooks.setProduct(originProduct, {
             discount_list: [],
             total: product.total,
             origin_total: product.origin_total,

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": "0.0.85",
+  "version": "0.0.87",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",