@pisell/pisellos 0.0.480 → 0.0.481

package/dist/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/dist/core/index.js

@@ -403,6 +403,13 @@ var PisellOSCore = /*#__PURE__*/function () {
       }
       return destroy;
     }()
+  }, {
+    key: "setContext",
+    value: function setContext(ctx) {
+      this.context = _objectSpread(_objectSpread({}, this.context), ctx);
+      this.log("\u4E0A\u4E0B\u6587\u5DF2\u66F4\u65B0: ".concat(JSON.stringify(Object.keys(ctx))));
+    }
+
     /**
      * 验证上下文参数
      */

package/dist/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/dist/effects/index.js

@@ -1,11 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -26,12 +19,9 @@ var EffectsManager = /*#__PURE__*/function () {
     value: function on(event, callback) {
       var _this$listeners$get,
         _this = this;
-      var force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-      if (!this.listeners.has(event)) this.listeners.set(event, []);
-      (_this$listeners$get = this.listeners.get(event)) === null || _this$listeners$get === void 0 || _this$listeners$get.push({
-        callback: callback,
-        force: force
-      });
+      if (!this.listeners.has(event)) this.listeners.set(event, new Set());
+      (_this$listeners$get = this.listeners.get(event)) === null || _this$listeners$get === void 0 || _this$listeners$get.add(callback);
+
       // 返回取消函数
       return function () {
         _this.off(event, callback);
@@ -42,16 +32,18 @@ var EffectsManager = /*#__PURE__*/function () {
   }, {
     key: "only",
     value: function only(event, callback) {
-      var _this$listeners$get2,
+      var _this$listeners$get3,
         _this2 = this;
       // 清除该事件的所有现有监听器
-      this.listeners.set(event, []);
+      if (this.listeners.has(event)) {
+        var _this$listeners$get2;
+        (_this$listeners$get2 = this.listeners.get(event)) === null || _this$listeners$get2 === void 0 || _this$listeners$get2.clear();
+      } else {
+        this.listeners.set(event, new Set());
+      }
 
       // 添加新的监听器
-      (_this$listeners$get2 = this.listeners.get(event)) === null || _this$listeners$get2 === void 0 || _this$listeners$get2.push({
-        callback: callback,
-        force: false
-      });
+      (_this$listeners$get3 = this.listeners.get(event)) === null || _this$listeners$get3 === void 0 || _this$listeners$get3.add(callback);
 
       // 返回取消函数
       return function () {
@@ -61,14 +53,8 @@ var EffectsManager = /*#__PURE__*/function () {
   }, {
     key: "off",
     value: function off(event, callback) {
-      var eventListeners = this.listeners.get(event);
-      if (!(eventListeners !== null && eventListeners !== void 0 && eventListeners.length)) return;
-      for (var 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 _this$listeners$get4;
+      (_this$listeners$get4 = this.listeners.get(event)) === null || _this$listeners$get4 === void 0 || _this$listeners$get4.delete(callback);
     }
 
     // 模块销毁时，删除所有以模块名开头的监听
@@ -86,7 +72,6 @@ var EffectsManager = /*#__PURE__*/function () {
     key: "once",
     value: function once(event, callback) {
       var _this4 = this;
-      var force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       var wrapper = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(payload) {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -108,19 +93,18 @@ var EffectsManager = /*#__PURE__*/function () {
       }();
 
       // 调用修改后的on方法，它会返回取消函数
-      return this.on(event, wrapper, force);
+      return this.on(event, wrapper);
     }
   }, {
     key: "emit",
     value: function () {
       var _emit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(event, payload) {
-        var _reverse$find;
-        var callbacks, forceCallbacks, topNormalListener, targetCallbacks;
+        var callbacks, res, isAllPass;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               callbacks = this.listeners.get(event);
-              if (callbacks !== null && callbacks !== void 0 && callbacks.length) {
+              if (callbacks) {
                 _context3.next = 3;
                 break;
               }
@@ -129,71 +113,40 @@ var EffectsManager = /*#__PURE__*/function () {
                 data: []
               });
             case 3:
-              forceCallbacks = callbacks.filter(function (listener) {
-                return listener.force;
-              }).map(function (listener) {
-                return listener.callback;
-              });
-              topNormalListener = (_reverse$find = _toConsumableArray(callbacks).reverse().find(function (listener) {
-                return !listener.force;
-              })) === null || _reverse$find === void 0 ? void 0 : _reverse$find.callback;
-              targetCallbacks = topNormalListener ? [].concat(_toConsumableArray(forceCallbacks), [topNormalListener]) : forceCallbacks;
-              return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve) {
-                  var res, _iterator, _step, cb, result, isAllPass;
+              res = [];
+              _context3.next = 6;
+              return Promise.all(Array.from(callbacks).reverse().map( /*#__PURE__*/function () {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cb) {
+                  var result;
                   return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
                       case 0:
-                        res = [];
-                        _iterator = _createForOfIteratorHelper(targetCallbacks);
-                        _context2.prev = 2;
-                        _iterator.s();
-                      case 4:
-                        if ((_step = _iterator.n()).done) {
-                          _context2.next = 12;
-                          break;
-                        }
-                        cb = _step.value;
-                        _context2.next = 8;
+                        _context2.next = 2;
                         return cb(payload);
-                      case 8:
+                      case 2:
                         result = _context2.sent;
                         if (result !== undefined && _typeof(result) === 'object' && 'status' in result) {
                           res.push(result);
                         }
-                      case 10:
-                        _context2.next = 4;
-                        break;
-                      case 12:
-                        _context2.next = 17;
-                        break;
-                      case 14:
-                        _context2.prev = 14;
-                        _context2.t0 = _context2["catch"](2);
-                        _iterator.e(_context2.t0);
-                      case 17:
-                        _context2.prev = 17;
-                        _iterator.f();
-                        return _context2.finish(17);
-                      case 20:
-                        isAllPass = res.every(function (r) {
-                          return (r === null || r === void 0 ? void 0 : r.status) !== false;
-                        });
-                        resolve({
-                          status: isAllPass,
-                          data: res
-                        });
-                      case 22:
+                      case 4:
                       case "end":
                         return _context2.stop();
                     }
-                  }, _callee2, null, [[2, 14, 17, 20]]);
+                  }, _callee2);
                 }));
                 return function (_x4) {
                   return _ref2.apply(this, arguments);
                 };
               }()));
-            case 7:
+            case 6:
+              isAllPass = res.every(function (r) {
+                return (r === null || r === void 0 ? void 0 : r.status) !== false;
+              });
+              return _context3.abrupt("return", {
+                status: isAllPass,
+                data: res
+              });
+            case 8:
             case "end":
               return _context3.stop();
           }

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;
       });
 
@@ -833,7 +839,10 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             var totalAllocated = allocatedPrices.reduce(function (sum, p) {
               return sum.plus(p);
             }, new Decimal(0));
-            var finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+            // 取促销价和原价的最小值，避免促销反而加价
+            var productOriginalAmount = new Decimal(_product.price).mul(promoQty);
+            var actualTotal = Decimal.min(totalAllocated, productOriginalAmount);
+            var finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
               quantity: promoQty,
               finalPrice: finalPricePerUnit,
@@ -843,9 +852,8 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
               isSplit: false,
               matchedBundleIndex: matchedBundleIndex
             }));
