20221021

xiaoyong931011

2022-10-26 2da858edbdda7f3be168f8f736ba2a9094513ef3

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

@@ -68,6 +68,7 @@
    private final DappBankDao dappBankDao;
//    private final DappMemberService dappMemberService;
    private final DappMemberAddressDao dappMemberAddressDao;
    private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;

    private final RedisTemplate<String, Object> redisTemplate;

@@ -207,8 +208,11 @@
    public IPage<DappMemberEntity> selectInPage(DappMemberEntity member, QueryRequest request) {
        Page<DappMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        User currentUser = FebsUtil.getCurrentUser();
        if (currentUser.getDeptId() == null) {
            member.setCurrentUser(currentUser.getUserId());
//        if (currentUser.getDeptId() == null) {
//            member.setCurrentUser(currentUser.getUserId());
//        }
        if(StrUtil.isNotEmpty(currentUser.getDescription())){
            member.setDescription(currentUser.getDescription());
        }
        return dappMemberDao.selectInPage(member, page);
    }
@@ -606,6 +610,10 @@
        int isOnHook = dappMemberEntity.getIsOnHook() == null ? 2 : dappMemberEntity.getIsOnHook();
        memberInfoVo.setIsOnHook(isOnHook);


        BigDecimal totalProfit = igtOnHookPlanOrderDao.selectSumProfitByMemberId(memberId);
        memberInfoVo.setTotalProfit(totalProfit);

        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
        if(ObjectUtil.isEmpty(dappMemberEntity)){
            memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);