交易号查订单id

crm-manager/src/main/java/com/crm/manager/controller/VaultodyController.java

@@ -5,7 +5,6 @@ import com.crm.manager.util.BlockchainUtils;
 import com.crm.manager.util.DateUtils;
 import com.crm.rely.backend.core.dto.base.BaseResultDto;
 import com.crm.rely.backend.model.dto.export.TransactionItemExport;
-import com.crm.rely.backend.model.entity.vaultody.vaults.VaultTransactionsEntity;
 import com.crm.rely.backend.model.entity.vaultody.vaults.VaultTransactionsSearchEntity;
 import com.crm.rely.backend.model.pojo.table.TransactionItemTable;
 import com.crm.rely.backend.util.ExportUtil;

crm-manager/src/main/java/com/crm/manager/service/impl/VaultodyServiceImpl.java

@@ -468,6 +468,14 @@ public class VaultodyServiceImpl implements VaultodyService {
                 BeanUtils.copyProperties(transactionItemDto, table);
                 table.setVaultId(entity.getVaultId());
                 table.setItemId(transactionItemDto.getId());
+                if(StringUtils.isNotBlank(table.getTransactionId())){
+                    List<String> transactionIds = new ArrayList<>();
+                    transactionIds.add(table.getTransactionId());
+                    Map<String, String> orderSerialByTransactionIds = getOrderSerialByTransactionIds(transactionIds);
+                    if(!CollectionUtils.isEmpty(orderSerialByTransactionIds)){
+                        table.setOrderId(orderSerialByTransactionIds.get(table.getTransactionId()));
+                    }
+                }
                 tables.add(table);
             }
             batchSave(tables);

crm-manager/src/main/java/com/crm/manager/service/job/VaultsJob.java

@@ -5,14 +5,17 @@ import com.crm.rely.backend.model.config.VaultodyConfig;
 import com.crm.rely.backend.model.dto.vaultody.vaults.TransactionItemDto;
 import com.crm.rely.backend.model.pojo.table.TransactionItemTable;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -43,6 +46,14 @@ public class VaultsJob {
                 BeanUtils.copyProperties(transactionItemDto, table);
                 table.setVaultId(config.getVaultId());
                 table.setItemId(transactionItemDto.getId());
+                if(StringUtils.isNotBlank(table.getTransactionId())){
+                    List<String> transactionIds = new ArrayList<>();
+                    transactionIds.add(table.getTransactionId());
+                    Map<String, String> orderSerialByTransactionIds = vaultodyService.getOrderSerialByTransactionIds(transactionIds);
+                    if(!CollectionUtils.isEmpty(orderSerialByTransactionIds)){
+                        table.setOrderId(orderSerialByTransactionIds.get(table.getTransactionId()));
+                    }
+                }
                 tables.add(table);
             }
         }

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/TransactionItemTable.java

@@ -32,4 +32,5 @@ public class TransactionItemTable extends BaseTable {
     private String minedInBlockHeight;
     private String feeAmount;
     private String feeAmountUnit;
+    private String orderId;
 }