From 09de95ab5415f1511191f4e68c3bd74e4ab7f09d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 05 Mar 2021 15:29:13 +0800
Subject: [PATCH] 20210305 满员状态
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 27 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 fa96ee8..df506ea 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
@@ -176,9 +176,27 @@
}else {
FollowTraderProfitInfoVo.setDocumentaryType(2);
}
+
}
Long traderId = FollowTraderProfitInfoVo.getTraderId();
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);
+
+ //获取当前跟单人数
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("trader_id", traderId);
+ List<FollowFollowerSettingEntity> selectByMap = followFollowerSettingDao.selectByMap(columnMap);
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ Integer followNum = followTraderInfoEntity.getFollowNum();
+ int size = selectByMap.size();
+ if(followNum > size) {
+ FollowTraderProfitInfoVo.setIsActualAll(2);
+ }else {
+ FollowTraderProfitInfoVo.setIsActualAll(1);
+ }
+ }else {
+ FollowTraderProfitInfoVo.setIsActualAll(2);
+ }
+
String avatar = followTraderInfoEntity.getAvatar();
FollowTraderProfitInfoVo.setAvatar(avatar);
String nickname = followTraderInfoEntity.getNickname();
@@ -941,6 +959,18 @@
//获取【交易员信息表】数据
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
if(ObjectUtil.isNotEmpty(followTraderInfoEntity)) {
+ Integer followNum = followTraderInfoEntity.getFollowNum();
+ //获取当前跟单人数
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("trade_id", followTraderInfoEntity.getId());
+ columnMap.put("is_follow", FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ tradeProfitInfoVo.setFollowNumNow(selectByMap.size());
+ }else {
+ tradeProfitInfoVo.setFollowNumNow(0);
+ }
+ tradeProfitInfoVo.setFollowNum(followNum);
String avatar = followTraderInfoEntity.getAvatar();
tradeProfitInfoVo.setAvatar(avatar);
String nickname = followTraderInfoEntity.getNickname();
@@ -1271,44 +1301,57 @@
public Result getDocumentaryOrderSetState(String tradeId) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- boolean orderSetState = false;
long parseLong = Long.parseLong(tradeId);
- //只能跟随一个人
- Map<String, Object> columnMaps = new HashMap<>();
- columnMaps.put("member_id", memberId);
- List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
- if(CollUtil.isEmpty(followFollowerSettingEntityAllows)) {
- orderSetState = Boolean.TRUE;
- }else {
- if(followFollowerSettingEntityAllows.size() == 1) {
- Long tradeIdAllow = followFollowerSettingEntityAllows.get(0).getTraderId();
- if(parseLong == tradeIdAllow) {
- orderSetState = Boolean.TRUE;
- }
- }
- }
- //交易员判断
- Map<String, Object> columnMapTrader = new HashMap<>();
- columnMapTrader.put("member_id", memberId);
+ //交易员判断
+ Map<String, Object> columnMapTrader = new HashMap<>();
+ columnMapTrader.put("member_id", memberId);
List<FollowTraderInfoEntity> followTraderInfoEntitys = followTraderInfoDao.selectByMap(columnMapTrader);
- //没有审核记录
+
+ //只能跟随一个人
+ Map<String, Object> columnMaps = new HashMap<>();
+ columnMaps.put("member_id", memberId);
+ List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
+
+ //没有交易员审核记录
if(CollUtil.isEmpty(followTraderInfoEntitys)) {
- orderSetState = Boolean.TRUE;
+ //没有跟随记录
+ if(CollUtil.isEmpty(followFollowerSettingEntityAllows)) {
+ return Result.ok("获取成功");
+ }else {
+ //有跟随记录
+ if(followFollowerSettingEntityAllows.size() == 1) {
+ Long tradeIdAllow = followFollowerSettingEntityAllows.get(0).getTraderId();
+ if(parseLong == tradeIdAllow) {
+ return Result.ok("获取成功");
+ }else{
+ return Result.fail("最多跟单一人");
+ }
+ }else{
+ return Result.fail("已经跟随多人，请修改");
+ }
+ }
}else{
Integer verifyStatus = followTraderInfoEntitys.get(0).getVerifyStatus();
if(FollowTraderInfoEntity.VERIFYSTATUS_N == verifyStatus) {
- orderSetState = Boolean.TRUE;
+ if(CollUtil.isEmpty(followFollowerSettingEntityAllows)) {
+ return Result.ok("获取成功");
+ }else {
+ if(followFollowerSettingEntityAllows.size() == 1) {
+ Long tradeIdAllow = followFollowerSettingEntityAllows.get(0).getTraderId();
+ if(parseLong == tradeIdAllow) {
+ return Result.ok("获取成功");
+ }else{
+ return Result.fail("最多跟单一人");
+ }
+ }else{
+ return Result.fail("已经跟随多人，请修改");
+ }
+ }
}else if(FollowTraderInfoEntity.VERIFYSTATUS_Y == verifyStatus){
return Result.fail("交易员不允许跟单");
}else {
return Result.fail("交易员审核中不允许跟单");
}
- }
-
- if (orderSetState) {
- return Result.ok("获取成功");
- } else {
- return Result.fail("最多跟单一人");
}
}
--
Gitblit v1.9.1