@pisell/pisellos 2.2.128 → 2.2.130

package/dist/core/index.js

@@ -45,7 +45,6 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log('initialize12341');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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 } from "./examples";

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

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

package/dist/server/index.d.ts

@@ -255,9 +255,9 @@ declare class Server {
      */
     private handleResourceList;
     /**
-     * 代理刷新单个本地订单：
+     * 代理刷新 / 合并单个订单到本地：
      * - 入参：order_id（data 或 url query）
-     * - 流程：本地存在性校验 → 调后端 /order/sales/{id}?with[]=... → 覆盖本地 → 落 SQLite → emit onOrdersChanged
+     * - 流程：调后端 /order/sales/{id}?with[]=... → 若本地已有则覆盖；若无则 merge 写入 → 落 SQLite → emit onOrdersChanged
      * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
      */
     private handleUpdateLocalOrder;

package/dist/server/index.js

@@ -443,15 +443,15 @@ var Server = /*#__PURE__*/function () {
       };
     }());
     /**
-     * 代理刷新单个本地订单：
+     * 代理刷新 / 合并单个订单到本地：
      * - 入参：order_id（data 或 url query）
-     * - 流程：本地存在性校验 → 调后端 /order/sales/{id}?with[]=... → 覆盖本地 → 落 SQLite → emit onOrdersChanged
+     * - 流程：调后端 /order/sales/{id}?with[]=... → 若本地已有则覆盖；若无则 merge 写入 → 落 SQLite → emit onOrdersChanged
      * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
      */
     _defineProperty(this, "handleUpdateLocalOrder", /*#__PURE__*/function () {
       var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref18) {
         var _ref20, _this$app;
-        var url, data, rawOrderId, orderId, backendPath, _response$data, response, fresh, _yield$_this$order$ov, overwritten, errorMessage;
+        var url, data, rawOrderId, orderId, backendPath, _response$data, response, fresh, exists, _yield$_this$order$ov, overwritten, errorMessage;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -489,24 +489,8 @@ var Server = /*#__PURE__*/function () {
                 data: null
               });
             case 10:
-              if (_this.order.getOrderByOrderId(orderId)) {
-                _context7.next = 13;
-                break;
-              }
-              _this.logInfo('handleUpdateLocalOrder: 本地不存在该订单，忽略', {
-                orderId: orderId
-              });
-              return _context7.abrupt("return", {
-                code: 200,
-                status: true,
-                message: '本地无此订单，已忽略',
-                data: {
-                  overwritten: false
-                }
-              });
-            case 13:
               if ((_this$app = _this.app) !== null && _this$app !== void 0 && _this$app.request) {
-                _context7.next = 16;
+                _context7.next = 13;
                 break;
               }
               _this.logError('handleUpdateLocalOrder: app.request 不可用');
@@ -516,18 +500,18 @@ var Server = /*#__PURE__*/function () {
                 message: 'app.request 不可用',
                 data: null
               });
-            case 16:
+            case 13:
               backendPath = "/shop/order/sales/".concat(encodeURIComponent(orderId), "?with%5B%5D=all");
-              _context7.prev = 17;
-              _context7.next = 20;
+              _context7.prev = 14;
+              _context7.next = 17;
               return _this.app.request.get(backendPath, undefined, {
                 isShopApi: true
               });
