@pisell/pisellos 2.3.57 → 2.3.59

package/dist/core/index.d.ts

@@ -12,8 +12,15 @@ declare class PisellOSCore implements PisellCore {
     context: BusinessContext;
     server: any;
     serverOptions?: ServerOptions;
+    private serverModulePromise?;
     constructor(options?: PisellOSOptions);
     private initialize;
+    /**
+     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
+     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
+     */
+    preloadServerModule(): Promise<void>;
+    private loadServerModule;
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取

package/dist/core/index.js

@@ -24,8 +24,6 @@ import { EffectsManager } from "../effects";
  * pisell OS 核心实现
  */
 var PisellOSCore = /*#__PURE__*/function () {
-  // 保存 Server 配置
-
   function PisellOSCore(options) {
     _classCallCheck(this, PisellOSCore);
     _defineProperty(this, "plugins", new Map());
@@ -37,6 +35,8 @@ var PisellOSCore = /*#__PURE__*/function () {
     _defineProperty(this, "server", void 0);
     // Server 实例
     _defineProperty(this, "serverOptions", void 0);
+    // 保存 Server 配置
+    _defineProperty(this, "serverModulePromise", void 0);
     this.debug = (options === null || options === void 0 ? void 0 : options.debug) || false;
     this.context = (options === null || options === void 0 ? void 0 : options.context) || {};
 
@@ -45,6 +45,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log('constructor123456');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",
@@ -63,6 +64,49 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.log('[PisellOS] 核心初始化完成');
     }
 
+    /**
+     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
+     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
+     */
+  }, {
+    key: "preloadServerModule",
+    value: (function () {
+      var _preloadServerModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!(this.server || !this.serverOptions)) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return");
+            case 2:
+              _context.next = 4;
+              return this.loadServerModule();
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function preloadServerModule() {
+        return _preloadServerModule.apply(this, arguments);
+      }
+      return preloadServerModule;
+    }())
+  }, {
+    key: "loadServerModule",
+    value: function loadServerModule() {
+      var _this2 = this;
+      if (!this.serverModulePromise) {
+        this.serverModulePromise = import("../server").catch(function (error) {
+          _this2.serverModulePromise = undefined;
+          throw error;
+        });
+      }
+      return this.serverModulePromise;
+    }
+
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取
@@ -70,57 +114,57 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "initializeServer",
     value: (function () {
-      var _initializeServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
+      var _initializeServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
         var ServerModule, Server;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!this.server) {
-                _context.next = 3;
+                _context2.next = 3;
                 break;
               }
               this.log('Server 已经初始化，跳过重复初始化', 'warn');
-              return _context.abrupt("return");
+              return _context2.abrupt("return");
             case 3:
               if (this.serverOptions) {
-                _context.next = 6;
+                _context2.next = 6;
                 break;
               }
               this.log('未提供 Server 配置，无法初始化', 'warn');
-              return _context.abrupt("return");
+              return _context2.abrupt("return");
             case 6:
-              _context.prev = 6;
-              _context.next = 9;
-              return import("../server");
+              _context2.prev = 6;
+              _context2.next = 9;
+              return this.loadServerModule();
             case 9:
-              ServerModule = _context.sent;
+              ServerModule = _context2.sent;
               Server = ServerModule.default; // 创建 Server 实例
               this.server = new Server(this);
               this.log('Server 实例已创建');
 
               // 初始化模块并预加载数据
               if (!this.serverOptions.modules) {
-                _context.next = 16;
+                _context2.next = 16;
                 break;
               }
-              _context.next = 16;
+              _context2.next = 16;
               return this.server.initialize(this.serverOptions.modules, this.serverOptions.autoInitData !== false, options);
             case 16:
               console.log('[PisellOS] ✅ Server 初始化完成，所有数据已预加载');
               this.log('[PisellOS] Server 初始化完成');
-              _context.next = 25;
+              _context2.next = 25;
               break;
             case 20:
-              _context.prev = 20;
-              _context.t0 = _context["catch"](6);
-              console.error('[PisellOS] ❌ Server 初始化失败:', _context.t0);
-              this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context.t0), 'error');
-              throw _context.t0;
+              _context2.prev = 20;
+              _context2.t0 = _context2["catch"](6);
+              console.error('[PisellOS] ❌ Server 初始化失败:', _context2.t0);
+              this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context2.t0), 'error');
+              throw _context2.t0;
             case 25:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this, [[6, 20]]);