-            var productOriginalAmount = new Decimal(_product.price).mul(promoQty);
             originalAmount = originalAmount.plus(productOriginalAmount);
-            finalAmount = finalAmount.plus(totalAllocated);
+            finalAmount = finalAmount.plus(actualTotal);
           } else if (promoQty === 0 && remainingQty > 0) {
             // 全部不参与促销：保留原 id，finalPrice = 原价
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
@@ -865,7 +873,10 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             var _totalAllocated = allocatedPrices.reduce(function (sum, p) {
               return sum.plus(p);
             }, new Decimal(0));
-            var _finalPricePerUnit = this.formatPrice(_totalAllocated.div(promoQty));
+            // 取促销价和原价的最小值，避免促销反而加价
+            var promoOriginalAmount = new Decimal(_product.price).mul(promoQty);
+            var _actualTotal = Decimal.min(_totalAllocated, promoOriginalAmount);
+            var _finalPricePerUnit = this.formatPrice(_actualTotal.div(promoQty));
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
               id: this.generateRandomId(),
               originalId: _product.id,
@@ -877,9 +888,8 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
               matchedBundleIndex: matchedBundleIndex,
               isSplit: true
             }));
-            var promoOriginalAmount = new Decimal(_product.price).mul(promoQty);
             originalAmount = originalAmount.plus(promoOriginalAmount);
-            finalAmount = finalAmount.plus(_totalAllocated);
+            finalAmount = finalAmount.plus(_actualTotal);
 
             // 不参与促销的部分：保留原 id
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
@@ -898,11 +908,74 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           // 更新已处理数量
           processedQuantityMap.set(_key, _processedQty + _availableQty);
         }
