@pisell/pisellos 0.0.392 → 0.0.394

package/dist/modules/Rules/index.js

@@ -581,11 +581,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var _flatItem$parentProdu2;
             // 🔥 对于 bundle 子商品，quantity 需要乘以主商品的购买数量
             var quantity = flatItem.type === 'main' ? product.quantity || 1 : (product.num || 1) * (((_flatItem$parentProdu2 = flatItem.parentProduct) === null || _flatItem$parentProdu2 === void 0 ? void 0 : _flatItem$parentProdu2.quantity) || 1);
-            applicableProducts.push({
+
+            // 🔥 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
+            var productData = {
               productId: flatItem._id,
               amount: Number(product.price || 0),
               quantity: quantity
-            });
+            };
+
+            // 子商品需要传递主商品数量
+            if (flatItem.type === 'bundle') {
+              var _flatItem$parentProdu3;
+              productData.parentQuantity = ((_flatItem$parentProdu3 = flatItem.parentProduct) === null || _flatItem$parentProdu3 === void 0 ? void 0 : _flatItem$parentProdu3.quantity) || 1;
+            }
+            applicableProducts.push(productData);
           }
         });
 
@@ -611,10 +620,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$parentProdu3;
+          var _flatItem$parentProdu4;
           // bundle子商品：构造虚拟商品对象
           product = {
-            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu3 = flatItem.parentProduct) === null || _flatItem$parentProdu3 === void 0 ? void 0 : _flatItem$parentProdu3.startDate,
+            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu4 = flatItem.parentProduct) === null || _flatItem$parentProdu4 === void 0 ? void 0 : _flatItem$parentProdu4.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -699,10 +708,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$parentProdu4, _flatItem$bundleItem3, _flatItem$bundleItem4, _flatItem$bundleItem5;
+          var _flatItem$parentProdu5, _flatItem$bundleItem3, _flatItem$bundleItem4, _flatItem$bundleItem5;
           // bundle子商品
           product = {
-            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu4 = flatItem.parentProduct) === null || _flatItem$parentProdu4 === void 0 ? void 0 : _flatItem$parentProdu4.startDate,
+            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -746,15 +755,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
-          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.find(function (n) {
-            var _n$discount;
-            return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
-          })) && (discount.tag || discount.type) === 'good_pass') return false;
+          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length) && (discount.tag || discount.type) === 'good_pass') return false;
 
           // 折扣卡商品价格为0时不可用
           if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
-            var _n$discount2;
-            return ((_n$discount2 = n.discount) === null || _n$discount2 === void 0 ? void 0 : _n$discount2.resource_id) === discount.id;
+            var _n$discount;
+            return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
           })) && (discount.tag || discount.type) !== 'good_pass') return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
@@ -851,11 +857,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis7, _flatItem$parentProdu5;
+            var _product$discount_lis7, _flatItem$parentProdu6;
             if ((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
               var _item$discount2;
               return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
-            }) || (_flatItem$parentProdu5 = flatItem.parentProduct) !== null && _flatItem$parentProdu5 !== void 0 && (_flatItem$parentProdu5 = _flatItem$parentProdu5.discount_list) !== null && _flatItem$parentProdu5 !== void 0 && _flatItem$parentProdu5.some(function (item) {
+            }) || (_flatItem$parentProdu6 = flatItem.parentProduct) !== null && _flatItem$parentProdu6 !== void 0 && (_flatItem$parentProdu6 = _flatItem$parentProdu6.discount_list) !== null && _flatItem$parentProdu6 !== void 0 && _flatItem$parentProdu6.some(function (item) {
               var _item$discount3;
               return ((_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.resource_id) === options.discountId;
             })) {
@@ -877,14 +883,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis9, _flatItem$parentProdu6;
+            var _product$discount_lis9, _flatItem$parentProdu7;
             if ((_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
               var _options$selectedList2;
               return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
                 var _item$discount5;
                 return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
               });
-            }) || (_flatItem$parentProdu6 = flatItem.parentProduct) !== null && _flatItem$parentProdu6 !== void 0 && (_flatItem$parentProdu6 = _flatItem$parentProdu6.discount_list) !== null && _flatItem$parentProdu6 !== void 0 && _flatItem$parentProdu6.some(function (item) {
+            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
               var _options$selectedList3;
               return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
                 var _item$discount6;
@@ -1165,7 +1171,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } else {
-            var _selectedDiscount3$me, _flatItem$parentProdu7;
+            var _selectedDiscount3$me, _flatItem$parentProdu8;
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
@@ -1217,7 +1223,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 product_discount_difference: _productDiscountDifference
               }),
               config: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.config,
