| src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-dev.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml | ●●●●● patch | view | raw | blame | history | |
| src/test/java/cc/mrbird/febs/TreeTest.java | ●●●●● patch | view | raw | blame | history |
src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java
@@ -1,6 +1,7 @@ package cc.mrbird.febs.dapp.service; import cc.mrbird.febs.dapp.dto.SystemDto; import cc.mrbird.febs.dapp.entity.DbMemberNode; public interface DappSystemService { @@ -10,6 +11,8 @@ void achieveTreeV2(Long memberId); void memberNodeNext(DbMemberNode dbMemberNodeRoot); /** * 投入收益 * src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -239,7 +239,7 @@ return; } //有，则上级节点出局复投，轮数加1，复投逻辑 memberNodeNext(dbMemberNodeRoot); this.memberNodeNext(dbMemberNodeRoot); }else{//父节点为左节点，那么没人出局 return; } @@ -256,6 +256,7 @@ * 有，则上级节点出局复投，轮数加1，复投逻辑 * @param dbMemberNodeRoot */ @Override public void memberNodeNext(DbMemberNode dbMemberNodeRoot) { log.info("进入复投"); @@ -320,8 +321,6 @@ //如果是第一轮,下一个新团有投入，则产生收益 //复投或者收益的金额 if(1 == countFund){//第一轮 //复投本轮，轮数 +1 futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1); //收益复投(当前的下一个星团没有已投入)，还是收益提出 Integer nextType = type + 1; QueryWrapper<DbMemberNode> nodeQueryWrapper = new QueryWrapper<>(); @@ -334,6 +333,8 @@ }else{ perkSevenTeen(memberId,perkAmount,countFund); } //复投本轮，轮数 +1 futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1); }else{//2-9轮 //复投本轮，轮数 +1 futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1); @@ -421,7 +422,7 @@ return; } memberNodeNext(dbMemberNodeRoot); this.memberNodeNext(dbMemberNodeRoot); } }
@@ -272,7 +272,7 @@ DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 20, 2, null, null); dappFundFlowDao.insert(feeFlow); DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 21, 2, withdrawDto.getFee(), null); DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 21, 1, withdrawDto.getFee(), null); dappFundFlowDao.insert(fundFlow); MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity(); @@ -603,7 +603,10 @@ @Override public FebsResponse agreeWithdraw(Long id) { MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectById(id); QueryWrapper<MemberCoinWithdrawEntity> objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("flow_id",id); MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectOne(objectQueryWrapper); // MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectById(id); if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){ throw new FebsException("刷新页面重试"); } @@ -623,7 +626,10 @@ @Override public FebsResponse disagreeWithdraw(Long id) { MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectById(id); QueryWrapper<MemberCoinWithdrawEntity> objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("flow_id",id); MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectOne(objectQueryWrapper); if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){ throw new FebsException("刷新页面重试"); } src/main/resources/application-dev.yml
@@ -23,14 +23,14 @@ username: ct_test password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://120.27.238.55:3306/db_sdm?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8 url: jdbc:mysql://120.27.238.55:3406/db_sdm?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8 redis: database: 8 # Redis服务器地址 host: 120.27.238.55 # Redis服务器连接端口 port: 6379 port: 6479 # Redis 密码 password: xcong123 lettuce: @@ -58,8 +58,9 @@ publisher-confirm-type: correlated system: charge-transfer: false online-transfer: false chain-listener: false reset-job: false quartz-job: true debug: true quartz-job: false debug: false src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring: profiles: active: chain active: dev thymeleaf: cache: false src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml
@@ -4,7 +4,8 @@ <select id="findMemberWithdrawCoinInPage" resultType="cc.mrbird.febs.dapp.vo.AdminMemberCoinWithdrawVo"> SELECT s.* s.address, m.address FROM member_coin_withdraw s left join dapp_member m on m.id = s.member_id src/test/java/cc/mrbird/febs/TreeTest.java
@@ -8,26 +8,17 @@ **/ @SpringBootTest public class TreeTest { // // @Autowired // DappSystemService dappSystemService; // @Autowired // DbMemberNodeMapper dbMemberNodeMapper; // // @Test // public void matrixTest() { // MatrixTree matrixTree = MatrixTree.getInstance(); // DbMemberNode dbMemberNode = dbMemberNodeMapper.selectById(171L); // // // String refererId = null; // for (int i = 0; i < 11; i++) { // String inviteId = RandomUtil.randomString(6); // if (i == 2) { // refererId = inviteId; // } // MemberNode memberNode = new MemberNode(); // memberNode.setMemberId(Long.parseLong(i + 1 + "")); // memberNode.setInviteId(inviteId); // memberNode.setAddress(RandomUtil.randomString(14)); // memberNode.setRefererId(refererId); // matrixTree.addNode(memberNode); // } // System.out.println(System.currentTimeMillis()); // dappSystemService.memberNodeNext(dbMemberNode); // } // // @Autowired
