@pisell/pisellos 2.0.66 → 2.0.67

package/dist/modules/Rules/index.js

@@ -297,19 +297,25 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 记录可抵扣的商品详情
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
-            applicableProducts.push({
+            var discountType = discount.tag || discount.type;
+            var productData = {
               amount: product.price,
-              type: discount.tag || discount.type,
-              tag: discount.tag || discount.type,
+              type: discountType,
+              tag: discountType,
               discount: {
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
                 pre_value: discount.par_value,
                 product_id: originProduct.id
-              },
-              num: product.num || 1
-            });
+              }
+            };
+
+            // 如果 discount.tag 或者 discount.type 是 good_pass，则不需要添加 num 属性
+            if (discountType !== 'good_pass') {
+              productData.num = product.num || 1;
+            }
+            applicableProducts.push(productData);
             discountApplicableProducts.set(discount.id, applicableProducts);
           }
         });
@@ -451,18 +457,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
           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 discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
-            type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
+            type: discountType,
             discount: {
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,
               product_id: originProduct.id,
               percent: _selectedDiscount.par_value
-            },
-            num: product.num || 1
+            }
           };
+
+          // 如果 discount.tag 或者 discount.type 是 good_pass，则不需要添加 num 属性
+          if ((_selectedDiscount.tag || _selectedDiscount.type) !== 'good_pass') {
+            discountDetail.num = product.num || 1;
+          }
           appliedProducts.push(discountDetail);
           appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
 

package/dist/solution/BookingTicket/index.d.ts

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/modules/Rules/index.js

@@ -189,19 +189,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
-          applicableProducts.push({
+          const discountType = discount.tag || discount.type;
+          const productData = {
             amount: product.price,
-            type: discount.tag || discount.type,
-            tag: discount.tag || discount.type,
+            type: discountType,
+            tag: discountType,
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value,
               product_id: originProduct.id
-            },
-            num: product.num || 1
-          });
+            }
+          };
+          if (discountType !== "good_pass") {
+            productData.num = product.num || 1;
+          }
+          applicableProducts.push(productData);
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
       });
@@ -310,18 +314,21 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           productOriginTotal = product.total;
         }
         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 discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
-          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
+          type: discountType,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
-          },
-          num: product.num || 1
+          }
         };
+        if ((selectedDiscount2.tag || selectedDiscount2.type) !== "good_pass") {
+          discountDetail.num = product.num || 1;
+        }
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
         if (product.isClient) {

package/lib/solution/BookingTicket/index.d.ts

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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