From 6c29204c6a4afed0eb476c92bb4f464c88cde3a9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 18:43:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java | 4 ++
src/main/java/cc/mrbird/febs/common/utils/RedisUtils.java | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 27 ++++++-------
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 9 ++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 6 +++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 2
src/main/java/cc/mrbird/febs/dapp/dto/TransferDto.java | 23 +++++++++++
7 files changed, 56 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/utils/RedisUtils.java b/src/main/java/cc/mrbird/febs/common/utils/RedisUtils.java
index 1ef5240..c2bcfab 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/RedisUtils.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/RedisUtils.java
@@ -195,7 +195,7 @@
* @param map 对应多个键值
* @return true 成功 false 失败
*/
- public boolean hmset(String key, Map<String, Object> map) {
+ public boolean hmset(String key, Map<Object, Object> map) {
try {
redisTemplate.opsForHash().putAll(key, map);
return true;
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index d06927a..d9a052f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.dapp.dto.RecordInPageDto;
+import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.dto.WalletOperateDto;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
@@ -43,7 +44,7 @@
// dappWalletService.change(walletOperateDto);
// return new FebsResponse().success().message("兑换成功");
// }
-//
+
// @ApiOperation(value = "提现接口", notes = "提现接口")
// @PostMapping(value = "/withdraw")
// public FebsResponse withdraw(@RequestBody WalletOperateDto walletOperateDto) {
@@ -51,6 +52,12 @@
// return new FebsResponse().success().message("申请成功, 等待审核");
// }
+ @ApiOperation(value = "转账", notes = "转账")
+ @PostMapping(value = "/transfer")
+ public FebsResponse transfer(@RequestBody TransferDto transferDto) {
+ return null;
+ }
+
@ApiOperation(value = "记录列表", notes = "记录列表")
@PostMapping(value = "/recordInPage")
public FebsResponse recordInPage(@RequestBody RecordInPageDto recordInPageDto) {
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/TransferDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/TransferDto.java
new file mode 100644
index 0000000..0c4c4d7
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/TransferDto.java
@@ -0,0 +1,23 @@
+package cc.mrbird.febs.dapp.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2022-05-27
+ **/
+@Data
+@ApiModel(value = "TransferDto", description = "转账接口参数类")
+public class TransferDto {
+
+ @ApiModelProperty(value = "1-买入 2-卖出", example = "1")
+ private Integer type;
+
+ @ApiModelProperty(value = "交易hash", example = "123")
+ private String txHash;
+
+ @ApiModelProperty(value = "地址", example = "0x123")
+ private String address;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
index 2afb597..1645efa 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.dapp.dto.RecordInPageDto;
+import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.dto.WalletOperateDto;
import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
@@ -30,4 +31,7 @@
IPage<DappWalletMineEntity> walletMineInPage(DappWalletMineEntity walletMine, QueryRequest request);
IPage<DappAccountMoneyChangeEntity> accountMoneyChangeInPage(DappAccountMoneyChangeEntity change, QueryRequest request);
+
+
+ void transfer(TransferDto transferDto);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
index 7b1c321..3fd1bce 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
@@ -43,20 +43,19 @@
fromMember = dappMemberService.insertMember(e.from, null);
}
- BigInteger tokens = e.tokens;
-
- BigDecimal amount = BigDecimal.valueOf(tokens.intValue()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
-
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(fromMember.getId(), amount, 2, null, null, e.log.getTransactionHash());
- dappFundFlowDao.insert(fundFlow);
-
- // TODO price
- BigDecimal newPrice = BigDecimal.valueOf(1);
-
- BigDecimal transferAmount = amount.multiply(newPrice);
- String hash = ChainService.getInstance(ChainEnum.BSC_TFC.name()).transfer(e.from, transferAmount);
- fundFlow.setToHash(hash);
- dappFundFlowDao.updateById(fundFlow);
+// BigInteger tokens = e.tokens;
+// BigDecimal amount = BigDecimal.valueOf(tokens.intValue()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
+//
+// DappFundFlowEntity fundFlow = new DappFundFlowEntity(fromMember.getId(), amount, 2, null, null, e.log.getTransactionHash());
+// dappFundFlowDao.insert(fundFlow);
+//
+// // TODO price
+// BigDecimal newPrice = BigDecimal.valueOf(1);
+//
+// BigDecimal transferAmount = amount.multiply(newPrice);
+// String hash = ChainService.getInstance(ChainEnum.BSC_TFC.name()).transfer(e.from, transferAmount);
+// fundFlow.setToHash(hash);
+// dappFundFlowDao.updateById(fundFlow);
}
}
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index d891f48..7e41717 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -136,7 +136,7 @@
}
keys.put(connectDto.getAddress(), key);
- redisUtils.set(AppContants.REDIS_KEY_SIGN, keys);
+ redisUtils.hmset(AppContants.REDIS_KEY_SIGN, keys);
}
@Override
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index adb19df..802720c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.dto.RecordInPageDto;
+import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.dto.WalletOperateDto;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
@@ -189,4 +190,9 @@
Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
return dappAccountMoneyChangeDao.selectInPage(change, page);
}
+
+ @Override
+ public void transfer(TransferDto transferDto) {
+
+ }
}
--
Gitblit v1.9.1