20200805 代码提交

xiaoyong931011

2020-08-05 6c457e8d113576e17cad24e051c13a746b69e20e

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

@@ -35,6 +35,7 @@
import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;

import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;

import com.xcong.excoin.modules.documentary.dto.MyFollowTraderInfoDto;

import com.xcong.excoin.modules.documentary.dto.OutFollowInfoDto;

import com.xcong.excoin.modules.documentary.dto.TradeFollowInfoDto;

import com.xcong.excoin.modules.documentary.dto.TradeOrderInfoDto;

import com.xcong.excoin.modules.documentary.dto.UpdateDocumentaryOrderSetDto;

@@ -368,7 +369,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);

            }

@@ -874,9 +875,9 @@
               String phone = memberEntity.getPhone();

               String email = memberEntity.getEmail();

               if(StrUtil.isNotEmpty(phone)) {

                  myFollowTraderInfoVo.setAccount(phone);

                  myFollowTraderInfoVo.setNickName(phone);

               }else {

                  myFollowTraderInfoVo.setAccount(email);

                  myFollowTraderInfoVo.setNickName(email);

               }

            }

            

@@ -892,6 +893,20 @@
      }

      return Result.ok(myFollowOrderVos);

   }



   @Override

   @Transactional

   public Result getOutFollowInfo(@Valid OutFollowInfoDto outFollowInfoDto) {

      //获取用户ID

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

        long id = outFollowInfoDto.getId();

        //获取【跟随者收益】

        FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectById(id);

        followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);

        followFollowerProfitDao.updateById(followFollowerProfitEntity);

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

   }