@pisell/pisellos 0.0.479 → 0.0.481

package/dist/solution/Sales/types.js

@@ -0,0 +1,26 @@
+export var SalesHooks = /*#__PURE__*/function (SalesHooks) {
+  SalesHooks["onInited"] = "sales:onInited";
+  SalesHooks["onDestroy"] = "sales:onDestroy";
+  SalesHooks["onCurrentDayChanged"] = "sales:onCurrentDayChanged";
+  SalesHooks["onReservationListChanged"] = "sales:onReservationListChanged";
+  return SalesHooks;
+}({});
+
+/**
+ * 预订记录类型（暂用 OrderData 占位）
+ *
+ * TODO(Rolo): 等领导提供 reservationList 的目标结构后，
+ * 将 Server/Order 原始数据转换为真正的 Reservation DTO，
+ * 当前不要直接把 OrderData 当作最终 UI 数据结构。
+ */
+
+/**
+ * Sales 解决方案状态
+ *
+ * - currentDay: 当前选择的日期，默认当天 00:00:00
+ * - reservationList: currentDay 对应的预约列表（数据来源于 Server/Order，转换逻辑待补）
+ */
+
+/**
+ * Sales 解决方案最小 API 面
+ */

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

@@ -30,6 +30,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
+    setOrderId(id?: number): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       filteredDiscountList: [],
       orderTotalAmount: 0,
       holders: [],
-      bookingSubject: undefined
+      bookingSubject: undefined,
+      orderId: undefined
     };
     return _this;
   }
@@ -307,6 +308,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setBookingSubject(bookingSubject) {
       this.store.bookingSubject = bookingSubject;
     }
+  }, {
+    key: "setOrderId",
+    value: function setOrderId(id) {
+      this.store.orderId = id;
+    }
 
     // 计算优惠券
   }, {
@@ -371,6 +377,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 找到需要修改状态的优惠券
       var newDiscountList = discountList.map(function (discount) {
+        if (discount.isEditMode) return discount;
         if (selectionMap.has(discount.id)) {
           var targetIsSelected = selectionMap.get(discount.id);
           return _objectSpread(_objectSpread({}, discount), {}, {
@@ -443,7 +450,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _context6.prev = 0;
               _context6.next = 3;
-              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, customerId);
+              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, {
+                customerId: customerId,
+                orderId: this.store.orderId
+              });
             case 3:
               _context6.t0 = _context6.sent;
               if (_context6.t0) {
@@ -504,9 +514,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
-                orderTotalAmount: this.store.orderTotalAmount || 0,
                 holders: this.store.holders || [],
-                isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
+                isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form',
+                orderTotalAmount: this.store.orderTotalAmount || 0
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -785,24 +795,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _context10.prev = 0;
+              orderId = this.store.orderId;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context10.next = 4;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig({
+              _context10.next = 5;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
                 customer_id: customerId,
-                action: 'create',
+                action: orderId ? 'update' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              });
-            case 4:
+              }, orderId ? {
+                order_id: orderId
+              } : {}));
+            case 5:
               goodPassList = _context10.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
@@ -815,35 +828,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 12;
+              _context10.next = 13;
               return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 12:
+            case 13:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context10.next = 19;
+                _context10.next = 20;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 19;
+              _context10.next = 20;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 19:
-              _context10.next = 21;
+            case 20:
+              _context10.next = 22;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 21:
-              _context10.next = 26;
+            case 22:
+              _context10.next = 27;
               break;
-            case 23:
-              _context10.prev = 23;
+            case 24:
+              _context10.prev = 24;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 26:
+            case 27:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 23]]);
+        }, _callee10, this, [[0, 24]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -36,6 +36,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;
@@ -44,4 +45,9 @@ export interface SetDiscountSelectedParams {
         discountId: number;
         isSelected: boolean;
     }[];
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
+    orderId?: number;
 }

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

@@ -2,6 +2,15 @@ import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
 export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
 export declare const isAllNormalProduct: (items: any[]) => boolean;
