modify

Helius

2020-08-06 39143d1ff3ca043efbf8af09624f409ef7bd4b94

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

@@ -610,7 +610,7 @@
      FollowTraderProfitInfoVo followTraderProfitInfoVo = followTraderProfitInfoDao.selectOneByMemberId(memberId);

      MemberEntity user = LoginUserUtils.getUser();

      if(ObjectUtil.isNotEmpty(user)) {

         FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);

         FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(user.getId(), traderId);

         if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {

            followTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());

         }else {

@@ -638,6 +638,16 @@
        if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {

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

        }

        
        //不可以处于跟单状态

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

        columnMaps.put("member_id", memberId);

        columnMaps.put("is_follow", 1);

        List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);

        if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {

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

        }

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

        columnMap.put("member_id", memberId);

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

@@ -648,7 +658,8 @@
        //新增【交易员信息表】数据

        FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();

        followTraderInfoEntity.setMemberId(memberId);

        followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);

        followTraderInfoEntity.setProfitRatio(BigDecimal.valueOf(0.1));

//        followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);

        String phone = memberEntity.getPhone();

        String email = memberEntity.getEmail();

        if(StrUtil.isNotEmpty(phone)) {