fix

wzy

2022-08-27 0e4e3172a8379381edf2f8047243a3a75214e09d

fix

 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java

@@ -84,8 +84,8 @@
            @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
    })
    @PostMapping(value = "/team")
    public FebsResponse team(@RequestBody TeamListDto teamListDto) {
        return new FebsResponse().success().data(dappMemberService.findTeamList(teamListDto));
    public FebsResponse team() {
        return new FebsResponse().success().data(dappMemberService.findTeamList());
    }

    @PostMapping(value = "/logout")

 src/main/java/cc/mrbird/febs/dapp/dto/RecordInPageDto.java

@@ -18,6 +18,6 @@
    @ApiModelProperty(value = "每页数量")
    private Integer pageSize = 10;

    @ApiModelProperty(value = "类型", example = "1-认购 2-提现 3-矩阵收益 4-直推收益")
    @ApiModelProperty(value = "类型", example = "1-买入 2-矩阵收益 3-直推收益 4-保险池 5-提现")
    private Integer type;
}

 src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java

@@ -47,7 +47,7 @@
    private BigDecimal amount;

    /**
     * 类型 1-买入 2-矩阵收益 3-直推收益 4-保险池
     * 类型 1-买入 2-矩阵收益 3-直推收益 4-保险池 5-提现
     */
    private Integer type;


 src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.web3j.abi.datatypes.Int;

import java.math.BigDecimal;

@@ -77,4 +78,9 @@
     * 1-是 2-否
     */
    private Integer makerType;

    /**
     * 出局次数
     */
    private Integer outCnt;
}

 src/main/java/cc/mrbird/febs/dapp/mapper/DappFundFlowDao.java

@@ -22,4 +22,6 @@
    List<DappFundFlowEntity> selectFundFlowListByAddress(@Param("address") String address, @Param("status") Integer status);

    Map<String, BigDecimal> selectAmountTotalByType(@Param("memberId") Long memberId);

    BigDecimal selectProfitAmountByMemberId(@Param("memberId") Long memberId);
}

 src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java

@@ -42,5 +42,5 @@

    DappMemberEntity insertMember(String address, String refererId, String chainType, String accountType);

    TeamListVo findTeamList(TeamListDto teamListDto);
    TeamListVo findTeamList();
}

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java

@@ -331,7 +331,7 @@
    }

    @Override
    public TeamListVo findTeamList(TeamListDto teamListDto) {
    public TeamListVo findTeamList() {
        DappMemberEntity member = LoginUserUtil.getAppUser();

        DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1);
@@ -353,6 +353,7 @@
        for (DappAchieveMemberTreeEntity childNode : childNodes) {
            list.add(buildTeamMatrix(childNode));
        }
        teamListVo.setChildren(list);
        return teamListVo;
    }
}

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java

@@ -753,6 +753,9 @@
        DappMemberEntity member = dappMemberDao.selectById(memberId);
        DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());

        member.setOutCnt(member.getOutCnt() + 1);
        dappMemberDao.updateById(member);

        if (parent != null) {
            BigDecimal directProfit = new BigDecimal("100").multiply(new BigDecimal("0.15"));
            dappWalletService.updateWalletCoinWithLock(directProfit, parent.getId());

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java

@@ -69,8 +69,8 @@
        walletInfo.setInviteId(member.getInviteId());
        walletInfo.setBalance(walletCoin.getAvailableAmount());
        walletInfo.setHasBuy(memberInfo.getActiveStatus());
        walletInfo.setOutCnt(1);
        walletInfo.setProfit(BigDecimal.TEN);
        walletInfo.setOutCnt(memberInfo.getOutCnt());
        walletInfo.setProfit(dappFundFlowDao.selectProfitAmountByMemberId(member.getId()));
        return walletInfo;
    }


 src/main/java/cc/mrbird/febs/rabbit/QueueConstants.java

@@ -5,7 +5,6 @@
 * @date 2022-05-31
 **/
