@pisell/pisellos 2.2.180 → 2.2.182

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

@@ -18,6 +18,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private resourceIdIndex;
     private logger;
     private storage;
+    private orderSQLiteSaveQueue;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
@@ -130,6 +131,28 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
+    /**
+     * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+     *
+     * @example
+     * await this.runInOrderSQLiteSaveQueue(async () => {
+     *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+     *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+     * })
+     */
+    private runInOrderSQLiteSaveQueue;
+    /**
+     * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+     *
+     * @example
+     * await this.saveOrdersToSQLite(this.store.list)
+     */
     private saveOrdersToSQLite;
+    /**
+     * 清空订单模块的内存数据和本地 SQLite 订单表。
+     *
+     * @example
+     * await orderModule.clear()
+     */
     clear(): Promise<void>;
 }

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

@@ -63,6 +63,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
     _defineProperty(_assertThisInitialized(_this), "storage", void 0);
+    _defineProperty(_assertThisInitialized(_this), "orderSQLiteSaveQueue", Promise.resolve());
     return _this;
   }
   _createClass(OrderModule, [{
@@ -1276,92 +1277,168 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return loadOrdersFromSQLite;
     }()
+    /**
+     * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+     *
+     * @example
+     * await this.runInOrderSQLiteSaveQueue(async () => {
+     *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+     *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+     * })
+     */
   }, {
-    key: "saveOrdersToSQLite",
-    value: function () {
-      var _saveOrdersToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderList) {
+    key: "runInOrderSQLiteSaveQueue",
+    value: (function () {
+      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(task) {
+        var queuedTask;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
+            case 0:
+              queuedTask = this.orderSQLiteSaveQueue.then(task, task);
+              this.orderSQLiteSaveQueue = queuedTask.then(function () {
+                return undefined;
+              }, function () {
+                return undefined;
+              });
+              return _context15.abrupt("return", queuedTask);
+            case 3:
+            case "end":
+              return _context15.stop();
+          }
+        }, _callee15, this);
+      }));
+      function runInOrderSQLiteSaveQueue(_x8) {
+        return _runInOrderSQLiteSaveQueue.apply(this, arguments);
+      }
+      return runInOrderSQLiteSaveQueue;
+    }()
+    /**
+     * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+     *
+     * @example
+     * await this.saveOrdersToSQLite(this.store.list)
+     */
+    )
+  }, {
+    key: "saveOrdersToSQLite",
+    value: (function () {
+      var _saveOrdersToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderList) {
+        var _this10 = this;
+        var orderListSnapshot;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               if (this.dbManager) {
-                _context15.next = 2;
+                _context17.next = 2;
                 break;
               }
-              return _context15.abrupt("return");
+              return _context17.abrupt("return");
             case 2:
-              _context15.prev = 2;
-              this.logInfo('saveOrdersToSQLite-开始', {
-                count: orderList.length
-              });
-              _context15.next = 6;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              orderListSnapshot = cloneDeep(orderList);
+              _context17.prev = 3;
+              _context17.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+                return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+                  while (1) switch (_context16.prev = _context16.next) {
+                    case 0:
+                      _this10.logInfo('saveOrdersToSQLite-开始', {
+                        count: orderListSnapshot.length
+                      });
+                      _context16.next = 3;
+                      return _this10.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 3:
+                      _this10.logInfo('saveOrdersToSQLite-clear完成', {
+                        count: orderListSnapshot.length
+                      });
+                      if (!(orderListSnapshot.length === 0)) {
+                        _context16.next = 6;
+                        break;
+                      }
+                      return _context16.abrupt("return");
+                    case 6:
+                      _context16.next = 8;
+                      return _this10.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
+                    case 8:
+                      _this10.logInfo('saveOrdersToSQLite-bulkAdd完成', {
+                        count: orderListSnapshot.length
+                      });
+                    case 9:
+                    case "end":
+                      return _context16.stop();
+                  }
+                }, _callee16);
+              })));
             case 6:
-              this.logInfo('saveOrdersToSQLite-clear完成', {
-                count: orderList.length
-              });
-              if (!(orderList.length === 0)) {
-                _context15.next = 9;
-                break;
-              }
-              return _context15.abrupt("return");
-            case 9:
-              _context15.next = 11;
-              return this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderList);
-            case 11:
-              this.logInfo('saveOrdersToSQLite-bulkAdd完成', {
-                count: orderList.length
-              });
-              _context15.next = 17;
+              _context17.next = 11;
               break;
-            case 14:
-              _context15.prev = 14;
-              _context15.t0 = _context15["catch"](2);
+            case 8:
+              _context17.prev = 8;
+              _context17.t0 = _context17["catch"](3);
               // SQLite 异常，避免影响主流程
               this.logError('保存订单到 SQLite 失败', {
-                error: _context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0),
-                orderList: orderList.length
+                error: _context17.t0 instanceof Error ? _context17.t0.message : String(_context17.t0),
+                orderList: orderListSnapshot.length
               });
-            case 17:
+            case 11:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15, this, [[2, 14]]);
+        }, _callee17, this, [[3, 8]]);
       }));
-      function saveOrdersToSQLite(_x8) {
+      function saveOrdersToSQLite(_x9) {
         return _saveOrdersToSQLite.apply(this, arguments);
       }
       return saveOrdersToSQLite;
     }()
+    /**
+     * 清空订单模块的内存数据和本地 SQLite 订单表。
+     *
+     * @example
+     * await orderModule.clear()
+     */
+    )
   }, {
     key: "clear",
-    value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+    value: (function () {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var _this11 = this;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               this.resourceIdIndex.clear();
               if (!this.dbManager) {
-                _context16.next = 6;
+                _context19.next = 6;
                 break;
               }
-              _context16.next = 6;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              _context19.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                  while (1) switch (_context18.prev = _context18.next) {
+                    case 0:
+                      _context18.next = 2;
+                      return _this11.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 2:
+                    case "end":
+                      return _context18.stop();
+                  }
+                }, _callee18);
+              })));
             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 _context16.stop();
+              return _context19.stop();
           }
-        }, _callee16, this);
+        }, _callee19, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);
       }
       return clear;
-    }()
+    }())
   }]);
   return OrderModule;
 }(BaseModule);

package/dist/server/modules/order/utils/filterOrders.js

@@ -1,4 +1,17 @@
 import dayjs from 'dayjs';
+/** 从订单 payments 提取支付方式 code，与 UI 筛选选项及 filterBookings 一致 */
+function getOrderPaymentCodes(order) {
+  var payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.code;
+  }).filter(function (code) {
+    return typeof code === 'string' && code.length > 0;
+  });
+}
+
 /**
  * 订单过滤函数
  * @param orders 原始订单列表
@@ -126,22 +139,23 @@ export function filterOrders(orders, filters) {
       }
     }
 
-    // payment_methods - 支付方式
+    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.payment_methods）
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      var orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      var hasMatch = order.payment_methods.some(function (pm) {
-        return safeFilters.payment_methods.includes(pm);
+      var hasMatch = orderPaymentCodes.some(function (code) {
+        return safeFilters.payment_methods.includes(code);
       });
       if (!hasMatch) {
         rejected.push({
@@ -149,7 +163,7 @@ export function filterOrders(orders, filters) {
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

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

@@ -21,7 +21,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeCustomerId?;
+    private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;