@pisell/pisellos 2.2.248 → 2.2.250

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

@@ -193,8 +193,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private findOrderIndexByIdentity;
     private getOrderCompletenessScore;
     private pickPreferredOrder;
-    private getProductMergeKey;
+    private getProductIdentityKeys;
     private mergeOrderProductLists;
+    private getPaymentMergeKey;
+    private mergeOrderPaymentLists;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;

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

@@ -1899,20 +1899,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return left;
     }
   }, {
-    key: "getProductMergeKey",
-    value: function getProductMergeKey(product) {
+    key: "getProductIdentityKeys",
+    value: function getProductIdentityKeys(product) {
       var _record$metadata;
       var record = product;
-      if (!record) return '';
+      if (!record) return [];
+      var keys = [];
       var metadataUid = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.unique_identification_number;
-      if (!this.isBlankIdentityValue(metadataUid)) return "uid:".concat(String(metadataUid));
+      if (!this.isBlankIdentityValue(metadataUid)) keys.push("uid:".concat(String(metadataUid)));
       var topLevelUid = record.unique_identification_number;
-      if (!this.isBlankIdentityValue(topLevelUid)) return "uid:".concat(String(topLevelUid));
+      if (!this.isBlankIdentityValue(topLevelUid)) keys.push("uid:".concat(String(topLevelUid)));
       var orderDetailId = record.order_detail_id;
-      if (!this.isBlankIdentityValue(orderDetailId)) return "detail:".concat(String(orderDetailId));
+      if (!this.isBlankIdentityValue(orderDetailId)) keys.push("detail:".concat(String(orderDetailId)));
       var bookingUid = record.booking_uid;
-      if (!this.isBlankIdentityValue(bookingUid)) return "booking:".concat(String(bookingUid));
-      return '';
+      if (!this.isBlankIdentityValue(bookingUid)) keys.push("booking:".concat(String(bookingUid)));
+      return keys;
     }
   }, {
     key: "mergeOrderProductLists",
@@ -1927,8 +1928,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
           var item = _step13.value;
-          var key = this.getProductMergeKey(item);
-          if (key) seenKeys.add(key);
+          var keys = this.getProductIdentityKeys(item);
+          var _iterator15 = _createForOfIteratorHelper(keys),
+            _step15;
+          try {
+            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+              var key = _step15.value;
+              seenKeys.add(key);
+            }
+          } catch (err) {
+            _iterator15.e(err);
+          } finally {
+            _iterator15.f();
+          }
         }
       } catch (err) {
         _iterator13.e(err);
@@ -1941,9 +1953,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
           var _item = _step14.value;
-          var _key = this.getProductMergeKey(_item);
-          if (!_key || seenKeys.has(_key)) continue;
-          seenKeys.add(_key);
+          var _keys = this.getProductIdentityKeys(_item);
+          if (_keys.length === 0 || _keys.some(function (key) {
+            return seenKeys.has(key);
+          })) continue;
+          var _iterator16 = _createForOfIteratorHelper(_keys),
+            _step16;
+          try {
+            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+              var _key = _step16.value;
+              seenKeys.add(_key);
+            }
+          } catch (err) {
+            _iterator16.e(err);
+          } finally {
+            _iterator16.f();
+          }
           result.push(cloneDeep(_item));
         }
       } catch (err) {
@@ -1953,6 +1978,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 _iterator17 = _createForOfIteratorHelper(existingList),
+        _step17;
+      try {
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var payment = _step17.value;
+          var key = this.getPaymentMergeKey(payment);
+          if (!key) continue;
+          existingByKey.set(key, payment);
+        }
+      } catch (err) {
+        _iterator17.e(err);
+      } finally {
+        _iterator17.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 +2037,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 +2063,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 +2079,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator15 = _createForOfIteratorHelper(orders),
-        _step15;
+      var _iterator18 = _createForOfIteratorHelper(orders),
+        _step18;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var order = _step15.value;
-          var _iterator16 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step16;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var order = _step18.value;
+          var _iterator19 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step19;
           try {
-            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-              var key = _step16.value;
+            for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+              var key = _step19.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator16.e(err);
+            _iterator19.e(err);
           } finally {
-            _iterator16.f();
+            _iterator19.f();
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator15.f();
+        _iterator18.f();
       }
       return _toConsumableArray(groups.entries()).filter(function (_ref2) {
         var _ref3 = _slicedToArray(_ref2, 2),
@@ -2059,11 +2144,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator17 = _createForOfIteratorHelper(orders),
-        _step17;
+      var _iterator20 = _createForOfIteratorHelper(orders),
+        _step20;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var order = _step17.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var order = _step20.value;
           var matchIndex = this.findOrderIndexByIdentity(list, order);
           if (matchIndex < 0) {
             list.push(order);
@@ -2073,9 +2158,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           removedCount += 1;
         }
       } catch (err) {
-        _iterator17.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator17.f();
+        _iterator20.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2221,15 +2306,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 _iterator21 = _createForOfIteratorHelper(existingOrders),
+        _step21;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var order = _step18.value;
+        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+          var order = _step21.value;
           if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
@@ -2240,9 +2325,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator21.e(err);
       } finally {
-        _iterator18.f();
+        _iterator21.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2292,7 +2377,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 +2396,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 +2421,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, _iterator22, _step22, 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);
+                      _iterator22 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator19.s();
+                      _iterator22.s();
                     case 19:
-                      if ((_step19 = _iterator19.n()).done) {
+                      if ((_step22 = _iterator22.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step19.value;
+                      order = _step22.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 +2478,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator19.e(_context19.t0);
+                      _iterator22.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator19.f();
+                      _iterator22.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 +2529,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 +2550,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 +2629,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 +2639,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 +2653,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 +2667,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 +2688,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 +2735,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 +2752,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();

package/dist/solution/BaseSales/index.js

@@ -2247,6 +2247,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams20,
         _paymentRecord$paymen,
         _paymentRecord$create,
+        _ref13,
+        _paymentRecord$origin,
         _this7 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
       var paymentRecord = payment;
@@ -2268,7 +2270,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var paymentTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
       var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : paymentTimestamp;
       var createdAt = (_paymentRecord$create = paymentRecord.created_at) !== null && _paymentRecord$create !== void 0 ? _paymentRecord$create : paymentTimestamp;
-      var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread({}, paymentRecord), {}, {
+      var serviceCharge = paymentRecord.service_charge && _typeof(paymentRecord.service_charge) === 'object' ? paymentRecord.service_charge : null;
+      var calculatedServiceFee = serviceCharge ? new Decimal((_ref13 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref13 !== void 0 ? _ref13 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
+      var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread(_objectSpread({}, paymentRecord), calculatedServiceFee !== undefined ? {
+        service_fee: calculatedServiceFee
+      } : {}), {}, {
         metadata: metadata,
         payment_time: paymentTime,
         created_at: createdAt
@@ -2376,7 +2382,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
-        var _params$order_wait_pa, _ref13, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref14, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2419,7 +2425,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref13 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref13 !== void 0 ? _ref13 : 1
+                is_price_include_tax: (_ref14 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref14 !== void 0 ? _ref14 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -2550,7 +2556,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
-        var orderIds, _ref14, _ref15, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref15, _ref16, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2571,7 +2577,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context26.sent;
-              orderId = (_ref14 = (_ref15 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref15 !== void 0 ? _ref15 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref14 !== void 0 ? _ref14 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref15 = (_ref16 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref16 !== void 0 ? _ref16 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref15 !== void 0 ? _ref15 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context26.next = 10;
                 break;
@@ -2997,14 +3003,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _this$otherParams22;
-        var _ref16,
-          _ref16$cover,
+        var _ref17,
+          _ref17$cover,
           cover,
           _args36 = arguments;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              _ref16 = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : {}, _ref16$cover = _ref16.cover, cover = _ref16$cover === void 0 ? false : _ref16$cover;
+              _ref17 = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : {}, _ref17$cover = _ref17.cover, cover = _ref17$cover === void 0 ? false : _ref17$cover;
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -173,6 +173,10 @@ export function transformBaseProductToOrderProduct(params) {
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
+  // 从源头补充商品多语言标题
+  var productTitle = _objectSpread(_objectSpread({}, (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {}), {}, {
+    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
+  });
   return {
     product_id: productId,
     product_variant_id: productVariantId,
@@ -190,6 +194,7 @@ export function transformBaseProductToOrderProduct(params) {
     is_charge_tax: toNumber((_ref32 = (_ref33 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref33 !== void 0 ? _ref33 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref32 !== void 0 ? _ref32 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
+    product_title: productTitle,
     _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
       callbackData: payload
     })