20221020

xiaoyong931011

2022-10-20 14af0f18ab6d0a750e7ba1b5c537c310695ac610

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

@@ -681,7 +681,7 @@
    }

    @Override
    public List<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
    public IPage<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
        Page<ApiAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());

        DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -697,7 +697,7 @@
        }
        dappAccountMoneyChangeEntity.setMemberId(member.getId());
        IPage<ApiAmountChangeListVo> records = dappAccountMoneyChangeDao.selectChangeListInPage(page, dappAccountMoneyChangeEntity);
        return records.getRecords();
        return records;
    }

    @Override
@@ -770,7 +770,7 @@
    }

    @Override
    public FebsResponse myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
    public IPage<ApiMyTeammateInfoListVo> myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<ApiMyTeammateInfoListVo> page = new Page<>(apiMyTeammateInfoDto.getPageNum(), apiMyTeammateInfoDto.getPageSize());
        if(ObjectUtil.isEmpty(apiMyTeammateInfoDto.getInviteId())){
@@ -789,7 +789,7 @@
                }
            }
        }
        return new FebsResponse().success().data(apiMyTeammateInfoListVos);
        return apiMyTeammateInfoListVos;
    }

    @Override
@@ -807,12 +807,12 @@
    }

    @Override
    public FebsResponse findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
    public IPage<ApiMyTeammateAmountChangeListVo> findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<ApiMyTeammateAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());
        apiAmountChangeDto.setInviteId(member.getInviteId());
        IPage<ApiMyTeammateAmountChangeListVo> amountChangeList = dappAccountMoneyChangeDao.selectTeammateChangeListInPage(apiAmountChangeDto,page);
        return new FebsResponse().success().data(amountChangeList);
        return amountChangeList;
    }

    public String generateAsaToken(String token) {