-              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu7 = flatItem.parentProduct) === null || _flatItem$parentProdu7 === void 0 ? void 0 : _flatItem$parentProdu7.num) || 1)
+              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu8 = flatItem.parentProduct) === null || _flatItem$parentProdu8 === void 0 ? void 0 : _flatItem$parentProdu8.num) || 1)
             };
 
             // 记录实际应用的折扣

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

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

package/dist/solution/ShopDiscount/utils.d.ts

@@ -74,16 +74,17 @@ export declare const isOrderLevelFixedAmountDiscount: (discount: Discount) => bo
 /**
  * 计算订单级别固定金额折扣卡的分摊结果
  * @param discount 折扣卡
- * @param applicableProducts 适用商品列表 { productId, amount, quantity }
+ * @param applicableProducts 适用商品列表 { productId, amount, quantity, parentQuantity }
  * @returns 分摊结果 Map<productId, { discountAmount, difference }>
  * 注意：
  * - discountAmount 是单价折扣金额（不是总折扣金额）
- * - difference（总差值）只会放在最后一个商品上，用于后端补齐金额
+ * - difference（总差值）优先直接加到数量为1的单商品折扣上，如果没有则存储在metadata中
  */
 export declare const calculateOrderLevelDiscountAllocation: (discount: Discount, applicableProducts: Array<{
     productId: string | number;
     amount: number;
     quantity: number;
+    parentQuantity?: number;
 }>) => Map<string | number, {
     discountAmount: number;
     difference: number;

package/dist/solution/ShopDiscount/utils.js

@@ -498,11 +498,11 @@ export var isOrderLevelFixedAmountDiscount = function isOrderLevelFixedAmountDis
 /**
  * 计算订单级别固定金额折扣卡的分摊结果
  * @param discount 折扣卡
- * @param applicableProducts 适用商品列表 { productId, amount, quantity }
+ * @param applicableProducts 适用商品列表 { productId, amount, quantity, parentQuantity }
  * @returns 分摊结果 Map<productId, { discountAmount, difference }>
  * 注意：
  * - discountAmount 是单价折扣金额（不是总折扣金额）
- * - difference（总差值）只会放在最后一个商品上，用于后端补齐金额
+ * - difference（总差值）优先直接加到数量为1的单商品折扣上，如果没有则存储在metadata中
  */
 export var calculateOrderLevelDiscountAllocation = function calculateOrderLevelDiscountAllocation(discount, applicableProducts) {
   var result = new Map();
@@ -543,16 +543,71 @@ export var calculateOrderLevelDiscountAllocation = function calculateOrderLevelD
     allocatedTotal = allocatedTotal.plus(new Decimal(discountAmountPerItem).mul(product.quantity));
   });
 
