@pisell/pisellos 0.0.21 → 0.0.23

package/dist/modules/AccountList/index.js

@@ -321,10 +321,17 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     key: "storeChange",
     value: function storeChange() {
       if (this.openCache) {
+        var store = cloneDeep(this.store);
+        // store里的 accountList 要主动基于 id 做下去重，避免重复写入
+        store.accountList = store.accountList.filter(function (account, index, self) {
+          return index === self.findIndex(function (t) {
+            return t.id === account.id;
+          });
+        });
         this.checkSaveCache({
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
-          store: this.store,
+          store: store,
           cacheKey: ['accountList']
         });
       }

package/dist/modules/Cart/index.js

@@ -379,11 +379,18 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     key: "storeChange",
     value: function storeChange() {
       if (this.openCache) {
+        var store = cloneDeep(this.store);
+        // store里的 list 要主动基于 id 做下去重，避免重复写入
+        store.list = store.list.filter(function (item, index, self) {
+          return index === self.findIndex(function (t) {
+            return t._id === item._id;
+          });
+        });
         this.checkSaveCache({
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
-          store: this.store,
-          cacheKey: ['list']
+          store: store,
+          cacheKey: ["list"]
         });
       }
     }

package/dist/solution/BookingByStep/index.js

@@ -177,6 +177,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 open_quotation: 1,
                 open_bundle: 1,
                 extension_type: ["product_appointment", "appointment_ticket"],
+                with: ["category", "collection"],
                 status: "published",
                 num: 500,
                 skip: 1,
@@ -1022,6 +1023,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
           } else {
             var _productResources$fin;
+            debugger;
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var productResources = getResourcesByProduct(resourcesMap, item, allCartItems);
             // 自动选择 productResources 中对应 resources_code 的资源
@@ -1042,6 +1044,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
+      debugger;
       return {
         errorList: errorList
       };
@@ -1057,15 +1060,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = this.store.cart.getItems();
       var resourceIds = [];
       cartItems.forEach(function (item) {
-        var _item$_productOrigin2, _item$_origin$resourc2;
+        var _item$_productOrigin2;
         (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.product_resource) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.resources) === null || _item$_productOrigin2 === void 0 || _item$_productOrigin2.forEach(function (n) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
           }
         });
-        (_item$_origin$resourc2 = item._origin.resources) === null || _item$_origin$resourc2 === void 0 || _item$_origin$resourc2.forEach(function (n) {
-          resourceIds.push(n.relation_id);
-        });
+        // item._origin.resources?.forEach((n: any) => {
+        //   resourceIds.push(n.relation_id);
+        // });
+        if (item.resource_id) {
+          resourceIds.push(item.resource_id);
+        }
       });
       var resourcesMap = getResourcesMap(resources);
       var duration = 0;
@@ -1081,6 +1087,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           duration = accountDuration;
         }
       });
+      debugger;
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,

package/dist/solution/ShopDiscount/index.js

@@ -517,44 +517,40 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.prev = 0;
-              customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id);
-              if (!(customerId === 1 || !customerId)) {
-                _context9.next = 4;
-                break;
-              }
-              return _context9.abrupt("return");
-            case 4:
-              _context9.next = 6;
+              customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
+              //   return
+              // }
+              _context9.next = 4;
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: "create",
                 with_good_pass: 1
               });
-            case 6:
+            case 4:
               goodPassList = _context9.sent;
               this.setDiscountList(goodPassList || []);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context9.next = 12;
+                _context9.next = 10;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context9.next = 12;
+              _context9.next = 10;
               return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 12:
-              _context9.next = 14;
+            case 10:
+              _context9.next = 12;
               return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, goodPassList);
-            case 14:
-              _context9.next = 19;
+            case 12:
+              _context9.next = 17;
               break;
-            case 16:
-              _context9.prev = 16;
+            case 14:
+              _context9.prev = 14;
               _context9.t0 = _context9["catch"](0);
               console.error("[ShopDiscount] 加载准备配置出错:", _context9.t0);
-            case 19:
+            case 17:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 16]]);
+        }, _callee9, this, [[0, 14]]);
       }));
       function loadPrepareConfig(_x8) {
         return _loadPrepareConfig.apply(this, arguments);

package/lib/modules/AccountList/index.js

@@ -164,7 +164,11 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
   }
   storeChange() {
     if (this.openCache) {
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["accountList"] });
+      const store = (0, import_lodash_es.cloneDeep)(this.store);
+      store.accountList = store.accountList.filter(
+        (account, index, self) => index === self.findIndex((t) => t.id === account.id)
+      );
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store, cacheKey: ["accountList"] });
     }
   }
 };