+        }, _callee2, this, [[6, 20]]);
       }));
       function initializeServer(_x) {
         return _initializeServer.apply(this, arguments);
@@ -153,7 +197,7 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "registerPlugin",
     value: function registerPlugin(plugin, options) {
-      var _this2 = this;
+      var _this3 = this;
       if (this.plugins.has(plugin.name)) {
         this.log("\u63D2\u4EF6 ".concat(plugin.name, " \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6"), 'warn');
       }
@@ -181,7 +225,7 @@ var PisellOSCore = /*#__PURE__*/function () {
         var result = plugin.initialize();
         if (result instanceof Promise) {
           result.catch(function (err) {
-            _this2.log("\u63D2\u4EF6 ".concat(plugin.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
+            _this3.log("\u63D2\u4EF6 ".concat(plugin.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
             throw err;
           });
         }
@@ -207,7 +251,7 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "registerModule",
     value: function registerModule(module, options) {
-      var _this3 = this;
+      var _this4 = this;
       if (this.modules.has(module.name)) {
         this.log("\u6A21\u5757 ".concat(module.name, " \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6"), 'warn');
       }
@@ -250,7 +294,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       // 预先给模块初始化值系统
       var _createStore = createStore((options === null || options === void 0 ? void 0 : options.initialState) || {}, module.name, function (path, value) {
           console.log('core 检测到模块值更新', module.name, path, value);
-          _this3.effects.emit("".concat(module.name, ":changed"), {
+          _this4.effects.emit("".concat(module.name, ":changed"), {
             path: path,
             value: value
           });
@@ -265,7 +309,7 @@ var PisellOSCore = /*#__PURE__*/function () {
         }, options));
         if (result instanceof Promise) {
           result.catch(function (err) {
-            _this3.log("\u6A21\u5757 ".concat(module.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
+            _this4.log("\u6A21\u5757 ".concat(module.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
             throw err;
           });
         }
@@ -310,100 +354,100 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _iterator4, _step4, _step4$value, name, module, _iterator5, _step5, _step5$value, _name, plugin;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               // 先销毁模块
               _iterator4 = _createForOfIteratorHelper(this.modules.entries());
-              _context2.prev = 1;
+              _context3.prev = 1;
               _iterator4.s();
             case 3:
               if ((_step4 = _iterator4.n()).done) {
-                _context2.next = 17;
+                _context3.next = 17;
                 break;
               }
               _step4$value = _slicedToArray(_step4.value, 2), name = _step4$value[0], module = _step4$value[1];
               if (!module.destroy) {
-                _context2.next = 15;
+                _context3.next = 15;
                 break;
               }
-              _context2.prev = 6;
-              _context2.next = 9;
+              _context3.prev = 6;
+              _context3.next = 9;
               return Promise.resolve(module.destroy());
             case 9:
               this.log("\u6A21\u5757 ".concat(name, " \u5DF2\u9500\u6BC1"));
-              _context2.next = 15;
+              _context3.next = 15;
               break;
             case 12:
-              _context2.prev = 12;
-              _context2.t0 = _context2["catch"](6);
-              this.log("\u9500\u6BC1\u6A21\u5757 ".concat(name, " \u65F6\u51FA\u9519: ").concat(_context2.t0), 'error');
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](6);
+              this.log("\u9500\u6BC1\u6A21\u5757 ".concat(name, " \u65F6\u51FA\u9519: ").concat(_context3.t0), 'error');
             case 15:
-              _context2.next = 3;
+              _context3.next = 3;
               break;
             case 17:
-              _context2.next = 22;
+              _context3.next = 22;
               break;
             case 19:
-              _context2.prev = 19;
-              _context2.t1 = _context2["catch"](1);
-              _iterator4.e(_context2.t1);
+              _context3.prev = 19;
+              _context3.t1 = _context3["catch"](1);
+              _iterator4.e(_context3.t1);
             case 22:
-              _context2.prev = 22;
+              _context3.prev = 22;
               _iterator4.f();
-              return _context2.finish(22);
+              return _context3.finish(22);
             case 25:
               this.modules.clear();
 
               // 再销毁插件
               _iterator5 = _createForOfIteratorHelper(this.plugins.entries());
-              _context2.prev = 27;
+              _context3.prev = 27;
               _iterator5.s();
             case 29:
               if ((_step5 = _iterator5.n()).done) {
-                _context2.next = 43;
+                _context3.next = 43;
                 break;
               }
               _step5$value = _slicedToArray(_step5.value, 2), _name = _step5$value[0], plugin = _step5$value[1];
               if (!plugin.destroy) {
-                _context2.next = 41;
+                _context3.next = 41;
                 break;
               }
-              _context2.prev = 32;
-              _context2.next = 35;
+              _context3.prev = 32;
+              _context3.next = 35;
               return Promise.resolve(plugin.destroy());
             case 35:
               this.log("\u63D2\u4EF6 ".concat(_name, " \u5DF2\u9500\u6BC1"));
-              _context2.next = 41;
+              _context3.next = 41;
               break;
             case 38:
-              _context2.prev = 38;
-              _context2.t2 = _context2["catch"](32);
-              this.log("\u9500\u6BC1\u63D2\u4EF6 ".concat(_name, " \u65F6\u51FA\u9519: ").concat(_context2.t2), 'error');
+              _context3.prev = 38;
+              _context3.t2 = _context3["catch"](32);
+              this.log("\u9500\u6BC1\u63D2\u4EF6 ".concat(_name, " \u65F6\u51FA\u9519: ").concat(_context3.t2), 'error');
             case 41:
-              _context2.next = 29;
+              _context3.next = 29;
               break;
             case 43:
-              _context2.next = 48;
+              _context3.next = 48;
               break;
             case 45:
-              _context2.prev = 45;
-              _context2.t3 = _context2["catch"](27);
-              _iterator5.e(_context2.t3);
+              _context3.prev = 45;
+              _context3.t3 = _context3["catch"](27);
+              _iterator5.e(_context3.t3);
             case 48:
-              _context2.prev = 48;
+              _context3.prev = 48;
               _iterator5.f();
-              return _context2.finish(48);
+              return _context3.finish(48);
             case 51:
               this.plugins.clear();
               this.log('PisellOS 核心已销毁');
             case 53:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[1, 19, 22, 25], [6, 12], [27, 45, 48, 51], [32, 38]]);
+        }, _callee3, this, [[1, 19, 22, 25], [6, 12], [27, 45, 48, 51], [32, 38]]);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

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

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -9,6 +9,8 @@ export declare class QuotationModule extends BaseModule implements Module {
     private request;
     private store;
     private scheduleResolver?;
+    private app;
+    private quotationListUpdatedListener?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     loadQuotations(params?: {
@@ -16,6 +18,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Promise<void>;
     getQuotationList(): QuotationItem[];
+    setQuotationListUpdatedListener(listener?: () => void): void;
     getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
     /**
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
@@ -60,6 +63,9 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    private applyQuotationResponse;
+    private notifyQuotationListUpdated;
+    private getQuotationCacheKeyData;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private normalizeCustomerId;

package/dist/modules/Quotation/index.js

@@ -1,6 +1,10 @@
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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 _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 _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 _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 _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; }
@@ -36,12 +40,15 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       list: []
     });
     _defineProperty(_assertThisInitialized(_this), "scheduleResolver", void 0);
+    _defineProperty(_assertThisInitialized(_this), "app", void 0);
+    _defineProperty(_assertThisInitialized(_this), "quotationListUpdatedListener", void 0);
     return _this;
   }
   _createClass(QuotationModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var _core$getPlugin, _core$getPlugin$getAp;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -53,10 +60,11 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('QuotationModule 需要 request 插件支持');
             case 4:
+              this.app = (_core$getPlugin = core.getPlugin('app')) === null || _core$getPlugin === void 0 || (_core$getPlugin$getAp = _core$getPlugin.getApp) === null || _core$getPlugin$getAp === void 0 ? void 0 : _core$getPlugin$getAp.call(_core$getPlugin);
               this.store = {
                 list: []
               };
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -71,8 +79,8 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadQuotations",
     value: function () {
       var _loadQuotations = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _data;
-        var query, res, list;
+        var _this2 = this;
+        var query, initialResultApplied, applyRemoteUpdate, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -81,19 +89,27 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              _context2.next = 5;
+              initialResultApplied = false;
+              applyRemoteUpdate = function applyRemoteUpdate(response) {
+                _this2.applyQuotationResponse(response);
+                if (initialResultApplied) {
+                  _this2.notifyQuotationListUpdated();
+                }
+              };
+              _context2.next = 7;
               return this.request.get('/quotation/available', query, {
-                useCache: false,
-                osServer: true
+                cache: {
+                  type: 'indexDB',
+                  updateCache: true,
+                  cacheKeyData: this.getQuotationCacheKeyData(query)
+                },
+                cacheUpdateChange: applyRemoteUpdate
               });
-            case 5:
+            case 7:
               res = _context2.sent;
-              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
-              list.sort(function (a, b) {
-                return b.sort - a.sort;
-              });
-              this.store.list = list;
-            case 9:
+              this.applyQuotationResponse(res);
+              initialResultApplied = true;
+            case 10:
             case "end":
               return _context2.stop();
           }
@@ -109,10 +125,15 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function getQuotationList() {
       return this.store.list;
     }
+  }, {
+    key: "setQuotationListUpdatedListener",
+    value: function setQuotationListUpdatedListener(listener) {
+      this.quotationListUpdatedListener = listener;
+    }
   }, {
     key: "getQuotationCustomerScopeInfo",
     value: function getQuotationCustomerScopeInfo() {
-      var _this2 = this;
+      var _this3 = this;
       var customerById = new Map();
       var quotationScopes = this.store.list.filter(function (quotation) {
         return Array.isArray(quotation.customer) && quotation.customer.length > 0;
@@ -122,7 +143,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
         var localSeen = new Set();
         var quotationCustomers = quotation.customer || [];
         quotationCustomers.forEach(function (customer) {
-          var customerId = _this2.normalizeCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
+          var customerId = _this3.normalizeCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
           if (!customerId || localSeen.has(customerId)) return;
           localSeen.add(customerId);
           customerIds.push(customerId);
@@ -247,6 +268,41 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
+  }, {
+    key: "applyQuotationResponse",
+    value: function applyQuotationResponse(response) {
+      var _data;
+      var source = (response === null || response === void 0 || (_data = response.data) === null || _data === void 0 ? void 0 : _data.list) || (response === null || response === void 0 ? void 0 : response.list) || [];
+      this.store.list = _toConsumableArray(source).sort(function (a, b) {
+        return Number(b.sort || 0) - Number(a.sort || 0);
+      });
+    }
+  }, {
+    key: "notifyQuotationListUpdated",
+    value: function notifyQuotationListUpdated() {
+      try {
+        var _this$quotationListUp;
+        (_this$quotationListUp = this.quotationListUpdatedListener) === null || _this$quotationListUp === void 0 || _this$quotationListUp.call(this);
+      } catch (error) {
+        console.warn('[QuotationModule] 报价单后台更新回调失败', error);
+      }
+    }
+  }, {
+    key: "getQuotationCacheKeyData",
+    value: function getQuotationCacheKeyData(query) {
+      var shopId = '';
+      try {
+        var _this$app, _this$app$getStorage;
+        var storedCore = (_this$app = this.app) === null || _this$app === void 0 || (_this$app = _this$app.storage) === null || _this$app === void 0 || (_this$app$getStorage = _this$app.getStorage) === null || _this$app$getStorage === void 0 ? void 0 : _this$app$getStorage.call(_this$app, 'core');
+        var coreInfo = typeof storedCore === 'string' ? JSON.parse(storedCore || '{}') : storedCore || {};
+        shopId = String((coreInfo === null || coreInfo === void 0 ? void 0 : coreInfo.id) || '');
+      } catch (_unused) {
+        // 缓存隔离信息读取失败时仍按请求参数缓存。
+      }
+      return _objectSpread(_objectSpread({}, query), {}, {
+        shop_id: shopId
+      });
+    }
   }, {
     key: "isQuotationVisibleForCustomer",
     value: function isQuotationVisibleForCustomer(quotation, customerId) {
@@ -273,17 +329,17 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this3 = this;
+        _this4 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
       var scheduleItems = [];
       quotation.schedule.forEach(function (s) {
-        var _this3$scheduleResolv;
-        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
+        var _this4$scheduleResolv;
+        var full = (_this4$scheduleResolv = _this4.scheduleResolver) === null || _this4$scheduleResolv === void 0 ? void 0 : _this4$scheduleResolv.call(_this4, s.id);
         if (full) {
           scheduleItems.push(full);
           return;
         }
-        if (_this3.scheduleResolver) {
+        if (_this4.scheduleResolver) {
           return;
         }
         var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {

package/dist/modules/Rules/index.js

@@ -1186,19 +1186,27 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 用户显式点击某张折扣卡时，本次选择优先于自动排序和扫码默认选择。
+        // 用户显式点击某张卡券时，本次选择优先于自动排序和扫码默认选择。
         // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
-        var explicitlySelectedDiscountCard = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
+        var explicitlySelectedDiscount = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
           var discountType = discount.tag || discount.type;
-          return String(discount.id) === String(options.discountId) && ['discount_card', 'product_discount_card'].includes(discountType);
+          return String(discount.id) === String(options.discountId) && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
         }) : undefined;
+        // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
+        var explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== 'good_pass' ? explicitlySelectedDiscount : undefined;
 
         // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
         var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
         var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
-        var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
+        var selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
+        var prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === 'good_pass' ? [explicitlySelectedDiscount].concat(_toConsumableArray(applicableDiscounts.filter(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return discountType === 'good_pass' && String(discount.id) !== String(explicitlySelectedDiscount.id);
+        })), _toConsumableArray(applicableDiscounts.filter(function (discount) {
+          return (discount.tag || discount.type) !== 'good_pass';
+        }))) : applicableDiscounts;
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
@@ -1440,8 +1448,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           for (var i = 0; i < splitCount; i++) {
             var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
-            // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
-            var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
+            var _selectedDiscount = isNeedSplit ? prioritizedApplicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
             usedDiscounts.set(_selectedDiscount.id, true);
             // 🔥 更新 product_id 使用计数
@@ -1586,7 +1593,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 生成有折扣的商品（每张商品券对应 num: 1）
             for (var _i = 0; _i < discountNum; _i++) {
               var _selectedDiscount2$me;
-              var _selectedDiscount2 = applicableDiscounts[_i];
+              var _selectedDiscount2 = prioritizedApplicableDiscounts[_i];
               usedDiscounts.set(_selectedDiscount2.id, true);
               // 🔥 更新 product_id 使用计数
               if ((_selectedDiscount2.tag || _selectedDiscount2.type) === 'good_pass') {

package/dist/plugins/request.d.ts

@@ -68,6 +68,7 @@ export interface RequestOptions {
     useCache?: boolean;
     customToast?: () => void;
     cache?: CacheProps;
+    cacheUpdateChange?: (data: any) => void;
     osServer?: boolean;
     prefix?: boolean;
     callback?: (res: any) => void;