@pisell/pisellos 0.0.169 → 0.0.171

package/dist/modules/AccountList/index.js

@@ -326,7 +326,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 检测 如果被删除的是活跃账号，则默认把第一个账号设置为 activeAccount
-              if (((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id) {
+              if (!this.getActiveAccount() || ((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id || this.store.accounts.length === 1) {
                 this.setActiveAccount(this.store.accounts[0].getId());
               }
               _context6.next = 12;

package/dist/modules/Rules/index.js

@@ -420,16 +420,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 记录实际应用了优惠券的商品信息
           var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
+          var productOriginTotal = product.origin_total || product.total || 0;
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(product.total || 0).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.total || 0)).toNumber();
+          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
           var discountDetail = {
-            amount: new Decimal(product.total || 0).minus(new Decimal(targetProductTotal)).toNumber(),
+            amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
             type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
             discount: {
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
-              original_amount: product.total,
+              original_amount: productOriginTotal,
               product_id: originProduct.id,
               percent: _selectedDiscount.par_value
             },
@@ -463,7 +464,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,
-              origin_total: product.origin_total || product.total
+              origin_total: productOriginTotal
             }));
           }
         }

package/dist/solution/ShopDiscount/index.js

@@ -507,7 +507,15 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           return Number(product === null || product === void 0 ? void 0 : product.price) === 0;
         };
         var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
-          return (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
+          var _item$applicableProdu2;
+          // 检查当前 id是否在 item.applicableProductIds 里出现了几次，且要求次数和 item.applicableProductIds 里出现的次数一致
+          var sameIdTimes = ((_item$applicableProdu2 = item.applicableProductIds) === null || _item$applicableProdu2 === void 0 ? void 0 : _item$applicableProdu2.filter(function (n) {
+            return n === id;
+          }).length) || 1;
+          var targetIdTimes = (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.filter(function (n) {
+            return n === id;
+          }).length) || 0;
+          return targetIdTimes >= sameIdTimes || isProductFree(id);
         });
         if (!item.isSelected && isAllProductUsedOrFree) {
           item.isDisabledForProductUsed = true;

package/lib/modules/AccountList/index.js

@@ -195,7 +195,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.accountList = this.store.accountList.filter(
         (account) => account.id !== id
       );
-      if (((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id) {
+      if (!this.getActiveAccount() || ((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id || this.store.accounts.length === 1) {
         this.setActiveAccount(this.store.accounts[0].getId());
       }
       await this.core.effects.emit(

package/lib/modules/Rules/index.js

@@ -293,14 +293,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const selectedDiscount2 = applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
-        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(product.total || 0).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(product.total || 0)).toNumber();
+        const productOriginTotal = product.origin_total || product.total || 0;
+        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
         const discountDetail = {
-          amount: new import_decimal.default(product.total || 0).minus(new import_decimal.default(targetProductTotal)).toNumber(),
+          amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
           type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
-            original_amount: product.total,
+            original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
           },
@@ -331,7 +332,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,
-            origin_total: product.origin_total || product.total
+            origin_total: productOriginTotal
           }));
         }
       }

package/lib/solution/ShopDiscount/index.js

@@ -349,7 +349,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         return Number(product == null ? void 0 : product.price) === 0;
       };
       const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
-        return (allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
+        var _a3;
+        const sameIdTimes = ((_a3 = item.applicableProductIds) == null ? void 0 : _a3.filter((n) => n === id).length) || 1;
+        const targetIdTimes = (allUsedProductIds == null ? void 0 : allUsedProductIds.filter((n) => n === id).length) || 0;
+        return targetIdTimes >= sameIdTimes || isProductFree(id);
       });
       if (!item.isSelected && isAllProductUsedOrFree) {
         item.isDisabledForProductUsed = true;

package/package.json

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