@pisell/pisellos 2.2.215 → 2.2.217

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

@@ -243,6 +243,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         // 日志记录失败不影响主流程
       }
     }
+  }, {
+    key: "logWarning",
+    value: function logWarning(title, metadata) {
+      try {
+        if (this.logger) {
+          this.logger.addLog({
+            type: 'warning',
+            title: "[OrderServerModule] ".concat(title),
+            metadata: metadata || {}
+          });
+        }
+      } catch (_unused3) {
+        // 日志记录失败不影响主流程
+      }
+    }
 
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
@@ -946,8 +961,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "upsertPendingSyncOrders",
     value: (function () {
       var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(pendingOrders) {
-        var _this10 = this;
-        var pendingMap, memoryPendingMap, _iterator4, _step4, order, storageKey, patchedOrders, mergeActions, updatedList, _iterator5, _step5, _step5$value, _storageKey, _order;
+        var pendingMap, memoryPendingMap, _iterator4, _step4, order, storageKey, patchedOrders, mergeActions, updatedList, _iterator5, _step5, _step5$value, _storageKey, pendingOrder, matchIndex, _iterator6, _step6, _step6$value, _storageKey2, _order;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -1007,50 +1021,70 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               patchedOrders = _toConsumableArray(pendingMap.values());
               mergeActions = {};
-              updatedList = this.store.list.map(function (order) {
-                var storageKey = _this10.getOrderStorageKey(order);
-                if (!storageKey || !pendingMap.has(storageKey)) return order;
-                var pendingOrder = memoryPendingMap.get(storageKey);
-                pendingMap.delete(storageKey);
-                memoryPendingMap.delete(storageKey);
-                mergeActions[storageKey] = 'update';
-                return pendingOrder;
-              });
+              updatedList = _toConsumableArray(this.store.list);
               _iterator5 = _createForOfIteratorHelper(memoryPendingMap.entries());
+              _context11.prev = 33;
+              _iterator5.s();
+            case 35:
+              if ((_step5 = _iterator5.n()).done) {
+                _context11.next = 46;
+                break;
+              }
+              _step5$value = _slicedToArray(_step5.value, 2), _storageKey = _step5$value[0], pendingOrder = _step5$value[1];
+              matchIndex = this.findOrderIndexByIdentity(updatedList, pendingOrder);
+              if (!(matchIndex < 0)) {
+                _context11.next = 40;
+                break;
+              }
+              return _context11.abrupt("continue", 44);
+            case 40:
+              updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder);
+              pendingMap.delete(_storageKey);
+              memoryPendingMap.delete(_storageKey);
+              mergeActions[_storageKey] = 'update';
+            case 44:
+              _context11.next = 35;
+              break;
+            case 46:
+              _context11.next = 51;
+              break;
+            case 48:
+              _context11.prev = 48;
+              _context11.t1 = _context11["catch"](33);
+              _iterator5.e(_context11.t1);
+            case 51:
+              _context11.prev = 51;
+              _iterator5.f();
+              return _context11.finish(51);
+            case 54:
+              _iterator6 = _createForOfIteratorHelper(memoryPendingMap.entries());
               try {
-                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                  _step5$value = _slicedToArray(_step5.value, 2), _storageKey = _step5$value[0], _order = _step5$value[1];
-                  mergeActions[_storageKey] = 'insert';
+                for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                  _step6$value = _slicedToArray(_step6.value, 2), _storageKey2 = _step6$value[0], _order = _step6$value[1];
+                  mergeActions[_storageKey2] = 'insert';
                   updatedList.push(_order);
                 }
               } catch (err) {
-                _iterator5.e(err);
+                _iterator6.e(err);
               } finally {
-                _iterator5.f();
+                _iterator6.f();
               }
-              this.store.list = updatedList;
+              this.store.list = this.compactOrderListByIdentity(updatedList, 'upsertPendingSyncOrders.store').list;
               this.syncOrdersMap();
-              _context11.next = 38;
+              _context11.next = 60;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions);
-            case 38:
+            case 60:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
-              _context11.next = 42;
-              return this.core.effects.emit(OrderHooks.onOrdersChanged, {
-                list: this.store.list,
-                changedOrders: patchedOrders.map(function (order) {
-                  return _this10.normalizeOrderForMemoryList(order);
-                }),
-                source: 'upsertPendingSyncOrders'
-              });
-            case 42:
+              _context11.next = 63;
+              return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
+            case 63:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[6, 19, 22, 25]]);
+        }, _callee11, this, [[6, 19, 22, 25], [33, 48, 51, 54]]);
       }));
       function upsertPendingSyncOrders(_x7) {
         return _upsertPendingSyncOrders.apply(this, arguments);
@@ -1127,42 +1161,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
-      var _this11 = this;
+      var _this10 = this;
       this.store.map.clear();
       this.resourceIdIndex.clear();
-      var _iterator6 = _createForOfIteratorHelper(this.store.list),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper(this.store.list),
+        _step7;
       try {
         var _loop = function _loop() {
-          var order = _step6.value;
-          var identityKeys = _this11.getOrderIdentityKeys(order);
-          if (identityKeys.length === 0) return 1; // continue
-          var _iterator7 = _createForOfIteratorHelper(identityKeys),
-            _step7;
-          try {
-            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-              var identityKey = _step7.value;
-              _this11.store.map.set(identityKey, order);
-            }
-          } catch (err) {
-            _iterator7.e(err);
-          } finally {
-            _iterator7.f();
-          }
-          var resourceIds = _this11.extractResourceIds(order);
-          var primaryIdentity = identityKeys[0];
+          var order = _step7.value;
+          var primaryIdentity = _this10.getOrderMapKey(order);
+          if (!primaryIdentity) return 1; // continue
+          _this10.store.map.set(primaryIdentity, order);
+          var resourceIds = _this10.extractResourceIds(order);
           var _iterator8 = _createForOfIteratorHelper(resourceIds),
             _step8;
           try {
             for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
               var resourceId = _step8.value;
               var key = String(resourceId);
-              var existing = _this11.resourceIdIndex.get(key) || [];
+              var existing = _this10.resourceIdIndex.get(key) || [];
               if (existing.some(function (eid) {
-                return _this11.getIdKey(eid) === primaryIdentity;
+                return _this10.getIdKey(eid) === primaryIdentity;
               })) continue;
               existing.push(primaryIdentity);
-              _this11.resourceIdIndex.set(key, existing);
+              _this10.resourceIdIndex.set(key, existing);
             }
           } catch (err) {
             _iterator8.e(err);
@@ -1170,27 +1192,90 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _iterator8.f();
           }
         };
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
           if (_loop()) continue;
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
     }