package/lib/modules/Cart/index.js

@@ -76,7 +76,12 @@ var CartModule = class extends import_BaseModule.BaseModule {
     };
     if (product) {
       cartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
-      cartItem = (0, import_utils.formatProductToCartItem)({ cartItem, product, bundle, options });
+      cartItem = (0, import_utils.formatProductToCartItem)({
+        cartItem,
+        product,
+        bundle,
+        options
+      });
     }
     if (account) {
       cartItem = (0, import_utils.formatAccountToCartItem)({ cartItem, account });
@@ -117,16 +122,28 @@ var CartModule = class extends import_BaseModule.BaseModule {
     }
     if (product) {
       tempCartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
-      tempCartItem = (0, import_utils.formatProductToCartItem)({ cartItem: tempCartItem, product });
+      tempCartItem = (0, import_utils.formatProductToCartItem)({
+        cartItem: tempCartItem,
+        product
+      });
     }
     if (discounts) {
-      tempCartItem = (0, import_utils.formatDiscountToCartItem)({ cartItem: tempCartItem, discounts });
+      tempCartItem = (0, import_utils.formatDiscountToCartItem)({
+        cartItem: tempCartItem,
+        discounts
+      });
     }
     if (account) {
-      tempCartItem = (0, import_utils.formatAccountToCartItem)({ cartItem: tempCartItem, account });
+      tempCartItem = (0, import_utils.formatAccountToCartItem)({
+        cartItem: tempCartItem,
+        account
+      });
     }
     if (resources) {
-      tempCartItem = (0, import_utils.formatResourceToCartItem)({ cartItem: tempCartItem, resources });
+      tempCartItem = (0, import_utils.formatResourceToCartItem)({
+        cartItem: tempCartItem,
+        resources
+      });
     }
     if (note) {
       tempCartItem = (0, import_utils.formatNoteToCartItem)({ cartItem: tempCartItem, note });
@@ -155,7 +172,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 根据账户ID获取购物车
    */
   getCartByAccount(account_id) {
-    return this.store.list.filter((item) => item.holder_id === account_id);
+    return this.store.list.filter(
+      (item) => item.holder_id === account_id
+    );
   }
   /**
    * 移除购物车商品
@@ -169,7 +188,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 根据账户ID清除购物车
    */
   clearCartByAccount(account_id) {
-    const items = 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 || []];
   }
   /**
@@ -194,7 +215,16 @@ var CartModule = class extends import_BaseModule.BaseModule {
   }
   storeChange() {
     if (this.openCache) {
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["list"] });
+      const store = (0, import_lodash_es.cloneDeep)(this.store);
+      store.list = store.list.filter(
+        (item, index, self) => index === self.findIndex((t) => t._id === item._id)
+      );
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store,
+        cacheKey: ["list"]
+      });
     }
   }
 };

package/lib/solution/BookingByStep/index.js

@@ -134,6 +134,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       open_quotation: 1,
       open_bundle: 1,
       extension_type: ["product_appointment", "appointment_ticket"],
+      with: ["category", "collection"],
       status: "published",
       num: 500,
       skip: 1,
@@ -571,6 +572,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             errorList.push(item._id);
           }
         } else {
+          debugger;
           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) {
@@ -589,6 +591,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
+    debugger;
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
@@ -598,15 +601,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const resourceIds = [];
     cartItems.forEach((item) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c;
       (_c = (_b = (_a = item._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
         }
       });
-      (_d = item._origin.resources) == null ? void 0 : _d.forEach((n) => {
-        resourceIds.push(n.relation_id);
-      });
+      if (item.resource_id) {
+        resourceIds.push(item.resource_id);
+      }
     });
     const resourcesMap = (0, import_utils.getResourcesMap)(resources);
     let duration = 0;
@@ -621,6 +624,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         duration = accountDuration;
       }
     });
+    debugger;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,

package/lib/solution/ShopDiscount/index.js

@@ -307,9 +307,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     try {
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      if (customerId === 1 || !customerId) {
-        return;
-      }
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: "create",

package/package.json

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