20200806 代码提交

xiaoyong931011

2020-08-06 568d033e0cca67b0ceb8d4106850c97dbd36f373

 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);

@@ -824,7 +834,7 @@
               

               // 回报率

               BigDecimal returnRate = rewardRatio.divide(contractHoldOrderEntity.getBondAmount().subtract(contractHoldOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);

               myFollowOrderVo.setRewardRatio(returnRate.setScale(2, BigDecimal.ROUND_DOWN));

               myFollowOrderVo.setRewardRatio(returnRate.setScale(4, BigDecimal.ROUND_DOWN));

               

               myFollowOrderVos.add(myFollowOrderVo);

            }