-            case 20:
+            case 17:
               response = _context7.sent;
               fresh = (_response$data = response === null || response === void 0 ? void 0 : response.data) !== null && _response$data !== void 0 ? _response$data : response;
               if (!(!fresh || _typeof(fresh) !== 'object' || fresh.order_id == null)) {
-                _context7.next = 25;
+                _context7.next = 22;
                 break;
               }
               _this.logError('handleUpdateLocalOrder: 后端返回订单为空', {
@@ -540,10 +524,15 @@ var Server = /*#__PURE__*/function () {
                 message: '后端返回订单为空',
                 data: null
               });
-            case 25:
-              _context7.next = 27;
+            case 22:
+              exists = !!_this.order.getOrderByOrderId(orderId);
+              if (!exists) {
+                _context7.next = 30;
+                break;
+              }
+              _context7.next = 26;
               return _this.order.overwriteExistingOrder(fresh);
-            case 27:
+            case 26:
               _yield$_this$order$ov = _context7.sent;
               overwritten = _yield$_this$order$ov.overwritten;
               _this.logInfo('handleUpdateLocalOrder: 覆盖完成', {
@@ -556,12 +545,30 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 data: {
                   overwritten: overwritten,
+                  inserted: false,
                   order_id: orderId
                 }
               });
-            case 33:
-              _context7.prev = 33;
-              _context7.t0 = _context7["catch"](17);
+            case 30:
+              _context7.next = 32;
+              return _this.order.upsertOrdersFromRemote([fresh]);
+            case 32:
+              _this.logInfo('handleUpdateLocalOrder: 本地合并新订单完成', {
+                orderId: orderId
+              });
+              return _context7.abrupt("return", {
+                code: 200,
+                status: true,
+                message: '',
+                data: {
+                  overwritten: false,
+                  inserted: true,
+                  order_id: orderId
+                }
+              });
+            case 36:
+              _context7.prev = 36;
+              _context7.t0 = _context7["catch"](14);
               errorMessage = _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0);
               _this.logError('handleUpdateLocalOrder: 请求失败', {
                 orderId: orderId,
@@ -574,11 +581,11 @@ var Server = /*#__PURE__*/function () {
                 message: errorMessage,
                 data: null
               });
-            case 38:
+            case 41:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, null, [[17, 33]]);
+        }, _callee7, null, [[14, 36]]);
       }));
       return function (_x7) {
         return _ref19.apply(this, arguments);

package/dist/server/modules/order/index.d.ts

@@ -47,6 +47,11 @@ export declare class OrderModule extends BaseModule implements Module {
     overwriteExistingOrder(fresh: OrderData): Promise<{
         overwritten: boolean;
     }>;
+    /**
+     * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
+     * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
+     */
+    upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */

package/dist/server/modules/order/index.js

@@ -417,6 +417,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return overwriteExistingOrder;
     }()
+    /**
+     * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
+     * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
+     */
+    )
+  }, {
+    key: "upsertOrdersFromRemote",
+    value: (function () {
+      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(freshOrders) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              if (freshOrders !== null && freshOrders !== void 0 && freshOrders.length) {
+                _context6.next = 3;
+                break;
+              }
+              this.logInfo('upsertOrdersFromRemote-订单列表为空', {});
+              return _context6.abrupt("return");
+            case 3:
+              this.logInfo('upsertOrdersFromRemote-开始', {
+                count: freshOrders.length
+              });
+              _context6.next = 6;
+              return this.mergeOrdersToStore(freshOrders);
+            case 6:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function upsertOrdersFromRemote(_x4) {
+        return _upsertOrdersFromRemote.apply(this, arguments);
+      }
+      return upsertOrdersFromRemote;
+    }()
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -424,42 +459,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersBySSE",
     value: (function () {
-      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var query,
           data,
-          _args6 = arguments;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              query = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+              query = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
               if (this.orderDataSource) {
-                _context6.next = 3;
+                _context7.next = 3;
                 break;
               }
-              return _context6.abrupt("return", []);
+              return _context7.abrupt("return", []);
             case 3:
-              _context6.prev = 3;
-              _context6.next = 6;
+              _context7.prev = 3;
+              _context7.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: query
                 }
               });
             case 6:
-              data = _context6.sent;
-              return _context6.abrupt("return", data || []);
+              data = _context7.sent;
+              return _context7.abrupt("return", data || []);
             case 10:
-              _context6.prev = 10;
-              _context6.t0 = _context6["catch"](3);
+              _context7.prev = 10;
+              _context7.t0 = _context7["catch"](3);
               this.logError('fetchOrdersBySSE-失败', {
-                error: _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0)
+                error: _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0)
               });
-              return _context6.abrupt("return", []);
+              return _context7.abrupt("return", []);
             case 14:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this, [[3, 10]]);
