@pisell/pisellos 0.0.136 → 0.0.137

package/dist/modules/Rules/index.js

@@ -283,7 +283,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           // 如果优惠券已被使用，则跳过
-          if (usedDiscounts.get(discount.id)) return false;
+          var targetUsedDiscounts = usedDiscounts.get(discount.id);
+          if (targetUsedDiscounts && discount.type === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
 
           // 判断优惠券是否适用于该商品

package/dist/solution/BookingByStep/index.js

@@ -559,24 +559,28 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "storeProduct",
     value: function () {
       var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(productData) {
-        var activeAccount, _ref4, bundle, options, origin, product_variant_id, _ref4$quantity, quantity, rowKey, cartItems, targetCartItem, product, addCartItem;
+        var activeAccount, _ref4, bundle, options, origin, product_variant_id, _ref4$quantity, quantity, rowKey, cartItems, targetCartItem, currentAccount, targetAccount, isSameAccount, product, addCartItem;
         return _regeneratorRuntime().wrap(function _callee7$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
               activeAccount = this.getActiveAccount();
               _ref4 = productData || {}, bundle = _ref4.bundle, options = _ref4.options, origin = _ref4.origin, product_variant_id = _ref4.product_variant_id, _ref4$quantity = _ref4.quantity, quantity = _ref4$quantity === void 0 ? 1 : _ref4$quantity, rowKey = _ref4.rowKey; // 检查购物车里是否已经存在 rowKey相同的数据，如果是则更新数量
+              // 还需要判断账号是否一致
               cartItems = this.store.cart.getItems();
               if (!rowKey) {
-                _context8.next = 9;
+                _context8.next = 12;
                 break;
               }
               targetCartItem = cartItems.find(function (n) {
                 var _n$_productOrigin;
                 return ((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.rowKey) === rowKey;
               });
-              if (!(targetCartItem && isNormalProduct(targetCartItem._productOrigin))) {
-                _context8.next = 9;
+              currentAccount = this.store.accountList.getActiveAccount();
+              targetAccount = targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id;
+              isSameAccount = (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.getId()) === targetAccount;
+              if (!(targetCartItem && isNormalProduct(targetCartItem._productOrigin) && isSameAccount)) {
+                _context8.next = 12;
                 break;
               }
               this.store.cart.updateItem({
@@ -587,7 +591,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 这里需要单独触发一个，购物车商品数量发生改变的 hook
               this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateCartItemNums"), {});
               return _context8.abrupt("return");
-            case 9:
+            case 12:
               product = _objectSpread(_objectSpread({}, origin), {}, {
                 product_variant_id: product_variant_id,
                 rowKey: rowKey
@@ -602,7 +606,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 addCartItem.account = activeAccount;
               }
               this.store.cart.addItem(addCartItem);
-            case 13:
+            case 16:
             case "end":
               return _context8.stop();
           }

package/lib/modules/Rules/index.js

@@ -191,7 +191,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        if (usedDiscounts.get(discount.id))
+        const targetUsedDiscounts = usedDiscounts.get(discount.id);
+        if (targetUsedDiscounts && discount.type === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
         if (limitedData.type === "product_all") {

package/lib/solution/BookingByStep/index.js

@@ -351,7 +351,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         var _a;
         return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
       });
-      if (targetCartItem && (0, import_utils4.isNormalProduct)(targetCartItem._productOrigin)) {
+      const currentAccount = this.store.accountList.getActiveAccount();
+      const targetAccount = targetCartItem == null ? void 0 : targetCartItem.holder_id;
+      const isSameAccount = (currentAccount == null ? void 0 : currentAccount.getId()) === targetAccount;
+      if (targetCartItem && (0, import_utils4.isNormalProduct)(targetCartItem._productOrigin) && isSameAccount) {
         this.store.cart.updateItem({
           _id: targetCartItem._id,
           product: {

package/package.json

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