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

Helius

2020-08-03 9ed5206dc501d2c6c4af25d80c438a20e038db88

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

@@ -52,6 +52,7 @@
import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo;

import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo;

import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo;

import com.xcong.excoin.modules.documentary.vo.TraderStatusVo;

import com.xcong.excoin.modules.member.dao.MemberDao;

import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;

import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;

@@ -469,14 +470,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();

@@ -496,7 +497,6 @@
        

        Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();

        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);

        
        

      return Result.ok(documentaryOrderSetInfoVo);

   }

@@ -558,8 +558,14 @@
        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"));

        }

        Map<String, Object> columnMap = new HashMap<>();

        columnMap.put("member_id", memberId);

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

      if(CollUtil.isNotEmpty(selectByMap)) {

         return Result.fail("submit_repeat");

      }

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

        FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();

        followTraderInfoEntity.setMemberId(memberId);

@@ -579,6 +585,30 @@
        followTraderInfoDao.insert(followTraderInfoEntity);

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

   }



   @Override

   public Result beTraderStatus() {

      //获取用户ID

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

        MemberEntity memberEntity = memberDao.selectById(memberId);

        
        TraderStatusVo traderStatusVo = new TraderStatusVo();

        Integer isTraer = memberEntity.getIsTrader();

        traderStatusVo.setIsTrader(isTraer);

        
        Map<String, Object> columnMap = new HashMap<>();

        columnMap.put("member_id", memberId);

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

      if(CollUtil.isNotEmpty(selectByMap)) {

         for(FollowTraderInfoEntity followTraderInfoEntity : selectByMap) {

            Integer verifyStatus = followTraderInfoEntity.getVerifyStatus();

            traderStatusVo.setVerifyStatus(verifyStatus);

         }

      }else{

         traderStatusVo.setVerifyStatus(4);

      }

      return Result.ok(traderStatusVo);

   }