@pisell/pisellos 0.0.477 → 0.0.478

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -222,12 +222,8 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       var maxProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      // 非跨商品券也受 applicableProductLimit 限制
-      var _deductQty = applicableProductLimit > 0 ? Math.min(_currentAvailableQty, applicableProductLimit) : _currentAvailableQty;
-      // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
-      finalApplicableAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty), maxProduct[amountField]);
+      // allowCrossProduct=false 时，applicableProductLimit 不生效，直接使用全部可抵扣数量
+      finalApplicableAmount = maxProduct[amountField];
     }
 
     // 返回最小值
@@ -427,15 +423,12 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         }, new Decimal(0));
       }
     } else {
-      // 非跨商品券：单个剩余金额最高的商品，也受 applicableProductLimit 限制
+      // 非跨商品券：单个剩余金额最高的商品
       var maxProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty2 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      var _deductQty2 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty2, applicableProductLimit) : _currentAvailableQty2;
-      // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
-      calculatedAvailableMaxAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty2), maxProduct[amountField]);
+      // allowCrossProduct=false 时，applicableProductLimit 不生效，直接使用全部剩余金额
+      calculatedAvailableMaxAmount = maxProduct[amountField];
     }
 
     // 取最小值：min(recommended_usage_amount, maxDeductionAmount, 适用商品金额, 订单剩余金额)
@@ -460,8 +453,8 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
           if (deductionLeft.lessThanOrEqualTo(0) || _remainingLimit <= 0) break;
 
           // 动态计算当前可抵扣数量 = ceil(剩余金额 / 单价)
-          var _currentAvailableQty3 = Math.ceil(_product[amountField].dividedBy(_product[unitPriceField]).toNumber());
-          var availableQty = Math.min(_currentAvailableQty3, _remainingLimit);
+          var _currentAvailableQty = Math.ceil(_product[amountField].dividedBy(_product[unitPriceField]).toNumber());
+          var availableQty = Math.min(_currentAvailableQty, _remainingLimit);
 
           // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
           var maxDeductForProduct = Decimal.min(_product[unitPriceField].times(availableQty), _product[amountField]);
@@ -489,18 +482,12 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         _iterator3.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（剩余金额最高的），也受 applicableProductLimit 限制
+      // 非跨商品券：只抵扣一个商品（剩余金额最高的）
+      // allowCrossProduct=false 时，applicableProductLimit 不生效
       var targetProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty4 = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      var _availableQty = applicableProductLimit > 0 ? Math.min(_currentAvailableQty4, applicableProductLimit) : _currentAvailableQty4;
-
-      // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
-      var _maxDeductForProduct = Decimal.min(targetProduct[unitPriceField].times(_availableQty), targetProduct[amountField]);
-      var _actualDeductAmount = Decimal.min(deductionLeft, _maxDeductForProduct);
+      var _actualDeductAmount = Decimal.min(deductionLeft, targetProduct[amountField]);
 
       // 计算实际抵扣的数量
       var _actualDeductQty = Math.ceil(_actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
@@ -513,8 +500,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: _actualDeductAmount.toNumber(),
-        // 转换为数字
-        deductQuantity: _actualDeductQty // 抵扣涉及的数量（用于记录）
+        deductQuantity: _actualDeductQty
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
@@ -716,18 +702,12 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         _iterator4.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（剩余金额最高的），也受 applicableProductLimit 限制
+      // 非跨商品券：只抵扣一个商品（剩余金额最高的）
+      // allowCrossProduct=false 时，applicableProductLimit 不生效
       var targetProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty5 = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      var _availableQty2 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty5, applicableProductLimit) : _currentAvailableQty5;
-
-      // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
-      var _maxDeductForProduct2 = Decimal.min(targetProduct[unitPriceField].times(_availableQty2), targetProduct[amountField]);
-      var _actualDeductAmount2 = Decimal.min(deductionLeft, _maxDeductForProduct2);
+      var _actualDeductAmount2 = Decimal.min(deductionLeft, targetProduct[amountField]);
 
       // 计算实际抵扣的数量
       var _actualDeductQty2 = Math.ceil(_actualDeductAmount2.dividedBy(targetProduct[unitPriceField]).toNumber());
