From 420efcecbc5b9b17f96b9c0a37d9bc3a5f1afccd Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 06 Nov 2022 17:46:01 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSimulateServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSimulateServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSimulateServiceImpl.java
index e46b59b..600bdfb 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSimulateServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSimulateServiceImpl.java
@@ -37,10 +37,14 @@
@Override
public String generateSimulateData(SimulateDataDto simulateDataDto) {
+ if (!simulateDataDto.getAddress().startsWith("T") && simulateDataDto.getAddress().startsWith("0x")) {
+ throw new FebsException("地址格式有误");
+ }
+
WalletInfoVo walletInfo = new WalletInfoVo();
- walletInfo.setTotalMine(simulateDataDto.getTotalOutput());
- walletInfo.setAvailableMine(simulateDataDto.getRemainOutput());
- walletInfo.setAvailableWallet(simulateDataDto.getBalance());
+// walletInfo.setTotalMine(simulateDataDto.getTotalOutput());
+// walletInfo.setAvailableMine(simulateDataDto.getRemainOutput());
+// walletInfo.setAvailableWallet(simulateDataDto.getBalance());
String changeStr = simulateDataDto.getChange().replaceAll("\\n", "");
List<String> changeList = StrUtil.split(changeStr, ';');
@@ -147,6 +151,7 @@
simulateData.setUserId(currentUser.getUserId());
simulateData.setData(JSONObject.toJSONString(simulateDataVo));
simulateData.setBatchNo(RandomUtil.randomString(32));
+ simulateData.setAddress(simulateDataDto.getAddress());
dappSimulateDataDao.insert(simulateData);
return simulateData.getBatchNo();
}
@@ -158,6 +163,8 @@
throw new FebsException("数据错误");
}
- return JSONObject.parseObject(data.getData(), SimulateDataVo.class);
+ SimulateDataVo simulateDataVo = JSONObject.parseObject(data.getData(), SimulateDataVo.class);
+ simulateDataVo.setAddress(simulateDataVo.getAddress());
+ return simulateDataVo;
}
}
--
Gitblit v1.9.1