modify

Helius

2020-08-03 1608d972140b90b6645e53c177de9bf7929735f6

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

@@ -477,6 +477,7 @@
        long parseLong = Long.parseLong(tradeId);

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

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



        documentaryOrderSetInfoVo.setTraderId(parseLong);

        

        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

@@ -485,7 +486,11 @@
        

        String nickname = followTraderInfoEntity.getNickname();

        documentaryOrderSetInfoVo.setNickname(nickname);

        


      documentaryOrderSetInfoVo.setProfit(followTraderInfoEntity.getProfitRatio());

        if (followFollowerSettingEntity == null) {

           return Result.ok(documentaryOrderSetInfoVo);

      }

        String symbols = followFollowerSettingEntity.getSymbols();

        documentaryOrderSetInfoVo.setSymbols(symbols);

        

@@ -525,11 +530,24 @@
        Long traderId = updateDocumentaryOrderSetDto.getTraderId();

        //更新【跟随者设置】数据

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

        followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());

        followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());

        followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());

        followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());

        followFollowerSettingDao.updateById(followFollowerSettingEntity);

        if (followFollowerSettingEntity == null) {

           FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectById(traderId);

         followFollowerSettingEntity = new FollowFollowerSettingEntity();

         followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());

         followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());

         followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());

         followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());

         followFollowerSettingEntity.setTradeId(traderId);

         followFollowerSettingEntity.setMemberId(memberId);

         followFollowerSettingEntity.setTradeMemberId(traderInfoEntity.getMemberId());

         followFollowerSettingDao.insert(followFollowerSettingEntity);

      } else {

         followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());

         followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());

         followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());

         followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());

         followFollowerSettingDao.updateById(followFollowerSettingEntity);

      }

      

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

   }

@@ -564,8 +582,9 @@
        columnMap.put("member_id", memberId);

      List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);

      if(CollUtil.isNotEmpty(selectByMap)) {

         return Result.fail("submit_repeat");

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

      }



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

        FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();

        followTraderInfoEntity.setMemberId(memberId);