From d4f2d98927d4f60f390f6146435bc370fede19ae Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 04 Aug 2020 16:46:01 +0800
Subject: [PATCH] 20200804 代碼提交
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 152 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 109 insertions(+), 43 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 8fdc2c2..53784bf 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
@@ -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);
}
}
@@ -435,37 +437,52 @@
public Result getDocumentaryOrderSet(@Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- //新增【跟随者设置】数据
- FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
- followFollowerSettingEntity.setMemberId(memberId);
- Long traderId = documentaryOrderSetDto.getTraderId();
- followFollowerSettingEntity.setTradeId(traderId);
- FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
- Long traderMemberId = followTraderInfoEntity.getMemberId();
- followFollowerSettingEntity.setTradeMemberId(traderMemberId);
- followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
- followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
- followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
- followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
- followFollowerSettingDao.insert(followFollowerSettingEntity);
- //更新【跟随者收益】数据
- Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("member_id", memberId);
- 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);
- followFollowerProfitEntity.setTradeMemberId(traderMemberId);
- followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
- followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
- followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
- followFollowerProfitDao.insert(followFollowerProfitEntity);
- }
+ Long traderId = documentaryOrderSetDto.getTraderId();
+
+ FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+ if (traderInfoEntity != null) {
+ return Result.fail("交易员不能进行跟单");
+ }
+
+ FollowFollowerSettingEntity isExistSetting = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
+ if (isExistSetting == null) {
+ //新增【跟随者设置】数据
+ FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
+ followFollowerSettingEntity.setMemberId(memberId);
+ followFollowerSettingEntity.setTraderId(traderId);
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
+ Long traderMemberId = followTraderInfoEntity.getMemberId();
+ followFollowerSettingEntity.setTraderMemberId(traderMemberId);
+ followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
+ followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
+ followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
+ followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingDao.insert(followFollowerSettingEntity);
+ //更新【跟随者收益】数据
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ 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);
+ followFollowerProfitEntity.setTradeMemberId(traderMemberId);
+ followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
+ followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
+ followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ followFollowerProfitDao.insert(followFollowerProfitEntity);
+ }
+ } else {
+ 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"));
}
@@ -519,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
@@ -530,11 +547,24 @@
Long traderId = updateDocumentaryOrderSetDto.getTraderId();
//更新【跟随者设置】数据
FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
- followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
- followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
- followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
- followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
- followFollowerSettingDao.updateById(followFollowerSettingEntity);
+ if (followFollowerSettingEntity == null) {
+ FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectById(traderId);
+ followFollowerSettingEntity = new FollowFollowerSettingEntity();
+ followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
+ followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
+ followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
+ followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingEntity.setTraderId(traderId);
+ followFollowerSettingEntity.setMemberId(memberId);
+ followFollowerSettingEntity.setTraderMemberId(traderInfoEntity.getMemberId());
+ followFollowerSettingDao.insert(followFollowerSettingEntity);
+ } else {
+ followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
+ followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
+ followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
+ followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingDao.updateById(followFollowerSettingEntity);
+ }
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@@ -569,8 +599,9 @@
columnMap.put("member_id", memberId);
List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
if(CollUtil.isNotEmpty(selectByMap)) {
- return Result.fail("submit_repeat");
+ return Result.fail(MessageSourceUtils.getString("submit_repeat"));
}
+
//新增【交易员信息表】数据
FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
followTraderInfoEntity.setMemberId(memberId);
@@ -614,6 +645,41 @@
}
return Result.ok(traderStatusVo);
}
+
+ @Override
+ public Result getTradeSetInfo() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+
+ 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();
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+ String avatar = updateTradeSetInfoDto.getAvatar();
+ String nickname = updateTradeSetInfoDto.getNickname();
+ String declaration = updateTradeSetInfoDto.getDeclaration();
+ int isOpen = updateTradeSetInfoDto.getIsOpen();
+ followTraderInfoEntity.setAvatar(avatar);
+ followTraderInfoEntity.setNickname(nickname);
+ followTraderInfoEntity.setDeclaration(declaration);
+ followTraderInfoEntity.setIsOpen(isOpen);
+ followTraderInfoDao.updateById(followTraderInfoEntity);
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ }
--
Gitblit v1.9.1