Helius
2020-07-14 1b0e20f11a920ba8c0c38e4c8fef58e8fa1fe0d2
Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
1 files modified
24 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java 24 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -488,17 +488,19 @@
            MemberAgentIntoInfoVo memberAgentIntoInfoVo = new MemberAgentIntoInfoVo();
            List<MemberAccountMoneyChangeInfoVo> arrayList = new ArrayList<>();
            if (ObjectUtil.isNotNull(contractRecordList)) {
                for (MemberAccountMoneyChange memberAccountMoneyChange : 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());
                    arrayList.add(memberAccountMoneyChangeInfoVo);
                }
            if(CollUtil.isNotEmpty(contractRecordList)) {
                if (ObjectUtil.isNotNull(contractRecordList)) {
                    for (MemberAccountMoneyChange memberAccountMoneyChange : 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());
                        arrayList.add(memberAccountMoneyChangeInfoVo);
                    }
                }
            }
            memberAgentIntoInfoVo.setMemberAccountMoneyChangeInfoVo(arrayList);
            return Result.ok(memberAgentIntoInfoVo);