Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-14 1b0e20f11a920ba8c0c38e4c8fef58e8fa1fe0d2

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

@@ -488,6 +488,7 @@


           MemberAgentIntoInfoVo memberAgentIntoInfoVo = new MemberAgentIntoInfoVo();

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

           if(CollUtil.isNotEmpty(contractRecordList)) {

           if (ObjectUtil.isNotNull(contractRecordList)) {

               for (MemberAccountMoneyChange memberAccountMoneyChange : contractRecordList) {

                   MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();

@@ -500,6 +501,7 @@
                   arrayList.add(memberAccountMoneyChangeInfoVo);

               }

           }

           }

           memberAgentIntoInfoVo.setMemberAccountMoneyChangeInfoVo(arrayList);

           return Result.ok(memberAgentIntoInfoVo);

   }