+  }, {
+    key: "getOrderMapKey",
+    value: function getOrderMapKey(order) {
+      if (!order) return '';
+      if (!this.isBlankIdentityValue(order.order_id)) {
+        return this.getIdKey(order.order_id);
+      }
+      var externalSaleNumber = order.external_sale_number;
+      if (!this.isBlankIdentityValue(externalSaleNumber)) {
+        return this.getIdKey(externalSaleNumber);
+      }
+      return '';
+    }
+  }, {
+    key: "isBlankIdentityValue",
+    value: function isBlankIdentityValue(value) {
+      return value === undefined || value === null || value === '';
+    }
+  }, {
+    key: "getOrderIdentityEntries",
+    value: function getOrderIdentityEntries(order) {
+      var _this11 = this;
+      if (!order) return [];
+      var record = order;
+      var candidates = [{
+        field: 'order_id',
+        value: order.order_id
+      }, {
+        field: 'external_sale_number',
+        value: record.external_sale_number
+      }, {
+        field: 'order_number',
+        value: record.order_number
+      }, {
+        field: 'shop_order_number',
+        value: record.shop_order_number
+      }, {
+        field: 'shop_full_order_number',
+        value: record.shop_full_order_number
+      }];
+      var entries = [];
+      var _loop2 = function _loop2() {
+          var candidate = _candidates[_i];
+          if (_this11.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this11.getIdKey(candidate.value);
+          if (entries.some(function (entry) {
+            return entry.field === candidate.field && entry.key === key;
+          })) return 0; // continue
+          entries.push({
+            field: candidate.field,
+            key: key
+          });
+        },
+        _ret;
+      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
+        _ret = _loop2();
+        if (_ret === 0) continue;
+      }
+      return entries;
+    }
   }, {
     key: "getOrderIdentityKeys",
     value: function getOrderIdentityKeys(order) {
       var keys = [];
-      var id = order.order_id;
-      if (id !== undefined && id !== null && id !== '') {
-        keys.push(this.getIdKey(id));
-      }
-      var externalSaleNumber = order === null || order === void 0 ? void 0 : order.external_sale_number;
-      if (externalSaleNumber !== undefined && externalSaleNumber !== null && externalSaleNumber !== '') {
-        var externalKey = this.getIdKey(externalSaleNumber);
-        if (!keys.includes(externalKey)) keys.push(externalKey);
+      var _iterator9 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
+        _step9;
+      try {
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var entry = _step9.value;
+          if (!keys.includes(entry.key)) keys.push(entry.key);
+        }
+      } catch (err) {
+        _iterator9.e(err);
+      } finally {
+        _iterator9.f();
       }
       return keys;
     }
@@ -1218,8 +1303,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getOrderDateKey(order) {
       var _order$bookings, _order$bookings2;
       var candidates = [order === null || order === void 0 ? void 0 : order.schedule_date, order === null || order === void 0 ? void 0 : order.create_date, order === null || order === void 0 ? void 0 : order.created_at, order === null || order === void 0 || (_order$bookings = order.bookings) === null || _order$bookings === void 0 || (_order$bookings = _order$bookings[0]) === null || _order$bookings === void 0 ? void 0 : _order$bookings.start_date, order === null || order === void 0 || (_order$bookings2 = order.bookings) === null || _order$bookings2 === void 0 || (_order$bookings2 = _order$bookings2[0]) === null || _order$bookings2 === void 0 ? void 0 : _order$bookings2.select_date];
-      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
-        var v = _candidates[_i];
+      for (var _i2 = 0, _candidates2 = candidates; _i2 < _candidates2.length; _i2++) {
+        var v = _candidates2[_i2];
         if (!v) continue;
         var text = String(v);
         if (!text) continue;
@@ -1536,8 +1621,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeOrdersToStore",
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
-        var _this15 = this;
-        var freshMap, _iterator9, _step9, order, id, freshStorageKeyMap, _iterator10, _step10, _order2, storageKey, uniqueFreshCount, patchedOrders, mergeActions, updatedList, _iterator11, _step11, _order3, _id, insertCount, updateCount;
+        var normalizedFreshOrders, _iterator10, _step10, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, _iterator11, _step11, fresh, matchIndex, storageKey, mergeKey, mergedOrder, insertCount, updateCount;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1545,134 +1629,109 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 freshOrderCount: freshOrders.length,
                 storeOrderCountBefore: this.store.list.length
               });
-              freshMap = new Map();
-              _iterator9 = _createForOfIteratorHelper(freshOrders);
-              _context16.prev = 3;
-              _iterator9.s();
-            case 5:
-              if ((_step9 = _iterator9.n()).done) {
-                _context16.next = 13;
+              this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
+              normalizedFreshOrders = [];
+              _iterator10 = _createForOfIteratorHelper(freshOrders);
+              _context16.prev = 4;
+              _iterator10.s();
+            case 6:
+              if ((_step10 = _iterator10.n()).done) {
+                _context16.next = 14;
                 break;
               }
-              order = _step9.value;
+              order = _step10.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context16.next = 10;
+                _context16.next = 11;
                 break;
               }
-              return _context16.abrupt("continue", 11);
-            case 10:
-              freshMap.set(this.getIdKey(id), this.normalizeRemoteSyncedOrder(order));
+              return _context16.abrupt("continue", 12);
             case 11:
-              _context16.next = 5;
+              normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
+            case 12:
+              _context16.next = 6;
               break;
-            case 13:
-              _context16.next = 18;
+            case 14:
+              _context16.next = 19;
               break;
-            case 15:
-              _context16.prev = 15;
-              _context16.t0 = _context16["catch"](3);
-              _iterator9.e(_context16.t0);
-            case 18:
-              _context16.prev = 18;
-              _iterator9.f();
-              return _context16.finish(18);
-            case 21:
-              freshStorageKeyMap = new Map();
-              _iterator10 = _createForOfIteratorHelper(freshMap.values());
-              _context16.prev = 23;
-              _iterator10.s();
-            case 25:
-              if ((_step10 = _iterator10.n()).done) {
-                _context16.next = 33;
+            case 16:
+              _context16.prev = 16;
+              _context16.t0 = _context16["catch"](4);
+              _iterator10.e(_context16.t0);
+            case 19:
+              _context16.prev = 19;
+              _iterator10.f();
+              return _context16.finish(19);
+            case 22:
+              uniqueFreshOrders = this.compactOrderListByIdentity(normalizedFreshOrders, "".concat(source, ".incoming")).list;
+              uniqueFreshCount = uniqueFreshOrders.length;
+              patchedOrders = [];
+              mergeActions = {};
+              updatedList = _toConsumableArray(this.store.list);
+              _iterator11 = _createForOfIteratorHelper(uniqueFreshOrders);
+              _context16.prev = 28;
+              _iterator11.s();
+            case 30:
+              if ((_step11 = _iterator11.n()).done) {
+                _context16.next = 46;
                 break;
               }
-              _order2 = _step10.value;
-              storageKey = this.getOrderStorageKey(_order2);
-              if (storageKey) {
-                _context16.next = 30;
+              fresh = _step11.value;
+              matchIndex = this.findOrderIndexByIdentity(updatedList, fresh);
+              storageKey = this.getOrderStorageKey(fresh);
+              mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
+              if (!(matchIndex >= 0)) {
+                _context16.next = 41;
                 break;
               }
-              return _context16.abrupt("continue", 31);
-            case 30:
-              freshStorageKeyMap.set(storageKey, _order2);
-            case 31:
-              _context16.next = 25;
+              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
+              updatedList[matchIndex] = mergedOrder;
+              patchedOrders.push(mergedOrder);
+              if (mergeKey) mergeActions[mergeKey] = 'update';
+              return _context16.abrupt("continue", 44);
+            case 41:
+              updatedList.push(fresh);
+              patchedOrders.push(fresh);
+              if (mergeKey) mergeActions[mergeKey] = 'insert';
+            case 44:
+              _context16.next = 30;
               break;
-            case 33:
-              _context16.next = 38;
+            case 46:
+              _context16.next = 51;
               break;
-            case 35:
-              _context16.prev = 35;
-              _context16.t1 = _context16["catch"](23);
-              _iterator10.e(_context16.t1);
-            case 38:
-              _context16.prev = 38;
-              _iterator10.f();
-              return _context16.finish(38);
-            case 41:
-              uniqueFreshCount = freshMap.size;
-              patchedOrders = _toConsumableArray(freshMap.values());
-              mergeActions = {};
-              updatedList = this.store.list.map(function (order) {
-                var storageKey = _this15.getOrderStorageKey(order);
-                if (storageKey && freshStorageKeyMap.has(storageKey)) {
-                  var _fresh = freshStorageKeyMap.get(storageKey);
-                  freshStorageKeyMap.delete(storageKey);
-                  var freshId = _fresh.order_id;
-                  if (freshId !== undefined && freshId !== null) {
-                    freshMap.delete(_this15.getIdKey(freshId));
-                    mergeActions[_this15.getIdKey(freshId)] = 'update';
-                  } else {
-                    mergeActions[storageKey] = 'update';
-                  }
-                  return _fresh;
-                }
-                var id = order.order_id;
-                if (id === undefined || id === null) return order;
-                var key = _this15.getIdKey(id);
-                if (!freshMap.has(key)) return order;
-                var fresh = freshMap.get(key);
-                freshMap.delete(key);
-                mergeActions[key] = 'update';
-                return fresh;
-              });
-              _iterator11 = _createForOfIteratorHelper(freshMap.values());
-              try {
-                for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-                  _order3 = _step11.value;
-                  _id = _order3.order_id;
-                  if (_id !== undefined && _id !== null) {
-                    mergeActions[this.getIdKey(_id)] = 'insert';
-                  }
-                  updatedList.push(_order3);
-                }
-              } catch (err) {
-                _iterator11.e(err);
-              } finally {
-                _iterator11.f();
-              }
+            case 48:
+              _context16.prev = 48;
+              _context16.t1 = _context16["catch"](28);
+              _iterator11.e(_context16.t1);
+            case 51:
+              _context16.prev = 51;
+              _iterator11.f();
+              return _context16.finish(51);
+            case 54:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
               updateCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'update';
               }).length;
