@pisell/pisellos 2.2.73 → 2.2.74

package/dist/model/strategy/adapter/promotion/evaluator.js

@@ -719,7 +719,8 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             unitProducts.push({
               product: product,
               price: product.price,
-              productId: product.id
+              productId: product.id,
+              sourceAvailableQty: availableQty
             });
           }
         }
@@ -736,8 +737,13 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         };
       }
 
-      // 2. 按价格从高到低排序（优先使用高价商品）
+      // 2. 排序：优先选择来源数量是 x 倍数的商品（可完整凑组不拆分），然后按价格从高到低
       unitProducts.sort(function (a, b) {
+        // 优先级1：来源购物车项数量是 x 的倍数的排前面（这些商品可以完整凑组，避免拆分）
+        var aIsMultiple = a.sourceAvailableQty > 0 && a.sourceAvailableQty % x === 0 ? 1 : 0;
+        var bIsMultiple = b.sourceAvailableQty > 0 && b.sourceAvailableQty % x === 0 ? 1 : 0;
+        if (aIsMultiple !== bIsMultiple) return bIsMultiple - aIsMultiple;
+        // 优先级2：按价格从高到低（优先使用高价商品）
         return b.price - a.price;
       });
 

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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/promotion/evaluator.js

@@ -512,14 +512,21 @@ var PromotionEvaluator = class {
         unitProducts.push({
           product,
           price: product.price,
-          productId: product.id
+          productId: product.id,
+          sourceAvailableQty: availableQty
         });
       }
     }
     if (unitProducts.length === 0) {
       return { products: [], originalAmount: 0, finalAmount: 0 };
     }
-    unitProducts.sort((a, b) => b.price - a.price);
+    unitProducts.sort((a, b) => {
+      const aIsMultiple = a.sourceAvailableQty > 0 && a.sourceAvailableQty % x === 0 ? 1 : 0;
+      const bIsMultiple = b.sourceAvailableQty > 0 && b.sourceAvailableQty % x === 0 ? 1 : 0;
+      if (aIsMultiple !== bIsMultiple)
+        return bIsMultiple - aIsMultiple;
+      return b.price - a.price;
+    });
     const totalUnits = unitProducts.length;
     const groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
     const promotionUnits = groupCount * x;

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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