+        }, _callee7, this, [[3, 10]]);
       }));
       function fetchOrdersBySSE() {
         return _fetchOrdersBySSE.apply(this, arguments);
@@ -640,41 +675,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "flushOrderSyncMessagesByThrottle",
     value: (function () {
-      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (!this.isProcessingSyncBatch) {
-                _context7.next = 2;
+                _context8.next = 2;
                 break;
               }
-              return _context7.abrupt("return");
+              return _context8.abrupt("return");
             case 2:
               if (!(this.pendingSyncMessages.length === 0)) {
-                _context7.next = 5;
+                _context8.next = 5;
                 break;
               }
               this.isIdlePhase = true;
-              return _context7.abrupt("return");
+              return _context8.abrupt("return");
             case 5:
               this.isProcessingSyncBatch = true;
-              _context7.prev = 6;
-              _context7.next = 9;
+              _context8.prev = 6;
+              _context8.next = 9;
               return this.processOrderSyncMessages();
             case 9:
-              _context7.prev = 9;
+              _context8.prev = 9;
               this.isProcessingSyncBatch = false;
               if (this.pendingSyncMessages.length > 0) {
                 this.scheduleOrderSyncThrottle();
               } else {
                 this.isIdlePhase = true;
               }
-              return _context7.finish(9);
+              return _context8.finish(9);
             case 13:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this, [[6,, 9, 13]]);
+        }, _callee8, this, [[6,, 9, 13]]);
       }));
       function flushOrderSyncMessagesByThrottle() {
         return _flushOrderSyncMessagesByThrottle.apply(this, arguments);
@@ -696,18 +731,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processOrderSyncMessages",
     value: (function () {
-      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var messages, batchProcessStartAt, earliestReceivedAt, upsertOrders, refreshIds, _iterator3, _step3, _msg$id, _msg$relation_order_i, msg, hasBatchIds, singleId, hasSingleId, rawBody, normalizedBody, uniqueRefreshIds, upsertList, freshOrders, batchProcessEndAt;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               messages = _toConsumableArray(this.pendingSyncMessages);
               this.pendingSyncMessages = [];
               if (!(messages.length === 0)) {
-                _context8.next = 4;
+                _context9.next = 4;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 4:
               batchProcessStartAt = Date.now();
               earliestReceivedAt = Math.min.apply(Math, _toConsumableArray(messages.map(function (m) {
@@ -723,11 +758,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               _iterator3 = _createForOfIteratorHelper(messages);
-              _context8.prev = 10;
+              _context9.prev = 10;
               _iterator3.s();
             case 12:
               if ((_step3 = _iterator3.n()).done) {
-                _context8.next = 25;
+                _context9.next = 25;
                 break;
               }
               msg = _step3.value;
@@ -737,27 +772,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               rawBody = msg.body || msg.data;
               normalizedBody = this.normalizeOrderSyncPayload(rawBody);
               if (!(hasSingleId && normalizedBody)) {
-                _context8.next = 22;
+                _context9.next = 22;
                 break;
               }
               upsertOrders.set(this.getIdKey(normalizedBody.order_id), normalizedBody);
-              return _context8.abrupt("continue", 23);
+              return _context9.abrupt("continue", 23);
             case 22:
               if (hasBatchIds) refreshIds.push.apply(refreshIds, _toConsumableArray(msg.ids));else if (hasSingleId) refreshIds.push(singleId);else if ((_msg$relation_order_i = msg.relation_order_ids) !== null && _msg$relation_order_i !== void 0 && _msg$relation_order_i.length) refreshIds.push.apply(refreshIds, _toConsumableArray(msg.relation_order_ids));
             case 23:
-              _context8.next = 12;
+              _context9.next = 12;
               break;
             case 25:
-              _context8.next = 30;
+              _context9.next = 30;
               break;
             case 27:
-              _context8.prev = 27;
-              _context8.t0 = _context8["catch"](10);
-              _iterator3.e(_context8.t0);
+              _context9.prev = 27;
+              _context9.t0 = _context9["catch"](10);
+              _iterator3.e(_context9.t0);
             case 30:
-              _context8.prev = 30;
+              _context9.prev = 30;
               _iterator3.f();
-              return _context8.finish(30);
+              return _context9.finish(30);
             case 33:
               uniqueRefreshIds = this.uniqueOrderIds(refreshIds);
               upsertList = _toConsumableArray(upsertOrders.values());
@@ -766,32 +801,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 refreshIdCount: uniqueRefreshIds.length
               });
               if (!(upsertList.length > 0)) {
-                _context8.next = 39;
+                _context9.next = 39;
                 break;
               }
-              _context8.next = 39;
+              _context9.next = 39;
               return this.mergeOrdersToStore(upsertList);
             case 39:
               if (!(uniqueRefreshIds.length > 0)) {
-                _context8.next = 46;
+                _context9.next = 46;
                 break;
               }
-              _context8.next = 42;
+              _context9.next = 42;
               return this.fetchOrdersByHttp(uniqueRefreshIds);
             case 42:
-              freshOrders = _context8.sent;
+              freshOrders = _context9.sent;
               if (!(freshOrders.length > 0)) {
-                _context8.next = 46;
+                _context9.next = 46;
                 break;
               }
-              _context8.next = 46;
+              _context9.next = 46;
               return this.mergeOrdersToStore(freshOrders);
             case 46:
               if (!(upsertList.length === 0 && uniqueRefreshIds.length === 0)) {
-                _context8.next = 48;
+                _context9.next = 48;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 48:
               batchProcessEndAt = Date.now();
               this.logInfo('processOrderSyncMessages-结束', {
@@ -800,13 +835,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 batchProcessDurationMs: batchProcessEndAt - batchProcessStartAt,
                 totalFromPubsubToProcessedMs: batchProcessEndAt - earliestReceivedAt
               });
-              _context8.next = 52;
+              _context9.next = 52;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 52:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this, [[10, 27, 30, 33]]);
+        }, _callee9, this, [[10, 27, 30, 33]]);
       }));
       function processOrderSyncMessages() {
         return _processOrderSyncMessages.apply(this, arguments);
@@ -820,29 +855,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersByHttp",
     value: (function () {
-      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ids) {
+      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(ids) {
         var _orderList, orderList;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               if (!(!this.orderDataSource || ids.length === 0)) {
-                _context9.next = 2;
+                _context10.next = 2;
                 break;
               }
-              return _context9.abrupt("return", []);
+              return _context10.abrupt("return", []);
             case 2:
-              _context9.prev = 2;
+              _context10.prev = 2;
               if (!(typeof this.orderDataSource.fetchOrdersByIds === 'function')) {
-                _context9.next = 8;
+                _context10.next = 8;
                 break;
               }
-              _context9.next = 6;
+              _context10.next = 6;
               return this.orderDataSource.fetchOrdersByIds(ids);
             case 6:
-              _orderList = _context9.sent;
-              return _context9.abrupt("return", _orderList || []);
+              _orderList = _context10.sent;
+              return _context10.abrupt("return", _orderList || []);
             case 8:
-              _context9.next = 10;
+              _context10.next = 10;
               return this.orderDataSource.run({
                 http: {
                   query: {
@@ -851,19 +886,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 10:
-              orderList = _context9.sent;
-              return _context9.abrupt("return", orderList || []);
+              orderList = _context10.sent;
+              return _context10.abrupt("return", orderList || []);
             case 14:
-              _context9.prev = 14;
-              _context9.t0 = _context9["catch"](2);
-              return _context9.abrupt("return", []);
+              _context10.prev = 14;
+              _context10.t0 = _context10["catch"](2);
+              return _context10.abrupt("return", []);
             case 17:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[2, 14]]);
+        }, _callee10, this, [[2, 14]]);
       }));
-      function fetchOrdersByHttp(_x4) {
+      function fetchOrdersByHttp(_x5) {
         return _fetchOrdersByHttp.apply(this, arguments);
       }
       return fetchOrdersByHttp;
@@ -875,11 +910,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeOrdersToStore",
     value: (function () {
-      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(freshOrders) {
+      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(freshOrders) {
         var _this8 = this;
         var freshMap, _iterator4, _step4, order, id, uniqueFreshCount, updatedList, _iterator5, _step5, _order;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               this.logInfo('mergeOrdersToStore-开始', {
                 freshOrderCount: freshOrders.length,
@@ -887,36 +922,36 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               freshMap = new Map();
               _iterator4 = _createForOfIteratorHelper(freshOrders);
-              _context10.prev = 3;
+              _context11.prev = 3;
               _iterator4.s();
             case 5:
               if ((_step4 = _iterator4.n()).done) {
-                _context10.next = 13;
+                _context11.next = 13;
                 break;
               }
               order = _step4.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context10.next = 10;
+                _context11.next = 10;
                 break;
               }
-              return _context10.abrupt("continue", 11);
+              return _context11.abrupt("continue", 11);
             case 10:
               freshMap.set(this.getIdKey(id), order);
             case 11:
-              _context10.next = 5;
+              _context11.next = 5;
               break;
             case 13:
-              _context10.next = 18;
+              _context11.next = 18;
               break;
             case 15:
-              _context10.prev = 15;
-              _context10.t0 = _context10["catch"](3);
-              _iterator4.e(_context10.t0);
+              _context11.prev = 15;
+              _context11.t0 = _context11["catch"](3);
+              _iterator4.e(_context11.t0);
             case 18:
-              _context10.prev = 18;
+              _context11.prev = 18;
               _iterator4.f();
-              return _context10.finish(18);
+              return _context11.finish(18);
             case 21:
               uniqueFreshCount = freshMap.size;
               updatedList = this.store.list.map(function (order) {
@@ -941,7 +976,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               this.store.list = updatedList;
               this.syncOrdersMap();
-              _context10.next = 29;
+              _context11.next = 29;
               return this.saveOrdersToSQLite(this.store.list);
             case 29:
               this.logInfo('mergeOrdersToStore-结束', {
@@ -951,11 +986,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit(OrderHooks.onOrdersChanged, this.store.list);
             case 31:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this, [[3, 15, 18, 21]]);
+        }, _callee11, this, [[3, 15, 18, 21]]);
       }));
-      function mergeOrdersToStore(_x5) {
+      function mergeOrdersToStore(_x6) {
         return _mergeOrdersToStore.apply(this, arguments);
       }
       return mergeOrdersToStore;
@@ -1092,32 +1127,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadOrdersFromSQLite",
     value: function () {
-      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var orders;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               if (this.dbManager) {
-                _context11.next = 2;
+                _context12.next = 2;
                 break;
               }
-              return _context11.abrupt("return", []);
+              return _context12.abrupt("return", []);
             case 2:
-              _context11.prev = 2;
-              _context11.next = 5;
+              _context12.prev = 2;
+              _context12.next = 5;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 5:
-              orders = _context11.sent;
-              return _context11.abrupt("return", orders || []);
+              orders = _context12.sent;
+              return _context12.abrupt("return", orders || []);
             case 9:
-              _context11.prev = 9;
-              _context11.t0 = _context11["catch"](2);
-              return _context11.abrupt("return", []);
+              _context12.prev = 9;
+              _context12.t0 = _context12["catch"](2);
+              return _context12.abrupt("return", []);
             case 12:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this, [[2, 9]]);
+        }, _callee12, this, [[2, 9]]);
       }));
       function loadOrdersFromSQLite() {
         return _loadOrdersFromSQLite.apply(this, arguments);
@@ -1127,55 +1162,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveOrdersToSQLite",
     value: function () {
-      var _saveOrdersToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderList) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _saveOrdersToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderList) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               if (this.dbManager) {
-                _context12.next = 2;
+                _context13.next = 2;
                 break;
               }
-              return _context12.abrupt("return");
+              return _context13.abrupt("return");
             case 2:
-              _context12.prev = 2;
+              _context13.prev = 2;
               this.logInfo('saveOrdersToSQLite-开始', {
                 count: orderList.length
               });
-              _context12.next = 6;
+              _context13.next = 6;
               return this.dbManager.clear(INDEXDB_STORE_NAME);
             case 6:
               this.logInfo('saveOrdersToSQLite-clear完成', {
                 count: orderList.length
               });
               if (!(orderList.length === 0)) {
-                _context12.next = 9;
+                _context13.next = 9;
                 break;
               }
-              return _context12.abrupt("return");
+              return _context13.abrupt("return");
             case 9:
-              _context12.next = 11;
+              _context13.next = 11;
               return this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderList);
             case 11:
               this.logInfo('saveOrdersToSQLite-bulkAdd完成', {
                 count: orderList.length
               });
-              _context12.next = 17;
+              _context13.next = 17;
               break;
             case 14:
-              _context12.prev = 14;
-              _context12.t0 = _context12["catch"](2);
+              _context13.prev = 14;
+              _context13.t0 = _context13["catch"](2);
               // SQLite 异常，避免影响主流程
               this.logError('保存订单到 SQLite 失败', {
-                error: _context12.t0 instanceof Error ? _context12.t0.message : String(_context12.t0),
+                error: _context13.t0 instanceof Error ? _context13.t0.message : String(_context13.t0),
                 orderList: orderList.length
               });
             case 17:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this, [[2, 14]]);
