From 3ae668287cf4d592e95c9783a404dff881b433d9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Jun 2022 15:46:00 +0800
Subject: [PATCH] fix some problem
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 10 +--
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 6 ++
src/main/java/cc/mrbird/febs/job/ChainListenerJob.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 31 ++++------
src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java | 37 +++++++++--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 9 +++
src/main/resources/application-dev.yml | 3
src/main/resources/application-test.yml | 3
src/main/java/cc/mrbird/febs/dapp/dto/TeamListDto.java | 20 ++++++
src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java | 26 ++++++++
10 files changed, 112 insertions(+), 35 deletions(-)
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 0b2b353..3c597fb 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -1,12 +1,11 @@
package cc.mrbird.febs.dapp.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.dapp.dto.RecordInPageDto;
-import cc.mrbird.febs.dapp.dto.SystemDto;
-import cc.mrbird.febs.dapp.dto.TransferDto;
-import cc.mrbird.febs.dapp.dto.WalletOperateDto;
+import cc.mrbird.febs.dapp.dto.*;
+import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
+import cc.mrbird.febs.dapp.vo.TeamListVo;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -30,6 +29,7 @@
private final DappWalletService dappWalletService;
private final DappSystemService dappSystemService;
+ private final DappMemberService dappMemberService;
@ApiOperation(value = "获取账户信息接口", notes = "获取账号信息接口")
@ApiResponses({
@@ -40,20 +40,6 @@
WalletInfoVo walletInfoVo = dappWalletService.walletInfo();
return new FebsResponse().success().data(walletInfoVo);
}
-
-// @ApiOperation(value = "兑换接口", notes = "兑换")
-// @PostMapping(value = "/change")
-// public FebsResponse change(@RequestBody WalletOperateDto walletOperateDto) {
-// dappWalletService.change(walletOperateDto);
-// return new FebsResponse().success().message("兑换成功");
-// }
-
-// @ApiOperation(value = "提现接口", notes = "提现接口")
-// @PostMapping(value = "/withdraw")
-// public FebsResponse withdraw(@RequestBody WalletOperateDto walletOperateDto) {
-// dappWalletService.withdraw(walletOperateDto);
-// return new FebsResponse().success().message("申请成功, 等待审核");
-// }
@ApiOperation(value = "转账", notes = "转账")
@PostMapping(value = "/transfer")
@@ -82,4 +68,13 @@
public FebsResponse system() {
return new FebsResponse().success().data(dappSystemService.system());
}
+
+ @ApiOperation(value = "我的团队", notes = "我的团队")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
+ })
+ @PostMapping(value = "/team")
+ public FebsResponse team(@RequestBody TeamListDto teamListDto) {
+ return new FebsResponse().success().data(dappMemberService.findTeamList(teamListDto));
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/TeamListDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/TeamListDto.java
new file mode 100644
index 0000000..15f18f0
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/TeamListDto.java
@@ -0,0 +1,20 @@
+package cc.mrbird.febs.dapp.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2022-06-06
+ **/
+@Data
+@ApiModel(value = "TeamListDto", description = "我的团队接收参数类")
+public class TeamListDto {
+
+ @ApiModelProperty(value = "页码", example = "1")
+ private Integer pageNum;
+
+ @ApiModelProperty(value = "每页数量", example = "10")
+ private Integer pageSize;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index 3f61eee..9fb9b58 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -4,11 +4,15 @@
import cc.mrbird.febs.dapp.dto.ApproveDto;
import cc.mrbird.febs.dapp.dto.ConnectDto;
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
+import cc.mrbird.febs.dapp.dto.TeamListDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
+import cc.mrbird.febs.dapp.vo.TeamLIstVo;
+import cc.mrbird.febs.dapp.vo.TeamListVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
import java.util.Map;
public interface DappMemberService extends IService<DappMemberEntity> {
@@ -38,4 +42,6 @@
DappMemberEntity insertMember(String address, String refererId);
DappMemberEntity insertMember(String address, String refererId, String chainType, String accountType);
+
+ List<TeamListVo> findTeamList(TeamListDto teamListDto);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
index 32c165d..79c3c4e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
@@ -9,10 +9,15 @@
import cc.mrbird.febs.dapp.chain.EthUsdtContract;
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.entity.DappOnlineTransferEntity;
import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
import cc.mrbird.febs.dapp.mapper.DappMemberDao;
+import cc.mrbird.febs.dapp.mapper.DappOnlineTransferDao;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.service.DappSystemService;
+import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,6 +28,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.Map;
@Service
public class BscCoinContractEvent implements ContractEventService {
@@ -39,7 +46,14 @@
@Resource
private RedisUtils redisUtils;
- private final String ADDRESS = "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25";
+ @Autowired
+ private DappSystemService dappSystemService;
+
+ @Resource
+ private DappOnlineTransferDao dappOnlineTransferDao;
+
+ @Resource
+ private ChainProducer chainProducer;
public static void main(String[] args) {
System.out.println(Numeric.toBigInt("0x12e4e85"));
@@ -68,7 +82,7 @@
}
// 如果转账对象地址不为源池地址，则创建用户
- if (!e.to.equals(ADDRESS)) {
+ if (!e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress())) {
DappMemberEntity toMember = dappMemberDao.selectByAddress(e.to, null);
if (toMember == null) {
toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
@@ -76,24 +90,31 @@
}
// 卖币
- if (e.to.equals(ADDRESS)) {
+ if (e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress())) {
BigInteger tokens = e.tokens;
BigDecimal amount = BigDecimal.valueOf(tokens.intValue()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
DappFundFlowEntity fundFlow = dappFundFlowDao.selectByFromHash(e.log.getTransactionHash(), 1);
BigDecimal newPrice = fundFlow.getNewestPrice();
BigDecimal transferAmount = amount.multiply(newPrice);
+
// 更改状态为已同步
fundFlow.setStatus(2);
fundFlow.setTargetAmount(transferAmount);
dappFundFlowDao.updateById(fundFlow);
- // TODO 划点分配
+ // 划点分配
+ dappSystemService.tradeProfitDistribute(fundFlow.getId());
- // TODO 自动转账
-// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(e.from, transferAmount);
-// fundFlow.setToHash(hash);
-// dappFundFlowDao.updateById(fundFlow);
+ DappOnlineTransferEntity record = new DappOnlineTransferEntity(e.from, transferAmount, fundFlow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), "USDT", fundFlow.getId().toString());
+ dappOnlineTransferDao.insert(record);
+
+ Map<String, String> map = new HashMap<>();
+ map.put("batchNo", fundFlow.getId().toString());
+ map.put("type", "flow");
+
+ // 发送转账消息
+ chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
}
}
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 9e447f9..5421971 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
@@ -13,9 +13,11 @@
import cc.mrbird.febs.dapp.dto.ApproveDto;
import cc.mrbird.febs.dapp.dto.ConnectDto;
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
+import cc.mrbird.febs.dapp.dto.TeamListDto;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.vo.TeamListVo;
import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -28,6 +30,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -311,4 +314,10 @@
return member;
}
+
+ @Override
+ public List<TeamListVo> findTeamList(TeamListDto teamListDto) {
+
+ return new ArrayList<>();
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index f235f25..e19fcc2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -145,23 +145,19 @@
BigDecimal nodeAmount = distrbAmount.subtract(techAmount);
log.info("总分发金额:{}, 技术:{}, 节点:{}", distrbAmount, techAmount, nodeAmount);
-
- BigDecimal preNode = slipSetting.getNodeProp().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
- log.info("每份:{}", preNode);
int i = 1;
for (DappMemberEntity parent : parents) {
BigDecimal balance = instance.balanceOf(parent.getAddress());
log.info("地址:{}, 余额:{}", parent.getAddress(), balance);
- // 若地址持币少了指定数量 或者 不为创始节点，则不参与节点滑点
- if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 0 || parent.getNodeType() == 2) {
+ // 若地址持币少了指定数量
+ if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 0) {
return;
}
DataDictionaryCustom distribDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_DISTRIBUTE_PROP, String.valueOf(i));
- BigDecimal total = new BigDecimal(distribDic.getValue()).multiply(preNode);
+ BigDecimal total = distrbAmount.multiply(new BigDecimal(distribDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-// instance.transfer(parent.getAddress(), total);
DappOnlineTransferEntity distribRecord = new DappOnlineTransferEntity(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), "TFC", fundflow.getId().toString());
dappOnlineTransferDao.insert(distribRecord);
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java
new file mode 100644
index 0000000..3bfa2d2
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java
@@ -0,0 +1,26 @@
+package cc.mrbird.febs.dapp.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * @author wzy
+ * @date 2022-06-06
+ **/
+@Data
+@ApiModel(value = "TeamLIstVo", description = "团队列表接口返回参数类")
+public class TeamListVo {
+
+ private String address;
+
+ private Integer count;
+
+ private BigDecimal coinCount;
+
+ public BigDecimal getCoinCount() {
+ return coinCount.setScale(2, RoundingMode.HALF_DOWN);
+ }
+}
diff --git a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
index a12e001..4a25c8a 100644
--- a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
+++ b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.dapp.chain.ContractEventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@
@Slf4j
@Component
+@ConditionalOnProperty(prefix = "system", name = "chain-listener", havingValue = "true")
public class ChainListenerJob {
@Autowired
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 47f4a84..1b0fee8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -49,4 +49,5 @@
publisher-confirm-type: correlated
system:
- online-transfer: false
\ No newline at end of file
+ online-transfer: false
+ chain-listener: false
\ No newline at end of file
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index e42dc25..6682654 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -49,4 +49,5 @@
publisher-confirm-type: correlated
system:
- online-transfer: true
\ No newline at end of file
+ online-transfer: true
+ chain-listener: true
\ No newline at end of file
--
Gitblit v1.9.1