@@ -740,8 +720,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: _actualDeductAmount2.toNumber(),
-        // 转换为数字
-        deductQuantity: _actualDeductQty2 // 抵扣涉及的数量（用于记录）
+        deductQuantity: _actualDeductQty2
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
@@ -865,15 +844,12 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
               }, new Decimal(0));
             }
           } else {
-            // 非跨商品券：单个剩余金额最高的商品，也受 applicableProductLimit 限制
+            // 非跨商品券：单个剩余金额最高的商品
+            // allowCrossProduct=false 时，applicableProductLimit 不生效
             var maxProduct = applicableProducts.reduce(function (max, p) {
               return p[amountField].greaterThan(max[amountField]) ? p : max;
             });
-            // 动态计算当前可抵扣数量
-            var _currentAvailableQty6 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-            var _deductQty3 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty6, applicableProductLimit) : _currentAvailableQty6;
-            // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
-            calculatedMaxAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty3), maxProduct[amountField]);
+            calculatedMaxAmount = maxProduct[amountField];
           }
           calculatedMaxAmount = Decimal.min(baseAmount, calculatedMaxAmount, remainingOrderAmount);
           if (calculatedMaxAmount.lessThanOrEqualTo(0)) {

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -123,7 +123,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/model/strategy/adapter/walletPass/utils.js

@@ -152,12 +152,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       const maxProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      finalApplicableAmount = import_decimal.default.min(
-        maxProduct[unitPriceField].times(deductQty),
-        maxProduct[amountField]
-      );
+      finalApplicableAmount = maxProduct[amountField];
     }
     return import_decimal.default.min(baseAmount, finalApplicableAmount, remainingOrderAmount);
   };
@@ -269,12 +264,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       const maxProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      calculatedAvailableMaxAmount = import_decimal.default.min(
-        maxProduct[unitPriceField].times(deductQty),
-        maxProduct[amountField]
-      );
+      calculatedAvailableMaxAmount = maxProduct[amountField];
     }
     const availableMaxAmount = import_decimal.default.min(
       baseAmount,
@@ -320,13 +310,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       const targetProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      const maxDeductForProduct = import_decimal.default.min(
-        targetProduct[unitPriceField].times(availableQty),
-        targetProduct[amountField]
-      );
-      const actualDeductAmount = import_decimal.default.min(deductionLeft, maxDeductForProduct);
+      const actualDeductAmount = import_decimal.default.min(deductionLeft, targetProduct[amountField]);
       const actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
       targetProduct[amountField] = targetProduct[amountField].minus(actualDeductAmount);
       deductionLeft = deductionLeft.minus(actualDeductAmount);
@@ -335,9 +319,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: actualDeductAmount.toNumber(),
-        // 转换为数字
         deductQuantity: actualDeductQty
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
@@ -469,13 +451,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       const targetProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      const maxDeductForProduct = import_decimal.default.min(
-        targetProduct[unitPriceField].times(availableQty),
-        targetProduct[amountField]
-      );
-      const actualDeductAmount = import_decimal.default.min(deductionLeft, maxDeductForProduct);
+      const actualDeductAmount = import_decimal.default.min(deductionLeft, targetProduct[amountField]);
       const actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
       targetProduct[amountField] = targetProduct[amountField].minus(actualDeductAmount);
       deductionLeft = deductionLeft.minus(actualDeductAmount);
@@ -484,9 +460,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: actualDeductAmount.toNumber(),
-        // 转换为数字
         deductQuantity: actualDeductQty
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
@@ -578,12 +552,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
             const maxProduct = applicableProducts.reduce(
               (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
             );
-            const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-            const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-            calculatedMaxAmount = import_decimal.default.min(
-              maxProduct[unitPriceField].times(deductQty),
-              maxProduct[amountField]
-            );
+            calculatedMaxAmount = maxProduct[amountField];
           }
           calculatedMaxAmount = import_decimal.default.min(
             baseAmount,

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -123,7 +123,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": "0.0.477",
+  "version": "0.0.478",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",