@pisell/pisellos 0.0.29 → 0.0.30

package/dist/solution/BookingByStep/index.js

@@ -1031,6 +1031,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var allCartItems = _this7.store.cart.getItems();
         cartItems.forEach(function (item) {
           if (timeSlots) {
+            var _item$_origin$resourc2;
             // 如果传递了 timeSlots，代表是第二种资源，则直接拿 timeSlots 去匹配
             var res = _this7.autoSelectAccountResources({
               holder_id: item.holder_id,
@@ -1038,6 +1039,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               timeSlots: timeSlots,
               countMap: selectResourcesMap
             });
+            // 如果购物车里已经有同类型的 form_id 的资源了，则不处理  
+            if ((_item$_origin$resourc2 = item._origin.resources) !== null && _item$_origin$resourc2 !== void 0 && _item$_origin$resourc2.some(function (n) {
+              var _res$selectedResource;
+              return n.form_id === (res === null || res === void 0 || (_res$selectedResource = res.selectedResource) === null || _res$selectedResource === void 0 ? void 0 : _res$selectedResource.form_id);
+            })) {
+              return;
+            }
             if (res !== null && res !== void 0 && res.selectedResource) {
               if (!selectResourcesMap[res.selectedResource.id]) {
                 selectResourcesMap[res.selectedResource.id] = 1;
@@ -1067,6 +1075,13 @@ 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) {
+              var _item$_origin$resourc3;
+              // 如果购物车里已经有同类型的 form_id 的资源了，则不处理  
+              if ((_item$_origin$resourc3 = item._origin.resources) !== null && _item$_origin$resourc3 !== void 0 && _item$_origin$resourc3.some(function (n) {
+                return n.form_id === targetRenderList[0].form_id;
+              })) {
+                return;
+              }
               var targetResource = targetRenderList[0];
               targetResource.capacity = 1;
               _this7.store.cart.updateItem({

package/lib/solution/BookingByStep/index.js

@@ -559,7 +559,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const cartItems = this.store.cart.getCartByAccount(account.getId());
       const allCartItems = this.store.cart.getItems();
       cartItems.forEach((item) => {
-        var _a;
+        var _a, _b, _c;
         if (timeSlots) {
           const res = this.autoSelectAccountResources({
             holder_id: item.holder_id,
@@ -567,6 +567,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             timeSlots,
             countMap: selectResourcesMap
           });
+          if ((_a = item._origin.resources) == null ? void 0 : _a.some((n) => {
+            var _a2;
+            return n.form_id === ((_a2 = res == null ? void 0 : res.selectedResource) == null ? void 0 : _a2.form_id);
+          })) {
+            return;
+          }
           if (res == null ? void 0 : res.selectedResource) {
             if (!selectResourcesMap[res.selectedResource.id]) {
               selectResourcesMap[res.selectedResource.id] = 1;
@@ -591,8 +597,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
         } 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 targetRenderList = (_b = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _b.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
+            if ((_c = item._origin.resources) == null ? void 0 : _c.some((n) => n.form_id === targetRenderList[0].form_id)) {
+              return;
+            }
             const targetResource = targetRenderList[0];
             targetResource.capacity = 1;
             this.store.cart.updateItem({

package/package.json

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