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

Helius

2020-08-04 74d3712317f0596e5d424a00239c7c3742db78a5

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

@@ -37,6 +37,7 @@
import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;

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

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

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

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

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

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

@@ -52,6 +53,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.TradeSetInfoVo;

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

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

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

@@ -134,12 +136,10 @@
                 Long memberId = user.getId();

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

                 if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {

                    FollowTraderProfitInfoVo.setDocumentaaryType(1);

                    FollowTraderProfitInfoVo.setDocumentaaryType(followFollowerProfitEntity.getIsFollow());

                 }else {

                    FollowTraderProfitInfoVo.setDocumentaaryType(2);

                 }

              }else {

                 FollowTraderProfitInfoVo.setDocumentaaryType(2);

                     FollowTraderProfitInfoVo.setDocumentaaryType(2);

                  }

              }

              Long traderId = FollowTraderProfitInfoVo.getTraderId();

              FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);

@@ -394,6 +394,8 @@
            myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);

            BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();

              myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));



            myFollowTraderInfoVo.setTradeId(tradeId);

              myFollowOrderVos.add(myFollowTraderInfoVo);

           }

      }

@@ -475,12 +477,11 @@
            followFollowerProfitDao.insert(followFollowerProfitEntity);

         }

      } else {

         FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();

         followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());

         followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());

         followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());

         followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());

         followFollowerSettingDao.updateById(followFollowerSettingEntity);

         isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());

         isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());

         isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());

         isExistSetting.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());

         followFollowerSettingDao.updateById(isExistSetting);

      }

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

   }

@@ -535,7 +536,7 @@
        FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId,traderId);

        followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);

        followFollowerProfitDao.updateById(followFollowerProfitEntity);

      return null;

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

   }



   @Override

@@ -644,6 +645,42 @@
      }

      return Result.ok(traderStatusVo);

   }



   @Override

   public Result getTradeSetInfo(String tradeId) {

      //获取用户ID

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

        
        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

        TradeSetInfoVo tradeSetInfoVo = new TradeSetInfoVo();

        String avatar = followTraderInfoEntity.getAvatar();

        tradeSetInfoVo.setAvatar(avatar);

        String nickname = followTraderInfoEntity.getNickname();

        tradeSetInfoVo.setNickname(nickname);

        String declaration = followTraderInfoEntity.getDeclaration();

        tradeSetInfoVo.setDeclaration(declaration);

        Integer isOpen = followTraderInfoEntity.getIsOpen();

        tradeSetInfoVo.setIsOpen(isOpen);

      return Result.ok(tradeSetInfoVo);

   }



   @Override

   public Result updateTradeSetInfo(@Valid UpdateTradeSetInfoDto updateTradeSetInfoDto) {

      //获取用户ID

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

        
        String avatar = updateTradeSetInfoDto.getAvatar();

        String nickname = updateTradeSetInfoDto.getNickname();

        String declaration = updateTradeSetInfoDto.getDeclaration();

        int isOpen = updateTradeSetInfoDto.getIsOpen();

        FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();

        followTraderInfoEntity.setAvatar(avatar);

        followTraderInfoEntity.setNickname(nickname);

        followTraderInfoEntity.setDeclaration(declaration);

        followTraderInfoEntity.setIsOpen(isOpen);

        followTraderInfoDao.updateById(followTraderInfoEntity);

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

   }