-              this.store.list = updatedList;
+              this.store.list = this.compactOrderListByIdentity(updatedList, "".concat(source, ".store")).list;
               this.syncOrdersMap();
-              _context16.next = 53;
+              _context16.next = 60;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 53:
+            case 60:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
-                storeOrderCountAfter: this.store.list.length
+                storeOrderCountAfter: this.store.list.length,
+                insertCount: insertCount,
+                updateCount: updateCount
               });
-              this.emitOrdersChanged(patchedOrders, source);
-            case 55:
+              _context16.next = 63;
+              return this.emitOrdersChanged(patchedOrders, source);
+            case 63:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[3, 15, 18, 21], [23, 35, 38, 41]]);
+        }, _callee16, this, [[4, 16, 19, 22], [28, 48, 51, 54]]);
       }));
       function mergeOrdersToStore(_x9, _x10) {
         return _mergeOrdersToStore.apply(this, arguments);
@@ -1733,12 +1792,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this16 = this;
+      var _this15 = 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 _this16.getIdKey(value) === lookupKey;
+        return _this15.getIdKey(value) === lookupKey;
       });
     }
 
@@ -1762,6 +1821,179 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return '';
     }
+  }, {
+    key: "getOrderIdentityMatchKeys",
+    value: function getOrderIdentityMatchKeys(order) {
+      return this.getOrderIdentityEntries(order).map(function (entry) {
+        return "".concat(entry.field, ":").concat(entry.key);
+      });
+    }
+  }, {
+    key: "doOrdersShareIdentity",
+    value: function doOrdersShareIdentity(left, right) {
+      var leftKeys = new Set(this.getOrderIdentityMatchKeys(left));
+      if (leftKeys.size === 0) return false;
+      return this.getOrderIdentityMatchKeys(right).some(function (key) {
+        return leftKeys.has(key);
+      });
+    }
+  }, {
+    key: "findOrderIndexByIdentity",
+    value: function findOrderIndexByIdentity(orders, target) {
+      var _this16 = this;
+      if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
+      return orders.findIndex(function (order) {
+        return _this16.doOrdersShareIdentity(order, target);
+      });
+    }
+  }, {
+    key: "getOrderCompletenessScore",
+    value: function getOrderCompletenessScore(order) {
+      var record = order;
+      var score = this.isPendingSyncOrder(order) ? 0 : 100;
+      if (!this.isBlankIdentityValue(order.order_id) && order.order_id !== record.external_sale_number) score += 30;
+      score += this.getOrderIdentityMatchKeys(order).length * 5;
+      if (Array.isArray(order.products)) score += Math.min(order.products.length, 10);
+      if (Array.isArray(order.bookings)) score += Math.min(order.bookings.length, 10);
+      if (Array.isArray(order.payments)) score += Math.min(order.payments.length, 10);
+      if (record.updated_at) score += 1;
+      return score;
+    }
+  }, {
+    key: "pickPreferredOrder",
+    value: function pickPreferredOrder(left, right) {
+      var leftScore = this.getOrderCompletenessScore(left);
+      var rightScore = this.getOrderCompletenessScore(right);
+      if (rightScore >= leftScore) return right;
+      return left;
+    }
+  }, {
+    key: "mergeOrderRecords",
+    value: function mergeOrderRecords(existing, incoming) {
+      var preferred = this.pickPreferredOrder(existing, incoming);
+      var secondary = preferred === existing ? incoming : existing;
+      var merged = _objectSpread(_objectSpread({}, secondary), preferred);
+      var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
+      var mergedRecord = merged;
+      var preferredRecord = preferred;
+      var secondaryRecord = secondary;
+      for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
+        var field = _fieldsToPreserve[_i3];
+        if (!this.isBlankIdentityValue(preferredRecord[field])) {
+          mergedRecord[field] = preferredRecord[field];
+          continue;
+        }
+        if (!this.isBlankIdentityValue(secondaryRecord[field])) {
+          mergedRecord[field] = secondaryRecord[field];
+        }
+      }
+      if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
+        merged.need_sync = 0;
+      }
+      return merged;
+    }
+  }, {
+    key: "summarizeDuplicateOrders",
+    value: function summarizeDuplicateOrders(orders) {
+      var groups = new Map();
+      var _iterator13 = _createForOfIteratorHelper(orders),
+        _step13;
+      try {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var order = _step13.value;
+          var _iterator14 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step14;
+          try {
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+              var key = _step14.value;
+              var group = groups.get(key) || [];
+              group.push(order);
+              groups.set(key, group);
+            }
+          } catch (err) {
+            _iterator14.e(err);
+          } finally {
+            _iterator14.f();
+          }
+        }
+      } catch (err) {
+        _iterator13.e(err);
+      } finally {
+        _iterator13.f();
+      }
+      return _toConsumableArray(groups.entries()).filter(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          group = _ref3[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+          key = _ref5[0],
+          group = _ref5[1];
+        return {
+          key: key,
+          count: group.length,
+          orders: group.map(function (order) {
+            var _order$order_id2, _external_sale_number, _shop_order_number, _shop_full_order_numb, _order$need_sync;
+            return {
+              order_id: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
+              external_sale_number: (_external_sale_number = order.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : null,
+              shop_order_number: (_shop_order_number = order.shop_order_number) !== null && _shop_order_number !== void 0 ? _shop_order_number : null,
+              shop_full_order_number: (_shop_full_order_numb = order.shop_full_order_number) !== null && _shop_full_order_numb !== void 0 ? _shop_full_order_numb : null,
+              need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null
+            };
+          })
+        };
+      });
+    }
+  }, {
+    key: "logDuplicateOrders",
+    value: function logDuplicateOrders(source, orders) {
+      var duplicateGroups = this.summarizeDuplicateOrders(orders);
+      if (duplicateGroups.length === 0) return;
+      this.logWarning('检测到重复订单身份键', {
+        source: source,
+        duplicateGroupCount: duplicateGroups.length,
+        duplicateGroups: duplicateGroups
+      });
+    }
+  }, {
+    key: "compactOrderListByIdentity",
+    value: function compactOrderListByIdentity(orders, source) {
+      var list = [];
+      var removedCount = 0;
+      var _iterator15 = _createForOfIteratorHelper(orders),
+        _step15;
+      try {
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var order = _step15.value;
+          var matchIndex = this.findOrderIndexByIdentity(list, order);
+          if (matchIndex < 0) {
+            list.push(order);
+            continue;
+          }
+          list[matchIndex] = this.mergeOrderRecords(list[matchIndex], order);
+          removedCount += 1;
+        }
+      } catch (err) {
+        _iterator15.e(err);
+      } finally {
+        _iterator15.f();
+      }
+      if (removedCount > 0) {
+        this.logWarning('订单列表重复项已压缩', {
+          source: source,
+          beforeCount: orders.length,
+          afterCount: list.length,
+          removedCount: removedCount
+        });
+      } else {
+        this.logDuplicateOrders(source, orders);
+      }
+      return {
+        list: list,
+        removedCount: removedCount
+      };
+    }
 
     /**
      * 当前订单拉取窗口：
@@ -1819,7 +2051,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (typeof globalThis !== 'undefined' && globalThis !== null && globalThis !== void 0 && globalThis.localStorage) {
           return globalThis.localStorage.getItem(key);
         }
-      } catch (_unused5) {
+      } catch (_unused6) {
         // 忽略存储异常，避免影响主流程
       }
       return null;
@@ -1836,7 +2068,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (typeof globalThis !== 'undefined' && globalThis !== null && globalThis !== void 0 && globalThis.localStorage) {
           globalThis.localStorage.setItem(key, value);
         }
-      } catch (_unused6) {
+      } catch (_unused7) {
         // 忽略存储异常，避免影响主流程
       }
     }
@@ -1895,26 +2127,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var merged = remoteOrders.map(function (order) {
         return _this17.normalizeRemoteSyncedOrder(order);
       });
-      var remoteStorageKeys = new Set(merged.map(function (order) {
-        return _this17.getOrderStorageKey(order);
-      }).filter(Boolean));
-      var _iterator13 = _createForOfIteratorHelper(existingOrders),
-        _step13;
+      var _iterator16 = _createForOfIteratorHelper(existingOrders),
+        _step16;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var order = _step13.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var order = _step16.value;
           if (!this.isPendingSyncOrder(order)) continue;
-          var storageKey = this.getOrderStorageKey(order);
-          if (!storageKey || remoteStorageKeys.has(storageKey)) continue;
+          var matchIndex = this.findOrderIndexByIdentity(merged, order);
+          if (matchIndex >= 0) {
+            merged[matchIndex] = this.mergeOrderRecords(order, merged[matchIndex]);
+            continue;
+          }
+          if (!this.getOrderStorageKey(order)) continue;
           merged.push(order);
-          remoteStorageKeys.add(storageKey);
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator13.f();
+        _iterator16.f();
       }
-      return merged;
+      return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
 
     /**
@@ -1968,6 +2200,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           _this$filterRedundant2,
           toWrite,
           skipped,
+          compactedToWrite,
           _args20 = arguments;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -1995,17 +2228,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context20.abrupt("return");
             case 9:
-              _context20.prev = 9;
-              _context20.next = 12;
+              compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
+              if (!(compactedToWrite.length === 0)) {
+                _context20.next = 12;
+                break;
+              }
+              return _context20.abrupt("return");
+            case 12:
+              _context20.prev = 12;
+              _context20.next = 15;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-                var writeMethod, _iterator14, _step14, order;
+                var writeMethod, _iterator17, _step17, order;
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       writeMethod = 'none';
                       _this18.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
-                        count: toWrite.length,
+                        count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
                       if (!(typeof _this18.dbManager.bulkUpdate === 'function')) {
@@ -2014,7 +2254,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       writeMethod = 'bulkUpdate';
                       _context19.next = 6;
-                      return _this18.dbManager.bulkUpdate(INDEXDB_STORE_NAME, toWrite);
+                      return _this18.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
                       _context19.next = 33;
                       break;
@@ -2025,7 +2265,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       writeMethod = 'bulkAdd';
                       _context19.next = 12;
-                      return _this18.dbManager.bulkAdd(INDEXDB_STORE_NAME, toWrite);
+                      return _this18.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
                       _context19.next = 33;
                       break;
@@ -2035,15 +2275,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator14 = _createForOfIteratorHelper(toWrite);
+                      _iterator17 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator14.s();
+                      _iterator17.s();
                     case 19:
-                      if ((_step14 = _iterator14.n()).done) {
+                      if ((_step17 = _iterator17.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step14.value;
+                      order = _step17.value;
                       _context19.next = 23;
                       return _this18.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
@@ -2055,16 +2295,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator14.e(_context19.t0);
+                      _iterator17.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator14.f();
+                      _iterator17.f();
                       return _context19.finish(30);
                     case 33:
-                      _this18.recordRecentSqliteWrite(source, toWrite);
+                      _this18.recordRecentSqliteWrite(source, compactedToWrite);
                       _this18.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
-                        count: toWrite.length,
+                        count: compactedToWrite.length,
                         writeMethod: writeMethod,
                         dedupedCount: skipped.length
                       });
@@ -2074,21 +2314,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _callee19, null, [[17, 27, 30, 33]]);
               })));
-            case 12:
-              _context20.next = 17;
+            case 15:
+              _context20.next = 20;
               break;
-            case 14:
-              _context20.prev = 14;
-              _context20.t0 = _context20["catch"](9);
+            case 17:
+              _context20.prev = 17;
+              _context20.t0 = _context20["catch"](12);
               this.logError('增量保存订单到 SQLite 失败', {
                 error: _context20.t0 instanceof Error ? _context20.t0.message : String(_context20.t0),
                 orderCount: ordersSnapshot.length
               });
-            case 17:
+            case 20:
             case "end":
               return _context20.stop();
           }
-        }, _callee20, this, [[9, 14]]);
+        }, _callee20, this, [[12, 17]]);
       }));
       function patchOrdersInSQLite(_x12, _x13) {
         return _patchOrdersInSQLite.apply(this, arguments);
@@ -2215,14 +2455,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 _context24.next = 2;
                 break;
               }
-              return _context24.abrupt("return", orderList.map(function (order) {
+              return _context24.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
                 return _this20.normalizeRemoteSyncedOrder(order);
-              }));
+              }), "".concat(source, ".snapshotNoDb")).list);
             case 2:
               remoteSnapshot = cloneDeep(orderList);
-              mergedSnapshot = remoteSnapshot.map(function (order) {
+              mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
                 return _this20.normalizeRemoteSyncedOrder(order);
-              });
+              }), "".concat(source, ".remoteSnapshot")).list;
               _context24.prev = 4;
               _context24.next = 7;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
@@ -2245,32 +2485,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 7:
                       existingOrders = _context23.t0;
                       orderListSnapshot = _this20.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
-                      mergedSnapshot = orderListSnapshot;
+                      mergedSnapshot = _this20.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
                       _this20.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
-                        count: orderListSnapshot.length,
+                        count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
-                        preservedPendingCount: orderListSnapshot.length - remoteSnapshot.length
+                        preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
                       });
                       _context23.next = 13;
                       return _this20.dbManager.clear(INDEXDB_STORE_NAME);
                     case 13:
                       _this20.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
-                        count: orderListSnapshot.length
+                        count: mergedSnapshot.length
                       });
-                      if (!(orderListSnapshot.length === 0)) {
+                      if (!(mergedSnapshot.length === 0)) {
                         _context23.next = 16;
                         break;
                       }
                       return _context23.abrupt("return");
                     case 16:
                       _context23.next = 18;
-                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
+                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
                     case 18:
-                      _this20.recordRecentSqliteWrite(source, orderListSnapshot);
+                      _this20.recordRecentSqliteWrite(source, mergedSnapshot);
                       _this20.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
-                        count: orderListSnapshot.length
+                        count: mergedSnapshot.length
                       });
                     case 20:
                     case "end":