From 6b090477bc4882144114a0fc2b94532e0e87aa0e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 May 2023 11:45:43 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 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 1b93f59..6f82b1f 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
@@ -650,6 +650,17 @@
BigDecimal amountPerk = dappUsdtPerkEntity.getAmount();
amountPerk = amountPerk.add(amount.multiply(new BigDecimal(3)));
dappUsdtPerkEntity.setAmount(amountPerk);
+ //生成一条金本位的三倍额度的资金流水记录
+ DappFundFlowEntity amountPerkFundFlow = new DappFundFlowEntity(
+ memberId,
+ amount.multiply(new BigDecimal(3)),
+ FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode(),
+ 1,
+ BigDecimal.ZERO,
+ null,
+ chergeRecordId);
+ dappFundFlowDao.insert(amountPerkFundFlow);
+
//增加业绩
BigDecimal achieveAmount = dappUsdtPerkEntity.getAchieveAmount();
achieveAmount = achieveAmount.add(amount);
@@ -1496,6 +1507,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 +1581,7 @@
return;
}
//金额
- BigDecimal amount = dappFundFlowEntity.getAmount().setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal amount = dappFundFlowEntity.getAmount().setScale(4,BigDecimal.ROUND_DOWN).negate();
log.info("amount:{}",amount);
if(BigDecimal.ZERO.compareTo(amount) >= 0){
return;
@@ -1708,11 +1720,15 @@
);
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();
+ if(ObjectUtil.isEmpty(minRecord)){
+ minRecord = dappAKlineMapper.selectOneByType();
+ }
+ DappAKlineEntity maxRecord = dappAKlineMapper.selectOneByType();
+ List<DappAKlineEntity> dappAKlineEntities = dappAKlineMapper.selectListByIds(minRecord.getId(),maxRecord.getId());
DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
dappAKlineEntity.setType(1);
--
Gitblit v1.9.1