From d2ca8305753f35164f4f0267ff4bcb19316dda75 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 May 2023 16:48:55 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
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 67362f5..9025a82 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
@@ -1496,6 +1496,7 @@
@Override
public void selectAndInsertDics() {
+ selectAndInsertDic(PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getType(),PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getCode(),"0.2","ANDAO互转20%");
selectAndInsertDic(PoolEnum.TRANSFER_A_AUSD_PRICE.getType(),PoolEnum.TRANSFER_A_AUSD_PRICE.getCode(),"0.01","AUSD价格");
selectAndInsertDic(PoolEnum.TRANSFER_A_AUSD_PERCENT.getType(),PoolEnum.TRANSFER_A_AUSD_PERCENT.getCode(),"0.1","买入A，10%的AUSD比例");
selectAndInsertDic(PoolEnum.WALLET_COIN_OUT_PERCENT.getType(),PoolEnum.WALLET_COIN_OUT_PERCENT.getCode(),"0.3","30%回流底池溢价");
@@ -1569,7 +1570,11 @@
return;
}
//金额
- BigDecimal amount = dappFundFlowEntity.getAmount().setScale(4,BigDecimal.ROUND_DOWN);
+ BigDecimal amount = dappFundFlowEntity.getAmount().setScale(4,BigDecimal.ROUND_DOWN).negate();
+ log.info("amount:{}",amount);
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ return;
+ }
Long memberId = dappFundFlowEntity.getMemberId();
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
@@ -1704,11 +1709,12 @@
);
BigDecimal coinAPrice = new BigDecimal(dataDictionaryCustom.getValue());
- DateTime dateTime = DateUtil.offsetHour(DateUtil.date(), -1);
- String format = DateUtil.format(dateTime, "yyyy-MM-dd HH");
- List<String> dataDayStrList = new ArrayList<>();
- dataDayStrList.add(format);
- List<DappAKlineEntity> dappAKlineEntities = dappAKlineMapper.selectListByTypeAndHour(dataDayStrList);
+ /**
+ * 查询出上一条更新的小时数据
+ */
+ DappAKlineEntity minRecord = dappAKlineMapper.selectOneHourByType();
+ DappAKlineEntity maxRecord = dappAKlineMapper.selectOneByType();
+ List<DappAKlineEntity> dappAKlineEntities = dappAKlineMapper.selectListByIds(minRecord.getId(),maxRecord.getId());
DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
dappAKlineEntity.setType(1);
--
Gitblit v1.9.1