-  // 🔥 计算总差值，只放在最后一个商品上
+  // 🔥 计算总差值
   // 总差值 = 固定金额 - 所有商品的 (单价折扣 × 数量) 之和
   var totalDifference = new Decimal(actualDiscountTotal).minus(allocatedTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
   if (totalDifference > 0) {
-    var lastProduct = applicableProducts[applicableProducts.length - 1];
-    var lastProductAllocation = result.get(lastProduct.productId);
-    if (lastProductAllocation) {
-      result.set(lastProduct.productId, _objectSpread(_objectSpread({}, lastProductAllocation), {}, {
-        difference: totalDifference
-      }));
+    // 🔥 判断商品是否是真正的"数量为1"
+    // 主商品：quantity === 1
+    // 子商品：quantity === 1 且 parentQuantity === 1
+    var isSingleQuantity = function isSingleQuantity(product) {
+      if (product.parentQuantity !== undefined) {
+        // 子商品：需要同时满足自身数量为1且主商品数量为1
+        return product.quantity === 1 && product.parentQuantity === 1;
+      }
+      // 主商品：只需要自身数量为1
+      return product.quantity === 1;
+    };
+
+    // 🔥 筛选出数量为1的商品
+    var singleQuantityProducts = applicableProducts.filter(isSingleQuantity);
+    if (singleQuantityProducts.length > 0) {
+      // 🔥 优先级1：找到有足够剩余空间且金额最大的商品
+      // 剩余空间 = 商品价格 - 当前折扣金额 >= 差值
+      var productsWithEnoughSpace = singleQuantityProducts.filter(function (product) {
+        var allocation = result.get(product.productId);
+        if (!allocation) return false;
+        var remainingSpace = new Decimal(product.amount).minus(allocation.discountAmount).toNumber();
+        return remainingSpace >= totalDifference;
+      });
+      if (productsWithEnoughSpace.length > 0) {
+        // 按金额降序排序，选择金额最大的
+        productsWithEnoughSpace.sort(function (a, b) {
+          return b.amount - a.amount;
+        });
+        var targetProduct = productsWithEnoughSpace[0];
+        var targetAllocation = result.get(targetProduct.productId);
+        if (targetAllocation) {
+          // 差值直接加到折扣金额上
+          result.set(targetProduct.productId, {
+            discountAmount: new Decimal(targetAllocation.discountAmount).plus(totalDifference).toNumber(),
+            difference: 0 // 不需要存储差值
+          });
+        }
+      } else {
+        // 🔥 优先级2：所有数量为1的商品都没有足够剩余空间
+        // 选择金额最大的商品，差值存储在metadata中
+        singleQuantityProducts.sort(function (a, b) {
+          return b.amount - a.amount;
+        });
+        var _targetProduct = singleQuantityProducts[0];
+        var _targetAllocation = result.get(_targetProduct.productId);
+        if (_targetAllocation) {
+          result.set(_targetProduct.productId, _objectSpread(_objectSpread({}, _targetAllocation), {}, {
+            difference: totalDifference
+          }));
+        }
+      }
+    } else {
+      // 🔥 优先级3：没有数量为1的商品，走原有逻辑
+      // 差值存储在最后一个商品的metadata中
+      var lastProduct = applicableProducts[applicableProducts.length - 1];
+      var lastProductAllocation = result.get(lastProduct.productId);
+      if (lastProductAllocation) {
+        result.set(lastProduct.productId, _objectSpread(_objectSpread({}, lastProductAllocation), {}, {
+          difference: totalDifference
+        }));
+      }
     }
   }
   return result;

package/lib/modules/Rules/index.js

@@ -369,7 +369,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableProducts = [];
       sortedFlattenedList.forEach((flatItem) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         let product;
         if (flatItem.type === "main") {
           product = flatItem.product;
@@ -401,11 +401,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
         if (isLimitedProduct && isBundleAvailable) {
           const quantity = flatItem.type === "main" ? product.quantity || 1 : (product.num || 1) * (((_f = flatItem.parentProduct) == null ? void 0 : _f.quantity) || 1);
-          applicableProducts.push({
+          const productData = {
             productId: flatItem._id,
             amount: Number(product.price || 0),
             quantity
-          });
+          };
+          if (flatItem.type === "bundle") {
+            productData.parentQuantity = ((_g = flatItem.parentProduct) == null ? void 0 : _g.quantity) || 1;
+          }
+          applicableProducts.push(productData);
         }
       });
       if (applicableProducts.length > 0) {
@@ -538,10 +542,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             return false;
           }
         }
-        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
-          var _a3;
-          return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
-        })) && (discount.tag || discount.type) === "good_pass")
+        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.length) && (discount.tag || discount.type) === "good_pass")
           return false;
         if ((Number(product.price) <= 0 || !product.price) && !((_c2 = product.discount_list) == null ? void 0 : _c2.find((n) => {
           var _a3;

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

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

package/lib/solution/ShopDiscount/utils.d.ts

@@ -74,16 +74,17 @@ export declare const isOrderLevelFixedAmountDiscount: (discount: Discount) => bo
 /**
  * 计算订单级别固定金额折扣卡的分摊结果
  * @param discount 折扣卡
- * @param applicableProducts 适用商品列表 { productId, amount, quantity }
+ * @param applicableProducts 适用商品列表 { productId, amount, quantity, parentQuantity }
  * @returns 分摊结果 Map<productId, { discountAmount, difference }>
  * 注意：
  * - discountAmount 是单价折扣金额（不是总折扣金额）
- * - difference（总差值）只会放在最后一个商品上，用于后端补齐金额
+ * - difference（总差值）优先直接加到数量为1的单商品折扣上，如果没有则存储在metadata中
  */
 export declare const calculateOrderLevelDiscountAllocation: (discount: Discount, applicableProducts: Array<{
     productId: string | number;
     amount: number;
     quantity: number;
+    parentQuantity?: number;
 }>) => Map<string | number, {
     discountAmount: number;
     difference: number;

package/lib/solution/ShopDiscount/utils.js

@@ -345,13 +345,52 @@ var calculateOrderLevelDiscountAllocation = (discount, applicableProducts) => {
   });
   const totalDifference = new import_decimal.default(actualDiscountTotal).minus(allocatedTotal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
   if (totalDifference > 0) {
-    const lastProduct = applicableProducts[applicableProducts.length - 1];
-    const lastProductAllocation = result.get(lastProduct.productId);
-    if (lastProductAllocation) {
-      result.set(lastProduct.productId, {
-        ...lastProductAllocation,
-        difference: totalDifference
+    const isSingleQuantity = (product) => {
+      if (product.parentQuantity !== void 0) {
+        return product.quantity === 1 && product.parentQuantity === 1;
+      }
+      return product.quantity === 1;
+    };
+    const singleQuantityProducts = applicableProducts.filter(isSingleQuantity);
+    if (singleQuantityProducts.length > 0) {
+      const productsWithEnoughSpace = singleQuantityProducts.filter((product) => {
+        const allocation = result.get(product.productId);
+        if (!allocation)
+          return false;
+        const remainingSpace = new import_decimal.default(product.amount).minus(allocation.discountAmount).toNumber();
+        return remainingSpace >= totalDifference;
       });
+      if (productsWithEnoughSpace.length > 0) {
+        productsWithEnoughSpace.sort((a, b) => b.amount - a.amount);
+        const targetProduct = productsWithEnoughSpace[0];
+        const targetAllocation = result.get(targetProduct.productId);
+        if (targetAllocation) {
+          result.set(targetProduct.productId, {
+            discountAmount: new import_decimal.default(targetAllocation.discountAmount).plus(totalDifference).toNumber(),
+            difference: 0
+            // 不需要存储差值
+          });
+        }
+      } else {
+        singleQuantityProducts.sort((a, b) => b.amount - a.amount);
+        const targetProduct = singleQuantityProducts[0];
+        const targetAllocation = result.get(targetProduct.productId);
+        if (targetAllocation) {
+          result.set(targetProduct.productId, {
+            ...targetAllocation,
+            difference: totalDifference
+          });
+        }
+      }
+    } else {
+      const lastProduct = applicableProducts[applicableProducts.length - 1];
+      const lastProductAllocation = result.get(lastProduct.productId);
+      if (lastProductAllocation) {
+        result.set(lastProduct.productId, {
+          ...lastProductAllocation,
+          difference: totalDifference
+        });
+      }
     }
   }
   return result;

package/package.json

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