From ad4774eff562d52b2677cfbcf8e55b8506d57891 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 10:34:26 +0800
Subject: [PATCH] conflict
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index f2199a3..7da7099 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -10,6 +10,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import com.xcong.excoin.modules.documentary.common.NoticeConstant;
+import com.xcong.excoin.utils.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +37,8 @@
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;
import com.xcong.excoin.modules.documentary.dto.UpdateTradeSetInfoDto;
@@ -53,6 +57,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.TradeFollowInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeHistoryOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeProfitInfoVo;
@@ -65,10 +70,6 @@
import com.xcong.excoin.modules.member.entity.MemberLevelRateEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
-import com.xcong.excoin.utils.CacheSettingUtils;
-import com.xcong.excoin.utils.CoinTypeConvert;
-import com.xcong.excoin.utils.MessageSourceUtils;
-import com.xcong.excoin.utils.RedisUtils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -139,9 +140,9 @@
Long memberId = user.getId();
FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
- FollowTraderProfitInfoVo.setDocumentaaryType(followFollowerProfitEntity.getIsFollow());
+ FollowTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());
}else {
- FollowTraderProfitInfoVo.setDocumentaaryType(2);
+ FollowTraderProfitInfoVo.setDocumentaryType(2);
}
}
Long traderId = FollowTraderProfitInfoVo.getTraderId();
@@ -366,7 +367,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);
}
@@ -466,6 +467,7 @@
//更新【跟随者收益】数据
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("member_id", memberId);
+ columnMap.put("trade_id", traderId);
List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
if (CollUtil.isNotEmpty(selectByMap)) {
FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
@@ -482,6 +484,28 @@
followFollowerProfitDao.insert(followFollowerProfitEntity);
}
} else {
+ //更新【跟随者收益】数据
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ columnMap.put("trade_id", traderId);
+ List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+ if (CollUtil.isNotEmpty(selectByMap)) {
+ FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
+ followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ followFollowerProfitDao.updateById(followFollowerProfitEntity);
+ }else {
+ FollowFollowerProfitEntity followFollowerProfitEntity = new FollowFollowerProfitEntity();
+ followFollowerProfitEntity.setMemberId(memberId);
+ followFollowerProfitEntity.setTradeId(traderId);
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
+ Long traderMemberId = followTraderInfoEntity.getMemberId();
+ followFollowerProfitEntity.setTradeMemberId(traderMemberId);
+ followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
+ followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
+ followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ followFollowerProfitDao.insert(followFollowerProfitEntity);
+ }
+
isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());
isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());
isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
@@ -579,6 +603,15 @@
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
Long memberId = followTraderInfoEntity.getMemberId();
FollowTraderProfitInfoVo followTraderProfitInfoVo = followTraderProfitInfoDao.selectOneByMemberId(memberId);
+ MemberEntity user = LoginUserUtils.getUser();
+ if(ObjectUtil.isNotEmpty(user)) {
+ FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
+ if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
+ followTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());
+ }else {
+ followTraderProfitInfoVo.setDocumentaryType(2);
+ }
+ }
String avatar = followTraderInfoEntity.getAvatar();
String nickname = followTraderInfoEntity.getNickname();
String declaration = followTraderInfoEntity.getDeclaration();
@@ -843,6 +876,76 @@
}
return Result.ok(myFollowOrderVos);
}
+
+ @Override
+ public Result getTradeFollowInfo(@Valid TradeFollowInfoDto tradeFollowInfoDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ List<TradeFollowInfoVo> myFollowOrderVos = new ArrayList<>();
+
+ Page<FollowFollowerProfitEntity> page = new Page<>(tradeFollowInfoDto.getPageNum(), tradeFollowInfoDto.getPageSize());
+ IPage<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectTradeFollowerProfitEntitys(page, memberId);
+ List<FollowFollowerProfitEntity> records = followFollowerProfitEntitys.getRecords();
+ if(CollUtil.isNotEmpty(records)) {
+ for(FollowFollowerProfitEntity followFollowerProfitEntity : records) {
+ TradeFollowInfoVo myFollowTraderInfoVo = new TradeFollowInfoVo();
+
+ Long followMemberId = followFollowerProfitEntity.getMemberId();
+ MemberEntity memberEntity = memberDao.selectById(followMemberId);
+ if(ObjectUtil.isNotEmpty(memberEntity)) {
+ String phone = memberEntity.getPhone();
+ String email = memberEntity.getEmail();
+ if(StrUtil.isNotEmpty(phone)) {
+ myFollowTraderInfoVo.setNickname(phone);
+ }else {
+ myFollowTraderInfoVo.setNickname(email);
+ }
+ }
+
+ Long id = followFollowerProfitEntity.getId();
+ myFollowTraderInfoVo.setId(id);
+ BigDecimal totalPrincipal = followFollowerProfitEntity.getTotalPrincipal();
+ myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
+ BigDecimal totalProfit = followFollowerProfitEntity.getTotalProfit();
+ myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
+
+ myFollowOrderVos.add(myFollowTraderInfoVo);
+ }
+ }
+ 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);
+
+ //删除【跟随者设置】
+ Map<String, Object> columnMap = new HashMap<>();
+ Long followMemberId = followFollowerProfitEntity.getMemberId();
+ Long tradeId = followFollowerProfitEntity.getTradeId();
+ columnMap.put("member_id", followMemberId);
+ columnMap.put("trade_id", tradeId);
+ List<FollowFollowerSettingEntity> selectByMap = followFollowerSettingDao.selectByMap(columnMap);
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(FollowFollowerSettingEntity followFollowerSettingEntity : selectByMap) {
+ followFollowerSettingDao.deleteById(followFollowerSettingEntity.getId());
+ }
+ }
+
+ FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+
+ if (traderInfoEntity != null) {
+ LogRecordUtils.insertFollowerNotice(memberId, NoticeConstant.STOP_FOLLOW_TITLE, StrUtil.format(NoticeConstant.STOP_FOLLOW_CONTENT, traderInfoEntity.getNickname()));
+ }
+ return Result.ok(MessageSourceUtils.getString("member_service_0026"));
+ }
--
Gitblit v1.9.1