龚成明 2 rokov pred
rodič
commit
6344216d92

+ 1 - 1
src/main/java/modules/address/token/token.sqlt

@@ -2,5 +2,5 @@
 #sql("findSymbolByChainIdAndHash")
 select symbol as tokenSymbol
 from t_token
-where t.chainId=#para(0) and t.hash=#para(1)
+where chainId=#para(0) and hash=#para(1)
 #end

+ 9 - 8
src/main/java/modules/tx/transfer/TransferService.java

@@ -31,7 +31,7 @@ public class TransferService {
 		List<Record> transferList = Db.template("transfer.findByChainIdAndHash", table, chainId, hash).find();
 		
 		for (Record transfer : transferList) {
-			putNameToTransferByKey(transfer, "token", chainId, transfer.getStr("token"));
+			putTokenSymbol(transfer, chainId, transfer.getStr("token"));
 			putNameToTransferByKey(transfer, "from", chainId, transfer.getStr("from"));
 			putNameToTransferByKey(transfer, "to", chainId, transfer.getStr("to"));
 		}
@@ -39,6 +39,14 @@ public class TransferService {
 		return transferList;
 	}
 	
+	public void putTokenSymbol(Record transfer, int chainId, String hash) {
+		// 搜索token的symbol
+		String tokenSymbol = tokenService.findSymbolByChainIdAndHash(chainId, hash);
+		if (tokenSymbol != null) {
+			transfer.put("tokenSymbol", tokenSymbol);
+		}
+	}
+	
 	public void putNameToTransferByKey(Record transfer, String key, int chainId, String hash) {
 		// 按优先级索引,QUERY_TABLE_PRIORITY
 		for (String tableName: QUERY_TABLE_PRIORITY) {
@@ -49,13 +57,6 @@ public class TransferService {
 			}
 		}
 		
-		// 按优先级索引,搜索token的symbol
-		String tokenSymbol = tokenService.findSymbolByChainIdAndHash(chainId, hash);
-		if (tokenSymbol != null) {
-			transfer.put(key + "Symbol", tokenSymbol);
-			return;
-		}
-		
 		// 最后查router的name
 		String nameValue = factoryService.findNameByChainIdAndRouter(chainId, hash);
 		if (nameValue != null) transfer.put(key + "Name", nameValue);