From 78c9ce7b49df83a96d4a1ef3932fd772134ab24c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 11:55:31 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java | 4 +-
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 4 +-
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 82 ++++++++++++++++++++++++----------------
3 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
index 16f2b29..8c289da 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
@@ -156,8 +156,8 @@
* 跟单---跟单设置
*/
@ApiOperation(value="跟单---跟单设置", notes="跟单---跟单设置")
- @PostMapping(value = "/getDocumentaryOrderSet")
- public Result getDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
+ @PostMapping(value = "/addDocumentaryOrderSet")
+ public Result addDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto);
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java
index 74e98f3..5678cbf 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java
@@ -35,11 +35,11 @@
/**
* 交易员ID
*/
- private Long tradeId;
+ private Long traderId;
/**
* 交易员会员ID
*/
- private Long tradeMemberId;
+ private Long traderMemberId;
/**
* 跟单合约(多个，且逗号隔开)
*/
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 39ffa37..4f4cbc2 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
@@ -435,37 +435,53 @@
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 {
+ FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
+ followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
+ followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
+ followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
+ followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingDao.updateById(followFollowerSettingEntity);
+ }
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@@ -537,9 +553,9 @@
followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
- followFollowerSettingEntity.setTradeId(traderId);
+ followFollowerSettingEntity.setTraderId(traderId);
followFollowerSettingEntity.setMemberId(memberId);
- followFollowerSettingEntity.setTradeMemberId(traderInfoEntity.getMemberId());
+ followFollowerSettingEntity.setTraderMemberId(traderInfoEntity.getMemberId());
followFollowerSettingDao.insert(followFollowerSettingEntity);
} else {
followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
--
Gitblit v1.9.1