+        }, _callee13, this, [[2, 14]]);
       }));
-      function saveOrdersToSQLite(_x6) {
+      function saveOrdersToSQLite(_x7) {
         return _saveOrdersToSQLite.apply(this, arguments);
       }
       return saveOrdersToSQLite;
@@ -1183,27 +1218,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               this.resourceIdIndex.clear();
               if (!this.dbManager) {
-                _context13.next = 6;
+                _context14.next = 6;
                 break;
               }
-              _context13.next = 6;
+              _context14.next = 6;
               return this.dbManager.clear(INDEXDB_STORE_NAME);
             case 6:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.core.effects.emit(OrderHooks.onOrdersChanged, this.store.list);
             case 8:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

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

@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Sales/index.js

@@ -267,7 +267,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (slotCount <= 0) return [];
       var diff = new Int32Array(slotCount + 1);
       for (var i = 0; i < bookingList.length; i++) {
+        var _ref2, _booking$appointment_;
         var booking = bookingList[i];
+        var appointmentStatus = String((_ref2 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref2 !== void 0 ? _ref2 : '');
+        if (appointmentStatus === 'new' || appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') continue;
         var bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
         var bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
         if (!bookingStartAt.isValid() || !bookingEndAt.isValid()) continue;
@@ -336,8 +339,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourceId",
     value: function getResourceId(resource) {
-      var _ref2, _resource$id;
-      return (_ref2 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : '';
+      var _ref3, _resource$id;
+      return (_ref3 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref3 !== void 0 ? _ref3 : '';
     }
 
     /**
@@ -454,8 +457,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeMatchedBooking",
     value: function normalizeMatchedBooking(current, deviceCurrent, booking) {
-      var _ref3, _booking$appointment_;
-      var appointmentStatus = String((_ref3 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref3 !== void 0 ? _ref3 : '');
+      var _ref4, _booking$appointment_2;
+      var appointmentStatus = String((_ref4 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref4 !== void 0 ? _ref4 : '');
       if (appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') return null;
       var startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);

package/lib/core/index.js

@@ -50,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("initialize12341");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

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

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

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

package/lib/server/index.d.ts

@@ -255,9 +255,9 @@ declare class Server {
      */
     private handleResourceList;
     /**
-     * 代理刷新单个本地订单：
+     * 代理刷新 / 合并单个订单到本地：
      * - 入参：order_id（data 或 url query）
-     * - 流程：本地存在性校验 → 调后端 /order/sales/{id}?with[]=... → 覆盖本地 → 落 SQLite → emit onOrdersChanged
+     * - 流程：调后端 /order/sales/{id}?with[]=... → 若本地已有则覆盖；若无则 merge 写入 → 落 SQLite → emit onOrdersChanged
      * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
      */
     private handleUpdateLocalOrder;

package/lib/server/index.js

@@ -314,9 +314,9 @@ var Server = class {
       };
     };
     /**
-     * 代理刷新单个本地订单：
+     * 代理刷新 / 合并单个订单到本地：
      * - 入参：order_id（data 或 url query）
-     * - 流程：本地存在性校验 → 调后端 /order/sales/{id}?with[]=... → 覆盖本地 → 落 SQLite → emit onOrdersChanged
+     * - 流程：调后端 /order/sales/{id}?with[]=... → 若本地已有则覆盖；若无则 merge 写入 → 落 SQLite → emit onOrdersChanged
      * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
      */
     this.handleUpdateLocalOrder = async ({ url, data }) => {
@@ -332,15 +332,6 @@ var Server = class {
         this.logError("handleUpdateLocalOrder: Order 模块未注册");
         return { code: 500, status: false, message: "Order 模块未注册", data: null };
       }
-      if (!this.order.getOrderByOrderId(orderId)) {
-        this.logInfo("handleUpdateLocalOrder: 本地不存在该订单，忽略", { orderId });
-        return {
-          code: 200,
-          status: true,
-          message: "本地无此订单，已忽略",
-          data: { overwritten: false }
-        };
-      }
       if (!((_a = this.app) == null ? void 0 : _a.request)) {
         this.logError("handleUpdateLocalOrder: app.request 不可用");
         return { code: 500, status: false, message: "app.request 不可用", data: null };
@@ -365,18 +356,29 @@ var Server = class {
             data: null
           };
         }
-        const { overwritten } = await this.order.overwriteExistingOrder(
-          fresh
-        );
-        this.logInfo("handleUpdateLocalOrder: 覆盖完成", {
-          orderId,
-          overwritten
-        });
+        const exists = !!this.order.getOrderByOrderId(orderId);
+        if (exists) {
+          const { overwritten } = await this.order.overwriteExistingOrder(
+            fresh
+          );
+          this.logInfo("handleUpdateLocalOrder: 覆盖完成", {
+            orderId,
+            overwritten
+          });
+          return {
+            code: 200,
+            status: true,
+            message: "",
+            data: { overwritten, inserted: false, order_id: orderId }
+          };
+        }
+        await this.order.upsertOrdersFromRemote([fresh]);
+        this.logInfo("handleUpdateLocalOrder: 本地合并新订单完成", { orderId });
         return {
           code: 200,
           status: true,
           message: "",
-          data: { overwritten, order_id: orderId }
+          data: { overwritten: false, inserted: true, order_id: orderId }
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);

package/lib/server/modules/order/index.d.ts

@@ -47,6 +47,11 @@ export declare class OrderModule extends BaseModule implements Module {
     overwriteExistingOrder(fresh: OrderData): Promise<{
         overwritten: boolean;
     }>;
+    /**
+     * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
+     * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
+     */
+    upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */

package/lib/server/modules/order/index.js

@@ -252,6 +252,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, this.store.list);
     return { overwritten: true };
   }
+  /**
+   * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
+   * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
+   */
+  async upsertOrdersFromRemote(freshOrders) {
+    if (!(freshOrders == null ? void 0 : freshOrders.length)) {
+      this.logInfo("upsertOrdersFromRemote-订单列表为空", {});
+      return;
+    }
+    this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length });
+    await this.mergeOrdersToStore(freshOrders);
+  }
   /**
    * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
    */

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

@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Sales/index.js

@@ -166,6 +166,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const diff = new Int32Array(slotCount + 1);
     for (let i = 0; i < bookingList.length; i++) {
       const booking = bookingList[i];
+      const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
+      if (appointmentStatus === "new" || appointmentStatus === "rejected" || appointmentStatus === "cancelled")
+        continue;
       const bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       const bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
       if (!bookingStartAt.isValid() || !bookingEndAt.isValid())

package/package.json

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