20200731 代码提交

xiaoyong931011

2020-07-31 291cb342a5ffab8d75052d2fe682e81764772614

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -10,6 +10,7 @@
import javax.annotation.Resource;

import javax.validation.Valid;



import org.apache.http.impl.NoConnectionReuseStrategy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -254,6 +255,14 @@
           if(CollUtil.isNotEmpty(records)) {

              for(ContractOrderEntity contractOrderEntity : records) {

                 MyFollowOrderVo myFollowOrderVo = new MyFollowOrderVo();

                 //获取交易员信息

               Long orderId = contractOrderEntity.getId();

               FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectHistoryOneByorderId(orderId);

               Long tradeId = FollowFollowerOrderRelation.getTradeId();

               FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

               String nickname = followTraderInfoEntity.getNickname();

               myFollowOrderVo.setNickname(nickname);

        			
                 String symbol = contractOrderEntity.getSymbol();

                 myFollowOrderVo.setSymbol(symbol);

                 int orderType = contractOrderEntity.getOrderType();

@@ -301,7 +310,7 @@
               MyFollowOrderVo myFollowOrderVo = new MyFollowOrderVo();

               //获取交易员信息

               Long orderId = contractHoldOrderEntity.getId();

               FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectOneByorderIdandMemberId(orderId,memberId);

               FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectNowOneByorderId(orderId);

               Long tradeId = FollowFollowerOrderRelation.getTradeId();

               FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

               String nickname = followTraderInfoEntity.getNickname();

@@ -365,9 +374,7 @@
   public Result getMyFollowTraderInfo(@Valid MyFollowTraderInfoDto myFollowTraderInfoDto) {

      //获取用户ID

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

        
        Page<MyFollowTraderInfoVo> result = new Page<>();

        List<MyFollowTraderInfoVo> myFollowOrderVos = result.getRecords();

        List<MyFollowTraderInfoVo> myFollowOrderVos = new ArrayList<>();

        

        Page<FollowFollowerProfitEntity> page = new Page<>(myFollowTraderInfoDto.getPageNum(), myFollowTraderInfoDto.getPageSize());

      IPage<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectFollowFollowerProfitEntitys(page, memberId);

@@ -389,7 +396,7 @@
              myFollowOrderVos.add(myFollowTraderInfoVo);

           }

      }

      return Result.ok(result);

      return Result.ok(myFollowOrderVos);

   }



   @Override

@@ -462,14 +469,14 @@
   }



   @Override

   public Result getDocumentaryOrderSetInfo() {

   public Result getDocumentaryOrderSetInfo(String tradeId) {

      //获取用户ID

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

        DocumentaryOrderSetInfoVo documentaryOrderSetInfoVo = new DocumentaryOrderSetInfoVo();

        long parseLong = Long.parseLong(tradeId);

        //获取【跟随者设置】数据

        FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectDocumentaryOrderSetInfoBymemberId(memberId);

        Long tradeId = followFollowerSettingEntity.getTradeId();

        documentaryOrderSetInfoVo.setTraderId(tradeId);

        FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);

        documentaryOrderSetInfoVo.setTraderId(parseLong);

        

        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

        String avatar = followTraderInfoEntity.getAvatar();

@@ -489,7 +496,6 @@
        

        Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();

        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);

        
        

      return Result.ok(documentaryOrderSetInfoVo);

   }

@@ -551,7 +557,7 @@
        MemberEntity memberEntity = memberDao.selectById(memberId);

        Integer certifyStatus = memberEntity.getCertifyStatus();

        if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {

           return Result.ok(MessageSourceUtils.getString("member_controller_0009"));

           return Result.fail(MessageSourceUtils.getString("member_controller_0009"));

        }

        //新增【交易员信息表】数据

        FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();