龚成明 2 жил өмнө
parent
commit
242a6bda6b

+ 2 - 2
src/main/java/modules/address/token/TokenService.java

@@ -40,7 +40,7 @@ public class TokenService {
 		return Db.template("address.findByChainId", TableUtil.getTableName(Token.class), chainId).paginate(pageNumber, pageSize).getList();
 	}
 	
-	public String findSymbolByChainIdAndHash(int chainId, String hash) {
-		return Db.template("token.findSymbolByChainIdAndHash", chainId, hash).queryStr();
+	public Record findTokenByChainIdAndHash(int chainId, String hash) {
+		return Db.template("token.findTokenByChainIdAndHash", chainId, hash).findFirst();
 	}
 }

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

@@ -1,6 +1,6 @@
-#查询token的symbol
-#sql("findSymbolByChainIdAndHash")
-select symbol as tokenSymbol
+#查询token的关键信息
+#sql("findTokenByChainIdAndHash")
+select symbol, decimals
 from t_token
 where chainId=#para(0) and hash=#para(1)
 #end

+ 1 - 1
src/main/java/modules/chain/ChainController.java

@@ -46,6 +46,6 @@ public class ChainController extends MyController {
 	}
 	
 	public void getAll() {
-		renderJson(MyRet.ok("find ok").setData(service.getAvailableChain()));
+		renderJson(MyRet.ok("Chain list is found.").setData(service.getAvailableChain()));
 	}
 }

+ 7 - 6
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) {
-			putTokenSymbol(transfer, chainId, transfer.getStr("token"));
+			putTokenInfo(transfer, chainId, transfer.getStr("token"));
 			putNameToTransferByKey(transfer, "from", chainId, transfer.getStr("from"));
 			putNameToTransferByKey(transfer, "to", chainId, transfer.getStr("to"));
 		}
@@ -39,11 +39,12 @@ 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 putTokenInfo(Record transfer, int chainId, String hash) {
+		// 搜索token的信息
+		Record token = tokenService.findTokenByChainIdAndHash(chainId, hash);
+		if (token != null) {
+			transfer.put("tokenSymbol", token.getStr("symbol"));
+			transfer.put("tokenDecimals", token.getInt("decimals"));
 		}
 	}