+
+        // 8. 尾差调整：确保促销商品的 finalPrice × quantity 之和精确等于 groupPrice × groupCount
       } catch (err) {
         _iterator13.e(err);
       } finally {
         _iterator13.f();
       }
+      if (groupCount > 0) {
+        var expectedPromoTotal = new Decimal(groupPrice).mul(groupCount);
+        var promoItems = result.filter(function (p) {
+          return p.inPromotion;
+        });
+        var actualPromoTotal = new Decimal(0);
+        var _iterator14 = _createForOfIteratorHelper(promoItems),
+          _step14;
+        try {
+          for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+            var _p = _step14.value;
+            actualPromoTotal = actualPromoTotal.plus(new Decimal(_p.finalPrice).mul(_p.quantity));
+          }
+        } catch (err) {
+          _iterator14.e(err);
+        } finally {
+          _iterator14.f();
+        }
+        var roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
+        if (!roundingDiff.eq(0)) {
+          // 优先找 quantity=1 的促销商品调整（差额直接加减到单价上）
+          var adjustTarget = promoItems.find(function (p) {
+            return p.quantity === 1;
+          });
+          if (adjustTarget) {
+            adjustTarget.finalPrice = this.formatPrice(new Decimal(adjustTarget.finalPrice).minus(roundingDiff));
+          } else if (promoItems.length > 0) {
+            // 没有 quantity=1 的促销商品，从最后一个促销商品中拆出1件做尾差调整
+            var lastPromo = promoItems[promoItems.length - 1];
+            var adjustedUnitPrice = this.formatPrice(new Decimal(lastPromo.finalPrice).minus(roundingDiff));
+
+            // 原商品减少1件
+            lastPromo.quantity -= 1;
+            lastPromo.isSplit = true;
+
+            // 拆出1件用调整后的价格
+            result.push(_objectSpread(_objectSpread({}, lastPromo), {}, {
+              id: this.generateRandomId(),
+              originalId: lastPromo.originalId || lastPromo.id,
+              quantity: 1,
+              finalPrice: adjustedUnitPrice,
+              isSplit: true
+            }));
+          }
+
+          // 重新计算 finalAmount
+          finalAmount = new Decimal(0);
+          var _iterator15 = _createForOfIteratorHelper(result),
+            _step15;
+          try {
+            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+              var p = _step15.value;
+              finalAmount = finalAmount.plus(new Decimal(p.finalPrice).mul(p.quantity));
+            }
+          } catch (err) {
+            _iterator15.e(err);
+          } finally {
+            _iterator15.f();
+          }
+        }
+      }
       return {
         products: result,
         originalAmount: originalAmount.toNumber(),
@@ -937,11 +1010,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       // 对于 bundle 子商品匹配，促销数量 = 主商品数量 × bundle子商品数量
       var totalPromoQty = 0;
       var productInfoMap = new Map();
-      var _iterator14 = _createForOfIteratorHelper(groupProducts),
-        _step14;
+      var _iterator16 = _createForOfIteratorHelper(groupProducts),
+        _step16;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var product = _step14.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var product = _step16.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -967,18 +1040,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 2. 判断是否满足促销条件
       } catch (err) {
-        _iterator14.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator14.f();
+        _iterator16.f();
       }
       var isFulfilled = totalPromoQty >= buyQuantity;
 
       // 3. 生成商品结果（第二次遍历）
-      var _iterator15 = _createForOfIteratorHelper(groupProducts),
-        _step15;
+      var _iterator17 = _createForOfIteratorHelper(groupProducts),
+        _step17;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var _product2 = _step15.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var _product2 = _step17.value;
           var _key2 = this.getProductKey(_product2);
           var info = productInfoMap.get(_key2);
           if (!info || info.availableQty <= 0) continue;
@@ -1006,9 +1079,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 4. 计算赠品数量（使用促销数量）
       } catch (err) {
-        _iterator15.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator15.f();
+        _iterator17.f();
       }
       var giftCount = 0;
       if (isFulfilled) {
@@ -1037,11 +1110,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "getRemainingProducts",
     value: function getRemainingProducts(allProducts, processedQuantityMap) {
       var result = [];
-      var _iterator16 = _createForOfIteratorHelper(allProducts),
-        _step16;
+      var _iterator18 = _createForOfIteratorHelper(allProducts),
+        _step18;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var product = _step16.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var product = _step18.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var remainingQty = product.quantity - processedQty;
@@ -1056,9 +1129,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator16.f();
+        _iterator18.f();
       }
       return result;
     }

package/dist/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/dist/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;