From 9e6054ca0612a05ec2b698b8a63db7605c600725 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Mar 2021 14:51:08 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 11 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 9948713..2986740 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
@@ -65,6 +65,7 @@
 import com.xcong.excoin.modules.documentary.vo.BeTraderConditionVo;
 import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderInfoVo;
 import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetStateVo;
 import com.xcong.excoin.modules.documentary.vo.FollowFollowerNoticeVo;
 import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;
 import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;
@@ -637,17 +638,17 @@
         long parseLong = Long.parseLong(tradeId);
         
         //只能跟随一个人
-        Map<String, Object> columnMaps = new HashMap<>();
-        columnMaps.put("member_id", memberId);
-        List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
-        if(CollUtil.isNotEmpty(followFollowerSettingEntityAllows)) {
-        	for(FollowFollowerSettingEntity followFollowerSettingEntityAllow : followFollowerSettingEntityAllows) {
-        		Long tradeIdAllow = followFollowerSettingEntityAllow.getTraderId();
-        		if(parseLong != tradeIdAllow) {
-        			return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
-        		}
-        	}
-        }
+//        Map<String, Object> columnMaps = new HashMap<>();
+//        columnMaps.put("member_id", memberId);
+//        List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
+//        if(CollUtil.isNotEmpty(followFollowerSettingEntityAllows)) {
+//        	for(FollowFollowerSettingEntity followFollowerSettingEntityAllow : followFollowerSettingEntityAllows) {
+//        		Long tradeIdAllow = followFollowerSettingEntityAllow.getTraderId();
+//        		if(parseLong != tradeIdAllow) {
+//        			return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
+//        		}
+//        	}
+//        }
         
         //获取【跟随者设置】数据
         FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
@@ -1265,6 +1266,41 @@
 		List<BeTraderConditionVo> beTraderConditionVos = followTraderInfoDao.selectBeTraderCondition(type);
 		return Result.ok(beTraderConditionVos);
 	}
+
+	@Override
+	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;
+        		}
+        	}
+        }
+        
+        DocumentaryOrderSetStateVo documentaryOrderSetStateVo = new DocumentaryOrderSetStateVo();
+//        if(OrderSetState) {
+//        	documentaryOrderSetStateVo.setState(Boolean.TRUE);
+//        }else {
+//        	documentaryOrderSetStateVo.setState(Boolean.FALSE);
+//        }
+
+		if (orderSetState) {
+			return Result.ok("获取成功");
+		} else {
+			return Result.fail("最多跟单一人");
+		}
+	}
 	
 	
 	

--
Gitblit v1.9.1