归集修改

gao

2020-07-28 5393820239be024bd8cc6950ea0e17076d4cc21c

 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java

@@ -4,6 +4,7 @@
import java.util.ArrayList;

import java.util.List;

import javax.annotation.Resource;

import javax.validation.Valid;



import com.xcong.excoin.modules.platform.entity.PlatformCnyUsdtExchangeEntity;

import org.springframework.stereotype.Service;

@@ -479,31 +480,34 @@
    }



   @Override

   public Result getWalletAgentIntoRecords() {

   public Result getWalletAgentIntoRecords(RecordsPageDto recordsPageDto) {

           //获取用户ID

           Long memberId = LoginUserUtils.getAppLoginUser().getId();



           List<MemberAccountMoneyChange> contractRecordList =

                   memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(memberId);



           MemberAgentIntoInfoVo memberAgentIntoInfoVo = new MemberAgentIntoInfoVo();

	        
           Page<OrderCoinsDealEntity> page = new Page<>(recordsPageDto.getPageNum(), recordsPageDto.getPageSize());

           MemberAccountMoneyChange memberAccountMoneyChange = new MemberAccountMoneyChange();

           memberAccountMoneyChange.setMemberId(memberId);

           IPage<MemberAccountMoneyChange> list = memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(page, memberAccountMoneyChange);

           List<MemberAccountMoneyChange> contractRecordList = list.getRecords();

           List<MemberAccountMoneyChangeInfoVo> arrayList = new ArrayList<>();

           if(CollUtil.isNotEmpty(contractRecordList)) {

              if (ObjectUtil.isNotNull(contractRecordList)) {

                 for (MemberAccountMoneyChange memberAccountMoneyChange : contractRecordList) {

                 for (MemberAccountMoneyChange memberAccountMoneyChanges : contractRecordList) {

                    MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();

                    memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChange.getAmount());

                    memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChange.getContent());

                    memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());

                    memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());

                    memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());

                    memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());

                    memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChanges.getAmount());

                    memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChanges.getContent());

                    memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChanges.getStatus());

                    memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChanges.getSymbol());

                    memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChanges.getType());

                    memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChanges.getUpdateTime());

                    arrayList.add(memberAccountMoneyChangeInfoVo);

                 }

              }

           }

           memberAgentIntoInfoVo.setMemberAccountMoneyChangeInfoVo(arrayList);

           return Result.ok(memberAgentIntoInfoVo);

           Page<MemberAccountMoneyChangeInfoVo> pageEntityToPageVo = new Page<>();

           pageEntityToPageVo.setRecords(arrayList);

	        
           return Result.ok(pageEntityToPageVo);

   }



}