@pisell/pisellos 2.2.192 → 2.2.194

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

@@ -69,9 +69,9 @@ export declare class OrderModule extends BaseModule implements Module {
     preload(): Promise<void>;
     getOrders(): OrderData[];
     getOrderById(id: OrderId): OrderData | undefined;
-    /** 按 order_id 查询（推荐） */
+    /** 按 order_id 查询内存订单。 */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
-    getLocalOrderByOrderId(orderId: OrderId): Promise<OrderData | null>;
+    getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
@@ -152,6 +152,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;
     private getIdKey;
+    private isOrderLookupMatch;
     /**
      * 解析订单 SQLite 主键，规则与宿主 OrderDataSource.getOrderStorageKey 一致。
      *

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

@@ -491,59 +491,64 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return this.store.map.get(this.getIdKey(id));
     }
 
-    /** 按 order_id 查询（推荐） */
+    /** 按 order_id 查询内存订单。 */
   }, {
     key: "getOrderByOrderId",
     value: function getOrderByOrderId(orderId) {
       return this.store.map.get(this.getIdKey(orderId));
     }
   }, {
-    key: "getLocalOrderByOrderId",
+    key: "getLocalOrderByLookup",
     value: function () {
-      var _getLocalOrderByOrderId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(orderId) {
+      var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(lookup) {
         var _this3 = this;
-        var key, memoryOrder, orders, localOrder;
+        var key, memoryOrderById, memoryOrder, orders, localOrder;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              key = this.getIdKey(orderId);
-              memoryOrder = this.store.map.get(key);
-              if (!memoryOrder) {
+              key = this.getIdKey(lookup);
+              memoryOrderById = this.store.map.get(key);
+              if (!memoryOrderById) {
                 _context4.next = 4;
                 break;
               }
-              return _context4.abrupt("return", memoryOrder);
+              return _context4.abrupt("return", memoryOrderById);
             case 4:
-              _context4.next = 6;
+              memoryOrder = this.store.list.find(function (order) {
+                return _this3.isOrderLookupMatch(order, key);
+              });
+              if (!memoryOrder) {
+                _context4.next = 7;
+                break;
+              }
+              return _context4.abrupt("return", memoryOrder);
+            case 7:
+              _context4.next = 9;
               return this.loadOrdersFromSQLite();
-            case 6:
+            case 9:
               orders = _context4.sent;
               localOrder = orders.find(function (order) {
-                var shopOrderNumber = order === null || order === void 0 ? void 0 : order.shop_order_number;
-                if (shopOrderNumber && _this3.getIdKey(shopOrderNumber) === key) return true;
-                var id = order === null || order === void 0 ? void 0 : order.order_id;
-                if (id === undefined || id === null) return false;
-                return _this3.getIdKey(id) === key;
+                return _this3.isOrderLookupMatch(order, key);
               });
               if (localOrder) {
-                _context4.next = 10;
+                _context4.next = 13;
                 break;
               }
               return _context4.abrupt("return", null);
-            case 10:
+            case 13:
               this.store.list = orders;
               this.syncOrdersMap();
               return _context4.abrupt("return", localOrder);
-            case 13:
+            case 16:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function getLocalOrderByOrderId(_x3) {
-        return _getLocalOrderByOrderId.apply(this, arguments);
+      function getLocalOrderByLookup(_x3) {
+        return _getLocalOrderByLookup.apply(this, arguments);
       }
-      return getLocalOrderByOrderId;
+      return getLocalOrderByLookup;
     }()
   }, {
     key: "loadOrdersByServer",
@@ -1390,6 +1395,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getIdKey(id) {
       return String(id);
     }
+  }, {
+    key: "isOrderLookupMatch",
+    value: function isOrderLookupMatch(order, lookupKey) {
+      var _this11 = this;
+      if (!order || !lookupKey) return false;
+      var candidates = [order.order_id, order.external_sale_number, order.order_number, order.shop_order_number, order.shop_full_order_number];
+      return candidates.some(function (value) {
+        if (value === undefined || value === null || value === '') return false;
+        return _this11.getIdKey(value) === lookupKey;
+      });
+    }
 
     /**
      * 解析订单 SQLite 主键，规则与宿主 OrderDataSource.getOrderStorageKey 一致。
@@ -1569,7 +1585,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "patchOrdersInSQLite",
     value: (function () {
       var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orders, source) {
-        var _this11 = this;
+        var _this12 = this;
         var mergeActions,
           ordersSnapshot,
           _this$filterRedundant2,
@@ -1587,7 +1603,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context17.abrupt("return");
             case 3:
               ordersSnapshot = cloneDeep(orders).filter(function (order) {
-                return _this11.getOrderStorageKey(order);
+                return _this12.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
                 _context17.next = 6;
@@ -1610,34 +1626,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context16.prev = _context16.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this11.logInfo('patchOrdersInSQLite-开始', {
+                      _this12.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: toWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this11.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this12.dbManager.bulkUpdate === 'function')) {
                         _context16.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context16.next = 6;
-                      return _this11.dbManager.bulkUpdate(INDEXDB_STORE_NAME, toWrite);
+                      return _this12.dbManager.bulkUpdate(INDEXDB_STORE_NAME, toWrite);
                     case 6:
                       _context16.next = 33;
                       break;
                     case 8:
-                      if (!(typeof _this11.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this12.dbManager.bulkAdd === 'function')) {
                         _context16.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context16.next = 12;
-                      return _this11.dbManager.bulkAdd(INDEXDB_STORE_NAME, toWrite);
+                      return _this12.dbManager.bulkAdd(INDEXDB_STORE_NAME, toWrite);
                     case 12:
                       _context16.next = 33;
                       break;
                     case 14:
-                      if (!(typeof _this11.dbManager.update === 'function')) {
+                      if (!(typeof _this12.dbManager.update === 'function')) {
                         _context16.next = 33;
                         break;
                       }
@@ -1652,7 +1668,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       order = _step9.value;
                       _context16.next = 23;
-                      return _this11.dbManager.update(INDEXDB_STORE_NAME, order);
+                      return _this12.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
                       _context16.next = 19;
                       break;
@@ -1668,8 +1684,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       _iterator9.f();
                       return _context16.finish(30);
                     case 33:
-                      _this11.recordRecentSqliteWrite(source, toWrite);
-                      _this11.logInfo('patchOrdersInSQLite-完成', {
+                      _this12.recordRecentSqliteWrite(source, toWrite);
+                      _this12.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: toWrite.length,
                         writeMethod: writeMethod,
@@ -1713,7 +1729,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderInSQLite",
     value: (function () {
       var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(order, source) {
-        var _this12 = this;
+        var _this13 = this;
         var orderSnapshot, _orderSnapshot$order_3;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -1734,43 +1750,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context18.prev = _context18.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this12.logInfo('updateOrderInSQLite-开始', {
+                      _this13.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this12.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this13.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this12.dbManager.update === 'function')) {
+                      if (!(typeof _this13.dbManager.update === 'function')) {
                         _context18.next = 8;
                         break;
                       }
                       writeMethod = 'update';
                       _context18.next = 6;
-                      return _this12.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      return _this13.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
                       _context18.next = 18;
                       break;
                     case 8:
-                      if (!(typeof _this12.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this13.dbManager.bulkUpdate === 'function')) {
                         _context18.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context18.next = 12;
-                      return _this12.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this13.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
                       _context18.next = 18;
                       break;
                     case 14:
-                      if (!(typeof _this12.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this13.dbManager.bulkAdd === 'function')) {
                         _context18.next = 18;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context18.next = 18;
-                      return _this12.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this13.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _this12.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this12.logInfo('updateOrderInSQLite-完成', {
+                      _this13.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this13.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
@@ -1813,7 +1829,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
       var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(orderList, source) {
-        var _this13 = this;
+        var _this14 = this;
         var orderListSnapshot;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
@@ -1831,14 +1847,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee20$(_context20) {
                   while (1) switch (_context20.prev = _context20.next) {
                     case 0:
-                      _this13.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      _this14.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: orderListSnapshot.length
                       });
                       _context20.next = 3;
-                      return _this13.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this14.dbManager.clear(INDEXDB_STORE_NAME);
                     case 3:
-                      _this13.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _this14.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: orderListSnapshot.length
                       });
                       if (!(orderListSnapshot.length === 0)) {
@@ -1848,10 +1864,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       return _context20.abrupt("return");
                     case 6:
                       _context20.next = 8;
-                      return _this13.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
+                      return _this14.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
                     case 8:
-                      _this13.recordRecentSqliteWrite(source, orderListSnapshot);
-                      _this13.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      _this14.recordRecentSqliteWrite(source, orderListSnapshot);
+                      _this14.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: orderListSnapshot.length
                       });
@@ -1893,7 +1909,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clear",
     value: (function () {
       var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        var _this14 = this;
+        var _this15 = this;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
@@ -1910,7 +1926,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context22.prev = _context22.next) {
                     case 0:
                       _context22.next = 2;
-                      return _this14.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this15.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
                       return _context22.stop();

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

@@ -2048,10 +2048,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
       this.productDataSource.run({
         pubsub: {
           callback: function callback(res) {
-            console.log('sse_products_callback', res);
-            _this8.logInfo('sse_products_callback: 收到同步消息', {
-              data: res === null || res === void 0 ? void 0 : res.data
-            });
+            // console.log('sse_products_callback', res)
+            // this.logInfo('sse_products_callback: 收到同步消息', {
+            //   data: res?.data,
+            // });
             if (!(res !== null && res !== void 0 && res.data)) return;
             var data = res.data;
             var channelKey = data.module || 'product';

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

@@ -89,7 +89,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     destroy(): Promise<void>;
     /**
      * 加载销售订单到统一 tempOrder 工作区。
-     * 有 app.sqlite 时优先读取本地记录；本地未命中或 forceRemote=true 时再拉云端。
+     * 统一通过 OrderModule 的 sales detail lookup 加载订单详情。
      *
      * 子类可在 `super.loadSalesDetail` 之后基于返回的 `sales` 做业务侧装配
      * （比如把 `sales.customer` 写入 CustomerModule、emit 业务 hook 等）。
@@ -140,6 +140,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private getHistoricalProductDiscountList;
     private isPersistedOrderProduct;
     private mergeHistoricalDiscountList;
+    private shouldSkipAutoApplyFetchedDiscountsInEditMode;
     private mergeCurrentDiscountSelectionState;
     loadDiscountConfig(params?: {
         customerId?: number;