@pisell/pisellos 2.2.247 → 2.2.249

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

@@ -195,6 +195,8 @@ export declare class OrderModule extends BaseModule implements Module {
     private pickPreferredOrder;
     private getProductMergeKey;
     private mergeOrderProductLists;
+    private getPaymentMergeKey;
+    private mergeOrderPaymentLists;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;

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

@@ -1953,6 +1953,58 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return result;
     }
+  }, {
+    key: "getPaymentMergeKey",
+    value: function getPaymentMergeKey(payment) {
+      var _record$metadata2;
+      var record = payment;
+      if (!record) return '';
+      var uniquePaymentNumber = (_record$metadata2 = record.metadata) === null || _record$metadata2 === void 0 ? void 0 : _record$metadata2.unique_payment_number;
+      if (!this.isBlankIdentityValue(uniquePaymentNumber)) {
+        return "unique:".concat(String(uniquePaymentNumber));
+      }
+      var orderPaymentId = record.order_payment_id;
+      if (!this.isBlankIdentityValue(orderPaymentId)) return "order_payment:".concat(String(orderPaymentId));
+      var code = record.code;
+      var customPaymentId = record.custom_payment_id;
+      if (!this.isBlankIdentityValue(code) && !this.isBlankIdentityValue(customPaymentId)) {
+        return "custom:".concat(String(code), "#").concat(String(customPaymentId));
+      }
+      return '';
+    }
+  }, {
+    key: "mergeOrderPaymentLists",
+    value: function mergeOrderPaymentLists(existing, incoming) {
+      var _this18 = this;
+      var existingList = Array.isArray(existing) ? existing : [];
+      var incomingList = Array.isArray(incoming) ? incoming : [];
+      if (incomingList.length === 0) return cloneDeep(existingList);
+      if (existingList.length === 0) return cloneDeep(incomingList);
+      var existingByKey = new Map();
+      var _iterator15 = _createForOfIteratorHelper(existingList),
+        _step15;
+      try {
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var payment = _step15.value;
+          var key = this.getPaymentMergeKey(payment);
+          if (!key) continue;
+          existingByKey.set(key, payment);
+        }
+      } catch (err) {
+        _iterator15.e(err);
+      } finally {
+        _iterator15.f();
+      }
+      return incomingList.map(function (payment) {
+        var incomingPayment = payment;
+        var key = _this18.getPaymentMergeKey(incomingPayment);
+        var existingPayment = key ? existingByKey.get(key) : undefined;
+        if (!existingPayment) return cloneDeep(incomingPayment);
+        return _objectSpread(_objectSpread(_objectSpread({}, cloneDeep(existingPayment)), cloneDeep(incomingPayment)), {}, {
+          metadata: _objectSpread(_objectSpread({}, cloneDeep(existingPayment.metadata || {})), cloneDeep(incomingPayment.metadata || {}))
+        });
+      });
+    }
   }, {
     key: "mergeOrderRecords",
     value: function mergeOrderRecords(existing, incoming, options) {
@@ -1960,11 +2012,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       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 incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'payments', 'products', 'bookings'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
       var incomingRecord = incoming;
+      var previousRecord = preferred === incoming ? secondaryRecord : preferredRecord;
       for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
         var field = _fieldsToPreserve[_i3];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
@@ -1985,6 +2038,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
       }
       mergedRecord.products = shouldUseIncomingProductsSnapshot ? cloneDeep(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
+      if (Object.prototype.hasOwnProperty.call(incomingRecord, 'payments')) {
+        if (Array.isArray(incomingRecord.payments)) {
+          mergedRecord.payments = this.mergeOrderPaymentLists(previousRecord.payments, incomingRecord.payments);
+        } else if (incomingRecord.payments !== undefined && incomingRecord.payments !== null) {
+          mergedRecord.payments = cloneDeep(incomingRecord.payments);
+        }
+      }
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }
@@ -1994,30 +2054,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator15 = _createForOfIteratorHelper(orders),
-        _step15;
+      var _iterator16 = _createForOfIteratorHelper(orders),
+        _step16;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var order = _step15.value;
-          var _iterator16 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step16;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var order = _step16.value;
+          var _iterator17 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step17;
           try {
-            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-              var key = _step16.value;
+            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+              var key = _step17.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator16.e(err);
+            _iterator17.e(err);
           } finally {
-            _iterator16.f();
+            _iterator17.f();
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator15.f();
+        _iterator16.f();
       }
       return _toConsumableArray(groups.entries()).filter(function (_ref2) {
         var _ref3 = _slicedToArray(_ref2, 2),
@@ -2059,11 +2119,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator17 = _createForOfIteratorHelper(orders),
-        _step17;
+      var _iterator18 = _createForOfIteratorHelper(orders),
+        _step18;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var order = _step17.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var order = _step18.value;
           var matchIndex = this.findOrderIndexByIdentity(list, order);
           if (matchIndex < 0) {
             list.push(order);
@@ -2073,9 +2133,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           removedCount += 1;
         }
       } catch (err) {
-        _iterator17.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator17.f();
+        _iterator18.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2221,15 +2281,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this18 = this;
+      var _this19 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this18.normalizeRemoteSyncedOrder(order);
+        return _this19.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator18 = _createForOfIteratorHelper(existingOrders),
-        _step18;
+      var _iterator19 = _createForOfIteratorHelper(existingOrders),
+        _step19;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var order = _step18.value;
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var order = _step19.value;
           if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
@@ -2240,9 +2300,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator18.f();
+        _iterator19.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2292,7 +2352,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "patchOrdersInSQLite",
     value: (function () {
       var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(orders, source) {
-        var _this19 = this;
+        var _this20 = this;
         var mergeActions,
           ordersSnapshot,
           _this$filterRedundant2,
@@ -2311,7 +2371,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context20.abrupt("return");
             case 3:
               ordersSnapshot = cloneDeep(orders).filter(function (order) {
-                return _this19.getOrderStorageKey(order);
+                return _this20.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
                 _context20.next = 6;
@@ -2336,54 +2396,54 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context20.prev = 12;
               _context20.next = 15;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-                var writeMethod, _iterator19, _step19, order;
+                var writeMethod, _iterator20, _step20, order;
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this19.logInfo('patchOrdersInSQLite-开始', {
+                      _this20.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this19.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
                         _context19.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context19.next = 6;
-                      return _this19.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
                       _context19.next = 33;
                       break;
                     case 8:
-                      if (!(typeof _this19.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
                         _context19.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context19.next = 12;
-                      return _this19.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
                       _context19.next = 33;
                       break;
                     case 14:
-                      if (!(typeof _this19.dbManager.update === 'function')) {
+                      if (!(typeof _this20.dbManager.update === 'function')) {
                         _context19.next = 33;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator19 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator20 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator19.s();
+                      _iterator20.s();
                     case 19:
-                      if ((_step19 = _iterator19.n()).done) {
+                      if ((_step20 = _iterator20.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step19.value;
+                      order = _step20.value;
                       _context19.next = 23;
-                      return _this19.dbManager.update(INDEXDB_STORE_NAME, order);
+                      return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
                       _context19.next = 19;
                       break;
@@ -2393,14 +2453,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator19.e(_context19.t0);
+                      _iterator20.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator19.f();
+                      _iterator20.f();
                       return _context19.finish(30);
                     case 33:
-                      _this19.recordRecentSqliteWrite(source, compactedToWrite);
-                      _this19.logInfo('patchOrdersInSQLite-完成', {
+                      _this20.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this20.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
@@ -2444,7 +2504,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderInSQLite",
     value: (function () {
       var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(order, source) {
-        var _this20 = this;
+        var _this21 = this;
         var orderSnapshot, _orderSnapshot$order_3;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
@@ -2465,43 +2525,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this20.logInfo('updateOrderInSQLite-开始', {
+                      _this21.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this20.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this21.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this20.dbManager.update === 'function')) {
+                      if (!(typeof _this21.dbManager.update === 'function')) {
                         _context21.next = 8;
                         break;
                       }
                       writeMethod = 'update';
                       _context21.next = 6;
-                      return _this20.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      return _this21.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
                       _context21.next = 18;
                       break;
                     case 8:
-                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this21.dbManager.bulkUpdate === 'function')) {
                         _context21.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context21.next = 12;
-                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this21.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
                       _context21.next = 18;
                       break;
                     case 14:
-                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this21.dbManager.bulkAdd === 'function')) {
                         _context21.next = 18;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context21.next = 18;
-                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _this20.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this20.logInfo('updateOrderInSQLite-完成', {
+                      _this21.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this21.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
@@ -2544,7 +2604,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
       var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orderList, source) {
-        var _this21 = this;
+        var _this22 = this;
         var remoteSnapshot, mergedSnapshot;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2554,12 +2614,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context24.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
-                return _this21.normalizeRemoteSyncedOrder(order);
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
             case 2:
               remoteSnapshot = cloneDeep(orderList);
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this21.normalizeRemoteSyncedOrder(order);
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
               _context24.prev = 4;
               _context24.next = 7;
@@ -2568,12 +2628,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee23$(_context23) {
                   while (1) switch (_context23.prev = _context23.next) {
                     case 0:
-                      if (!(typeof _this21.dbManager.getAll === 'function')) {
+                      if (!(typeof _this22.dbManager.getAll === 'function')) {
                         _context23.next = 6;
                         break;
                       }
                       _context23.next = 3;
-                      return _this21.dbManager.getAll(INDEXDB_STORE_NAME);
+                      return _this22.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
                       _context23.t0 = _context23.sent;
                       _context23.next = 7;
@@ -2582,18 +2642,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       _context23.t0 = [];
                     case 7:
                       existingOrders = _context23.t0;
-                      orderListSnapshot = _this21.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
-                      mergedSnapshot = _this21.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this21.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      orderListSnapshot = _this22.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
+                      mergedSnapshot = _this22.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
                         preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
                       });
                       _context23.next = 13;
-                      return _this21.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
                     case 13:
-                      _this21.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
@@ -2603,10 +2663,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       return _context23.abrupt("return");
                     case 16:
                       _context23.next = 18;
-                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
                     case 18:
-                      _this21.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this21.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      _this22.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
@@ -2650,7 +2710,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clear",
     value: (function () {
       var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-        var _this22 = this;
+        var _this23 = this;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2667,7 +2727,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context25.prev = _context25.next) {
                     case 0:
                       _context25.next = 2;
-                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this23.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
                       return _context25.stop();