From 954125b4e7104d1e29f4f4ac865c582eae9e7b06 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 15 Jul 2022 15:25:07 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 49 ++++++++++++++++++++++++++++++-------------------
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 1 +
src/main/resources/application-dev.yml | 2 +-
3 files changed, 32 insertions(+), 20 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 ef65601..c5ae7ca 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
@@ -34,7 +34,7 @@
import java.util.*;
/**
- * @author
+ * @author
* @date 2022-03-24
**/
@Slf4j
@@ -171,7 +171,8 @@
parents = new ArrayList<>();
} else {
List<String> inviteIds = StrUtil.split(member.getRefererId(), ',');
- parents = dappMemberDao.selectParentsList(inviteIds, 6);;
+ parents = dappMemberDao.selectParentsList(inviteIds, 6);
+ ;
}
DataDictionaryCustom miniHoldCoin = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
@@ -445,7 +446,7 @@
Object o = redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
if (o == null) {
- RedisTransferPoolVo transferPool= new RedisTransferPoolVo();
+ RedisTransferPoolVo transferPool = new RedisTransferPoolVo();
BigDecimal total = basicVol.multiply(volProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
transferPool.setTodayVol(total);
transferPool.setTodayProp(volProp);
@@ -515,8 +516,14 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void idoBuy(DappMemberEntity member, BigDecimal amount) {
DappIdoAssetsEntity idoAssets = dappIdoAssetsDao.selectByMemberId(member.getId());
+ boolean isFirst = false;
+ if (idoAssets.getCoinAmount().compareTo(BigDecimal.ZERO) == 0) {
+ isFirst = true;
+ }
+
BigDecimal count = amount.divide(new BigDecimal(50), 0, RoundingMode.HALF_UP);
BigDecimal coinAmount = new BigDecimal(1000).multiply(count);
idoAssets.setCoinAmount(idoAssets.getCoinAmount().add(coinAmount));
@@ -528,29 +535,33 @@
return;
}
- int box = 0;
- Object parentRecommend = redisUtils.hget(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress());
- if (parentRecommend == null) {
- redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), 1);
- } else {
- int i = (int) parentRecommend;
- // 如果超过10个，则新增一个盲盒，并重置推荐人数
- if (++i == 10) {
- box = 1;
+ int box = 0;
+ // 需要第一次购买，才在推荐中加1
+ if (isFirst) {
+ Object parentRecommend = redisUtils.hget(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress());
+ if (parentRecommend == null) {
redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), 1);
} else {
- redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), i);
+ int i = (int) parentRecommend;
+
+ // 如果超过10个，则新增一个盲盒，并重置推荐人数
+ if (++i == 3) {
+ box = 1;
+ redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), 1);
+ } else {
+ redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), i);
+ }
+ }
+
+ if (box > 0) {
+ DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(parent.getId(), new BigDecimal(box), 5, 2, BigDecimal.ZERO);
+ dappFundFlowDao.insert(boxFundFlow);
}
}
- if (box > 0) {
- DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(parent.getId(), new BigDecimal(box), 5, 2, BigDecimal.ZERO);
- dappFundFlowDao.insert(boxFundFlow);
- }
-
BigDecimal returnCoin = coinAmount.multiply(new BigDecimal(5).divide(new BigDecimal(100), 2, RoundingMode.UP));
- DappIdoAssetsEntity parentIdoAssets = dappIdoAssetsDao.selectById(parent.getId());
+ DappIdoAssetsEntity parentIdoAssets = dappIdoAssetsDao.selectByMemberId(parent.getId());
parentIdoAssets.setBoxCnt(parentIdoAssets.getBoxCnt() + box);
parentIdoAssets.setCoinAmount(parentIdoAssets.getCoinAmount().add(returnCoin));
dappIdoAssetsDao.updateById(parentIdoAssets);
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 c9ae7d1..c151442 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
@@ -276,6 +276,7 @@
new Thread(() -> {
int count = box.getIndex();
while(count > 0) {
+ log.info("卡牌+1");
ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
count--;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 0fed63c..31be489 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -50,5 +50,5 @@
system:
online-transfer: false
- chain-listener: false
+ chain-listener: true
trade-job: false
\ No newline at end of file
--
Gitblit v1.9.1