+/**
+ * 获取折扣金额 基于折扣卡类型计算
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount
+ * @param total
+ * @param price
+ * @returns
+ */
 /**
  * 获取折扣金额 基于折扣卡类型计算
  * 商品券：直接返回商品价格

package/dist/solution/ShopDiscount/utils.js

@@ -30,6 +30,15 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
   });
 };
 
+/**
+ * 获取折扣金额 基于折扣卡类型计算 
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount 
+ * @param total 
+ * @param price 
+ * @returns 
+ */
 /**
  * 获取折扣金额 基于折扣卡类型计算 
  * 商品券：直接返回商品价格
@@ -40,38 +49,23 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
  * @returns 
  */
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
-  var discountedPrice = 0;
-
+  var _discount$metadata;
   // 商品券
   if (discount.tag === 'good_pass') {
-    discountedPrice = new Decimal(price).minus(new Decimal(price || 0)).toNumber();
-  } else {
-    var _discount$metadata;
-    // 判断是否是固定金额
-    var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
-
-    // 固定金额 小于0时返回0
-    if (isFixedAmount) {
-      var _discount$amount;
-      discountedPrice = Math.max(new Decimal(price).minus(new Decimal(((_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.par_value) || 0)).toNumber(), 0);
-    } else {
-      // 百分比：根据折扣卡金额计算
-      discountedPrice = new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
-    }
+    return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 
-  /*
-    // 🔥 如果有 maxDeductionAmount 限制，确保折扣金额不超过限制
-    if (discount.config?.maxDeductionAmount) {
-      const actualDiscountAmount = new Decimal(price).minus(discountedPrice).toNumber();
-      if (actualDiscountAmount > discount.config.maxDeductionAmount) {
-        // 折扣金额超过限制，重新计算折扣后价格
-        discountedPrice = new Decimal(price).minus(discount.config.maxDeductionAmount).toNumber();
-      }
-    }
-  */
+  // 判断是否是固定金额
+  var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
+
+  // 固定金额 小于0时返回0
+  if (isFixedAmount) {
+    var _discount$amount;
+    return Math.max(new Decimal(price).minus(new Decimal(((_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.par_value) || 0)).toNumber(), 0);
+  }
 
-  return discountedPrice;
+  // 百分比：根据折扣卡金额计算
+  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
 };
 export var getDiscountListAmountTotal = function getDiscountListAmountTotal(discount) {
   return discount.reduce(function (acc, cur) {

package/dist/solution/index.d.ts

@@ -2,5 +2,6 @@ export * from './BuyTickets';
 export * from './BookingByStep';
 export * from './BookingTicket';
 export * from './ShopDiscount';
-export * from './Checkout';
 export * from './RegisterAndLogin';
+export * from './Checkout';
+export * from './Sales';

package/dist/solution/index.js

@@ -2,5 +2,6 @@ export * from "./BuyTickets";
 export * from "./BookingByStep";
 export * from "./BookingTicket";
 export * from "./ShopDiscount";
+export * from "./RegisterAndLogin";
 export * from "./Checkout";
-export * from "./RegisterAndLogin";
+export * from "./Sales";

package/dist/types/index.d.ts

@@ -50,6 +50,9 @@ export interface PisellCore {
     };
     context: BusinessContext;
     validateContext: (config: ModuleContextConfig) => boolean;
+    serverOptions?: ServerOptions;
+    server?: any;
+    setContext: (ctx: Partial<BusinessContext>) => void;
 }
 /**
  * 业务上下文接口
@@ -57,6 +60,7 @@ export interface PisellCore {
 export interface BusinessContext {
     userId?: string;
     companyId?: string;
+    locale?: string;
     [key: string]: any;
 }
 /**
@@ -90,6 +94,7 @@ export interface ServerModuleConfig {
  * Server 配置选项
  */
 export interface ServerOptions {
+    All_DATA_SOURCES: Record<string, any>;
     /** 要启用的模块列表 */
     modules?: string[] | ServerModuleConfig[];
     /** 是否自动初始化数据 */

package/lib/core/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginOptions, Module, ModuleOptions, PisellCore, PisellOSOptions, BusinessContext, ModuleContextConfig, InitializeServerOptions } from '../types';
+import { Plugin, PluginOptions, Module, ModuleOptions, PisellCore, PisellOSOptions, BusinessContext, ModuleContextConfig, ServerOptions, InitializeServerOptions } from '../types';
 import { EffectsManager } from '../effects';
 /**
  * pisell OS 核心实现
@@ -11,7 +11,7 @@ declare class PisellOSCore implements PisellCore {
     private debug;
     context: BusinessContext;
     server: any;
-    private serverOptions?;
+    serverOptions?: ServerOptions;
     constructor(options?: PisellOSOptions);
     private initialize;
     /**
@@ -29,6 +29,7 @@ declare class PisellOSCore implements PisellCore {
     getModuleExports<T = any>(name: string): T | null;
     hasModule(name: string): boolean;
     destroy(): Promise<void>;
+    setContext(ctx: Partial<BusinessContext>): void;
     /**
      * 验证上下文参数
      */

package/lib/core/index.js

@@ -235,6 +235,10 @@ var PisellOSCore = class {
     this.plugins.clear();
     this.log("PisellOS 核心已销毁");
   }
+  setContext(ctx) {
+    this.context = { ...this.context, ...ctx };
+    this.log(`上下文已更新: ${JSON.stringify(Object.keys(ctx))}`);
+  }
   /**
    * 验证上下文参数
    */

package/lib/effects/index.d.ts

@@ -5,11 +5,11 @@ type EffectCallback = (payload: any) => void | Promise<void | {
 type UnsubscribeFunction = () => void;
 declare class EffectsManager {
     private listeners;
-    on(event: string, callback: EffectCallback, force?: boolean): UnsubscribeFunction;
+    on(event: string, callback: EffectCallback): UnsubscribeFunction;
     only(event: string, callback: EffectCallback): UnsubscribeFunction;
     off(event: string, callback: EffectCallback): void;
     offByModuleDestroy(module: string): void;
-    once(event: string, callback: EffectCallback, force?: boolean): UnsubscribeFunction;
+    once(event: string, callback: EffectCallback): UnsubscribeFunction;
     emit(event: string, payload: any): Promise<{
         status: boolean;
         data: any;

package/lib/effects/index.js

@@ -26,36 +26,31 @@ var EffectsManager = class {
   constructor() {
     this.listeners = /* @__PURE__ */ new Map();
   }
-  on(event, callback, force = true) {
+  on(event, callback) {
     var _a;
     if (!this.listeners.has(event))
-      this.listeners.set(event, []);
-    (_a = this.listeners.get(event)) == null ? void 0 : _a.push({ callback, force });
+      this.listeners.set(event, /* @__PURE__ */ new Set());
+    (_a = this.listeners.get(event)) == null ? void 0 : _a.add(callback);
     return () => {
       this.off(event, callback);
     };
   }
   // 设置单例监听器，只能存在一个，新的会替换旧的
   only(event, callback) {
-    var _a;
-    this.listeners.set(event, []);
-    (_a = this.listeners.get(event)) == null ? void 0 : _a.push({ callback, force: false });
+    var _a, _b;
+    if (this.listeners.has(event)) {
+      (_a = this.listeners.get(event)) == null ? void 0 : _a.clear();
+    } else {
+      this.listeners.set(event, /* @__PURE__ */ new Set());
+    }
+    (_b = this.listeners.get(event)) == null ? void 0 : _b.add(callback);
     return () => {
       this.off(event, callback);
     };
   }
   off(event, callback) {
-    const eventListeners = this.listeners.get(event);
-    if (!(eventListeners == null ? void 0 : eventListeners.length))
-      return;
-    for (let index = eventListeners.length - 1; index >= 0; index--) {
-      if (eventListeners[index].callback !== callback)
-        continue;
-      eventListeners.splice(index, 1);
-      break;
-    }
-    if (!eventListeners.length)
-      this.listeners.delete(event);
+    var _a;
+    (_a = this.listeners.get(event)) == null ? void 0 : _a.delete(callback);
   }
   // 模块销毁时，删除所有以模块名开头的监听
   offByModuleDestroy(module2) {
@@ -65,32 +60,28 @@ var EffectsManager = class {
       }
     });
   }
-  once(event, callback, force = true) {
+  once(event, callback) {
     const wrapper = async (payload) => {
       await callback(payload);
       this.off(event, wrapper);
     };
-    return this.on(event, wrapper, force);
+    return this.on(event, wrapper);
   }
   async emit(event, payload) {
-    var _a;
     const callbacks = this.listeners.get(event);
-    if (!(callbacks == null ? void 0 : callbacks.length))
+    if (!callbacks)
       return { status: true, data: [] };
-    const forceCallbacks = callbacks.filter((listener) => listener.force).map((listener) => listener.callback);
-    const topNormalListener = (_a = [...callbacks].reverse().find((listener) => !listener.force)) == null ? void 0 : _a.callback;
-    const targetCallbacks = topNormalListener ? [...forceCallbacks, topNormalListener] : forceCallbacks;
-    return new Promise(async (resolve) => {
-      const res = [];
-      for (const cb of targetCallbacks) {
+    const res = [];
+    await Promise.all(
+      Array.from(callbacks).reverse().map(async (cb) => {
         const result = await cb(payload);
         if (result !== void 0 && typeof result === "object" && "status" in result) {
           res.push(result);
         }
-      }
-      const isAllPass = res.every((r) => (r == null ? void 0 : r.status) !== false);
-      resolve({ status: isAllPass, data: res });
-    });
+      })
+    );
+    const isAllPass = res.every((r) => (r == null ? void 0 : r.status) !== false);
+    return { status: isAllPass, data: res };
   }
   clear() {
     this.listeners.clear();

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;
@@ -573,7 +580,9 @@ var PromotionEvaluator = class {
           (sum, p) => sum.plus(p),
           new import_decimal.default(0)
         );
-        const finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+        const productOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
+        const actualTotal = import_decimal.default.min(totalAllocated, productOriginalAmount);
+        const finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
         result.push({
           ...product,
           quantity: promoQty,
@@ -584,9 +593,8 @@ var PromotionEvaluator = class {
           isSplit: false,
           matchedBundleIndex
         });
-        const productOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
         originalAmount = originalAmount.plus(productOriginalAmount);
-        finalAmount = finalAmount.plus(totalAllocated);
+        finalAmount = finalAmount.plus(actualTotal);
       } else if (promoQty === 0 && remainingQty > 0) {
         result.push({
           ...product,
@@ -605,7 +613,9 @@ var PromotionEvaluator = class {
           (sum, p) => sum.plus(p),
           new import_decimal.default(0)
         );
-        const finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+        const promoOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
+        const actualTotal = import_decimal.default.min(totalAllocated, promoOriginalAmount);
+        const finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
         result.push({
           ...product,
           id: this.generateRandomId(),
@@ -618,9 +628,8 @@ var PromotionEvaluator = class {
           matchedBundleIndex,
           isSplit: true
         });
-        const promoOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
         originalAmount = originalAmount.plus(promoOriginalAmount);
-        finalAmount = finalAmount.plus(totalAllocated);
+        finalAmount = finalAmount.plus(actualTotal);
         result.push({
           ...product,
           quantity: remainingQty,
@@ -636,6 +645,46 @@ var PromotionEvaluator = class {
       }
       processedQuantityMap.set(key, processedQty + availableQty);
     }
+    if (groupCount > 0) {
+      const expectedPromoTotal = new import_decimal.default(groupPrice).mul(groupCount);
+      const promoItems = result.filter((p) => p.inPromotion);
+      let actualPromoTotal = new import_decimal.default(0);
+      for (const p of promoItems) {
+        actualPromoTotal = actualPromoTotal.plus(
+          new import_decimal.default(p.finalPrice).mul(p.quantity)
+        );
+      }
+      const roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
+      if (!roundingDiff.eq(0)) {
+        const adjustTarget = promoItems.find((p) => p.quantity === 1);
+        if (adjustTarget) {
+          adjustTarget.finalPrice = this.formatPrice(
+            new import_decimal.default(adjustTarget.finalPrice).minus(roundingDiff)
+          );
+        } else if (promoItems.length > 0) {
+          const lastPromo = promoItems[promoItems.length - 1];
+          const adjustedUnitPrice = this.formatPrice(
+            new import_decimal.default(lastPromo.finalPrice).minus(roundingDiff)
+          );
+          lastPromo.quantity -= 1;
+          lastPromo.isSplit = true;
+          result.push({
+            ...lastPromo,
+            id: this.generateRandomId(),
+            originalId: lastPromo.originalId || lastPromo.id,
+            quantity: 1,
+            finalPrice: adjustedUnitPrice,
+            isSplit: true
+          });
+        }
+        finalAmount = new import_decimal.default(0);
+        for (const p of result) {
+          finalAmount = finalAmount.plus(
+            new import_decimal.default(p.finalPrice).mul(p.quantity)
+          );
+        }
+      }
+    }
     return {
       products: result,
       originalAmount: originalAmount.toNumber(),

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -41,7 +41,7 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；该行总券次上限 = maxPassesPerItem × 该行 quantity（按行唯一键区分）。0 表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -50,6 +50,10 @@ export interface Voucher {
  */
 export interface Product {
     product_id: number;
+    /** 订单明细 id，参与行唯一键兜底解析 */
+    id?: number;
+    /** 行级唯一串，参与行唯一键解析 */
+    product_unique_string?: string;
     price: number;
     quantity: number;
     name?: string;
@@ -61,6 +65,9 @@ export interface Product {
     /** 主商品税费 */
     tax_fee: number;
     metadata: {
+        /** 行唯一标识，优先用于 Wallet Pass 按行配额 */
+        product_unique?: string;
+        unique_identification_number?: string;
         main_product_attached_bundle_tax_fee?: number;
         main_product_attached_bundle_surcharge_fee?: number;
         surcharge_rounding_remainder?: number;
@@ -132,7 +139,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；行总上限 = maxPassesPerItem × 该行 quantity（按行唯一键计）。0 表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

package/lib/model/strategy/adapter/walletPass/utils.d.ts

@@ -1,4 +1,10 @@
 import { Product, Voucher } from './type';
+/** 订单商品数量 */
+export declare const getProductQuantity: (product: any) => any;
+/**
+ * 订单商品行唯一键，用于 maxPassesPerItem 按行、按件配额（同 SPU 不同规格视为不同行）。
+ */
+export declare function resolveWalletPassLineKey(product: any, indexInOrder: number): string;
 export declare const getApplicableProductIds: (voucher: Voucher) => number[] | null;
 /**
  * 优惠券处理函数
@@ -64,12 +70,6 @@ export declare const getBundleItemDiscountDifference: (bundleItem: any) => numbe
  * @returns 子商品总价格（不含舍入余数）
  */
 export declare const getBundleItemPrice: (bundleItem: any, parentQuantity: number, isDeductTaxAndFee: boolean) => number;
-/**
- * 获取商品数量
- * @param product 商品
- * @returns 商品数量
- */
-export declare const getProductQuantity: (product: any) => any;
 export declare const getBundleItemIsOriginalPrice: (item: any) => boolean;
 export declare const getBundleItemIsMarkupPrice: (item: any) => boolean;
 export declare const getBundleItemIsDiscountPrice: (item: any) => boolean;