modify

Helius

2020-08-06 39143d1ff3ca043efbf8af09624f409ef7bd4b94

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

@@ -25,6 +25,7 @@
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;

import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;

import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;

import com.xcong.excoin.modules.documentary.dao.FollowFollowerNoticeDao;

import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;

import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao;

import com.xcong.excoin.modules.documentary.dao.FollowFollowerSettingDao;

@@ -42,6 +43,7 @@
import com.xcong.excoin.modules.documentary.dto.TradeOrderInfoDto;

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

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

import com.xcong.excoin.modules.documentary.entity.FollowFollowerNoticeEntity;

import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;

import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity;

import com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity;

@@ -50,6 +52,7 @@
import com.xcong.excoin.modules.documentary.service.DocumentaryService;

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

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

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

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

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

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

@@ -106,6 +109,8 @@
    private FollowFollowerSettingDao followFollowerSettingDao;

    @Resource

    private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;

    
    private FollowFollowerNoticeDao followFollowerNoticeDao;

    

   

   @Override

@@ -605,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 {

@@ -633,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);

@@ -643,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)) {

@@ -819,7 +835,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);

            }

@@ -931,7 +947,7 @@
        Long followMemberId = followFollowerProfitEntity.getMemberId();

        Long tradeId = followFollowerProfitEntity.getTradeId();

        columnMap.put("member_id", followMemberId);

        columnMap.put("trade_id", tradeId);

        columnMap.put("trader_id", tradeId);

        List<FollowFollowerSettingEntity> selectByMap = followFollowerSettingDao.selectByMap(columnMap);

        if(CollUtil.isNotEmpty(selectByMap)) {

           for(FollowFollowerSettingEntity followFollowerSettingEntity : selectByMap) {

@@ -946,6 +962,29 @@
      }

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

   }



   @Override

   public Result getFollowFollowerNoticeList() {

      //获取用户ID

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

        List<FollowFollowerNoticeVo> arrayList = new ArrayList<>();

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

        columnMap.put("member_id", memberId);

      List<FollowFollowerNoticeEntity> selectByMap = followFollowerNoticeDao.selectByMap(columnMap );

      if(CollUtil.isNotEmpty(selectByMap)) {

         for(FollowFollowerNoticeEntity followFollowerNoticeEntity : selectByMap) {

            FollowFollowerNoticeVo followFollowerNoticeVo = new FollowFollowerNoticeVo();

            String title = followFollowerNoticeEntity.getTitle();

            followFollowerNoticeVo.setTitle(title);

            String content = followFollowerNoticeEntity.getContent();

            followFollowerNoticeVo.setContent(content);

            arrayList.add(followFollowerNoticeVo);

         }

      }

        
      return Result.ok(arrayList);

   }