public class QueueConstants {

    public static final String ONLINE_TRANSFER = "queue_sdm_online_transfer";
    public static final String DISTRIB_PROFIT = "queue_sdm_distrib_profit";
    public static final String USER_BUY_REWARD = "queue_sdm_user_buy_reward";

 src/main/java/cc/mrbird/febs/rabbit/QueueEnum.java

@@ -10,7 +10,8 @@
    DISTRIB_PROFIT("exchange_sdm_distrib_profit", "route_key_sdm_distrib_profit", "queue_sdm_distrib_profit"),
    USER_BUY_REWARD("exchange_sdm_user_buy_reward", "route_key_sdm_user_buy_reward", "queue_sdm_user_buy_reward"),
    NFT_BOX("exchange_sdm_nft_box", "route_key_sdm_nft_box", "queue_sdm_nft_box"),
    ACHIEVE_TREE("exchange_sdm_achieve_tree", "route_key_sdm_achieve_tree", "queue_sdm_achieve_tree");
    ACHIEVE_TREE("exchange_sdm_achieve_tree", "route_key_sdm_achieve_tree", "queue_sdm_achieve_tree"),
    WITHDRAW_FEE("exchange_withdraw_fee", "route_key_withdraw_fee", "queue_withdraw_fee");

    private String exchange;


 src/main/java/cc/mrbird/febs/rabbit/RabbitConfiguration.java

@@ -111,4 +111,22 @@
        return BindingBuilder.bind(achieveTreeQueue()).to(achieveTreeExchange()).with(QueueEnum.ACHIEVE_TREE.getRoute());
    }
    // === 业绩树 end ===


    // === 提现手续费 start ===
    @Bean
    public DirectExchange withdrawFeeExchange() {
        return new DirectExchange(QueueEnum.WITHDRAW_FEE.getExchange());
    }

    @Bean
    public Queue withdrawFeeQueue() {
        return new Queue(QueueEnum.WITHDRAW_FEE.getQueue());
    }

    @Bean
    public Binding withdrawFeeBind() {
        return BindingBuilder.bind(withdrawFeeQueue()).to(withdrawFeeExchange()).with(QueueEnum.WITHDRAW_FEE.getRoute());
    }
    // === 提现手续费 end ===
}

 src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java

@@ -63,4 +63,13 @@
        CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString());
        rabbitTemplate.convertAndSend(QueueEnum.ACHIEVE_TREE.getExchange(), QueueEnum.ACHIEVE_TREE.getRoute(), id, correlationData);
    }

    /**
     * 消费者在tfc应用
     *
     * @param data
     */
    public void sendTfcFee(String data) {
        log.info("发送提现手续费消息:{}", data);
    }
}

 src/main/resources/mapper/dapp/DappAchieveMemberTreeDao.xml

@@ -21,7 +21,7 @@
    </select>

    <select id="selectMatrixChildNode" resultType="cc.mrbird.febs.dapp.entity.DappAchieveMemberTreeEntity">
        select a.*, b.invite_id, b.address from dapp_achieve_member_tree a, , dapp_member b
        select a.*, b.invite_id, b.address from dapp_achieve_member_tree a, dapp_member b
        where a.top_node=#{topNode} and a.parent_node=#{parentNode} and a.tree_node=b.id
    </select>


 src/main/resources/mapper/dapp/DappFundFlowDao.xml

@@ -22,7 +22,7 @@
                and a.member_id=#{record.memberId}
            </if>
        </where>
        order by a.create_time desc
        order by a.create_time desc, a.id desc
    </select>

    <select id="selectListForMemberAndDay" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
@@ -63,4 +63,9 @@
                 group by type
            ) a
    </select>

    <select id="selectProfitAmountByMemberId" resultType="java.math.BigDecimal">
        select ifnull(sum(amount), 0) from dapp_fund_flow
        where member_id=#{memberId} and type in (2,3)
    </select>
</mapper>