From dd37f3ad4b49135cd67f33269e9c7ee7596f9f22 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 07 Jun 2024 14:37:25 +0800 Subject: [PATCH] 将监听充值新建一个项目 --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 13 +++++-------- src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 3 +++ src/main/resources/mapper/dapp/DappMemberDao.xml | 6 ++++++ src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java | 3 +-- src/test/java/cc/mrbird/febs/TreeTest.java | 3 ++- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java index 8d31cec..8428892 100644 --- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java +++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java @@ -1,8 +1,6 @@ package cc.mrbird.febs.dapp.mapper; -import cc.mrbird.febs.dapp.dto.TeamListDto; import cc.mrbird.febs.dapp.entity.DappMemberEntity; -import cc.mrbird.febs.dapp.vo.TeamListVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -40,6 +38,7 @@ List<DappMemberEntity> selectMakerAddress(); int updateMemberActive(); + int updateMemberActiveV2(@Param("memberId") Long memberId); DappMemberEntity selectNewestDirectMember(@Param("inviteId") String inviteId); 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 f3196b4..e1299bf 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 @@ -194,6 +194,9 @@ // 更改状态为已同步 fundFlow.setStatus(2); dappFundFlowDao.updateById(fundFlow); + //激动用户 + fromMember.setActiveStatus(1); + dappMemberDao.updateById(fromMember); //生成业绩数 chainProducer.sendAchieveTreeMsg(fundFlow.getMemberId()); //分发手续费给节点 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 39d23d7..fdb56c3 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 @@ -1,18 +1,13 @@ package cc.mrbird.febs.dapp.service.impl; -import cc.mrbird.febs.common.contants.AppContants; import cc.mrbird.febs.common.utils.LoginUserUtil; import cc.mrbird.febs.common.utils.RedisUtils; -import cc.mrbird.febs.common.utils.SpringContextUtil; -import cc.mrbird.febs.dapp.chain.ChainEnum; -import cc.mrbird.febs.dapp.chain.ChainService; import cc.mrbird.febs.dapp.dto.SystemDto; import cc.mrbird.febs.dapp.entity.*; import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum; import cc.mrbird.febs.dapp.mapper.*; import cc.mrbird.febs.dapp.service.DappSystemService; import cc.mrbird.febs.dapp.service.DappWalletService; -import cc.mrbird.febs.rabbit.producer.ChainProducer; import cc.mrbird.febs.tree.MatrixTree; import cc.mrbird.febs.tree.MemberNode; import cc.mrbird.febs.tree.TreeConstants; @@ -27,7 +22,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; +import java.util.Date; +import java.util.List; /** * @author @@ -103,8 +99,9 @@ dappAchieveMemberTreeDao.insert(achieveMemberTree); // 激活用户状态 - member.setActiveStatus(1); - dappMemberDao.updateById(member); +// member.setActiveStatus(1); +// dappMemberDao.updateById(member); +// dappMemberDao.updateMemberActiveV2(member.getId()); putIntoProfit(memberId, 2); if (parentNode == null) { diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml index d4c663f..fd75699 100644 --- a/src/main/resources/mapper/dapp/DappMemberDao.xml +++ b/src/main/resources/mapper/dapp/DappMemberDao.xml @@ -129,6 +129,12 @@ where active_status = 1 </update> + <update id="updateMemberActiveV2"> + update dapp_member + set active_status = 1 + where id = #{memberId} + </update> + <select id="selectNewestDirectMember" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity"> select * from dapp_member where referer_id=#{inviteId} and active_status=1 diff --git a/src/test/java/cc/mrbird/febs/TreeTest.java b/src/test/java/cc/mrbird/febs/TreeTest.java index 9bdeab9..c676c4c 100644 --- a/src/test/java/cc/mrbird/febs/TreeTest.java +++ b/src/test/java/cc/mrbird/febs/TreeTest.java @@ -45,7 +45,8 @@ @Test public void resetMatrix() { - dappSystemService.resetMatrix(); + dappSystemService.achieveTree(Long.parseLong("133")); +// dappSystemService.resetMatrix(); // dappAchieveMemberTreeDao.emptyTable(); } -- Gitblit v1.9.1