From 63399d5c5bc8d1d2b026513ff8aedfef0302d9cc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 10:28:39 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 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 19134e4..249a3e3 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
@@ -52,6 +52,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.TraderStatusVo;
 import com.xcong.excoin.modules.member.dao.MemberDao;
 import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
 import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
@@ -476,6 +477,7 @@
         long parseLong = Long.parseLong(tradeId);
         //获取【跟随者设置】数据
         FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
+
         documentaryOrderSetInfoVo.setTraderId(parseLong);
         
         FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
@@ -484,7 +486,10 @@
         
         String nickname = followTraderInfoEntity.getNickname();
         documentaryOrderSetInfoVo.setNickname(nickname);
-        
+
+        if (followFollowerSettingEntity == null) {
+        	return Result.ok(documentaryOrderSetInfoVo);
+		}
         String symbols = followFollowerSettingEntity.getSymbols();
         documentaryOrderSetInfoVo.setSymbols(symbols);
         
@@ -559,6 +564,12 @@
         if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {
         	return Result.fail(MessageSourceUtils.getString("member_controller_0009"));
         }
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+		List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			return Result.fail("submit_repeat");
+		}
         //新增【交易员信息表】数据
         FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
         followTraderInfoEntity.setMemberId(memberId);
@@ -578,6 +589,30 @@
         followTraderInfoDao.insert(followTraderInfoEntity);
 		return Result.ok(MessageSourceUtils.getString("member_service_0024"));
 	}
+
+	@Override
+	public Result beTraderStatus() {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+        
+        TraderStatusVo traderStatusVo = new TraderStatusVo();
+        Integer isTraer = memberEntity.getIsTrader();
+        traderStatusVo.setIsTrader(isTraer);
+        
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+		List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			for(FollowTraderInfoEntity followTraderInfoEntity : selectByMap) {
+				Integer verifyStatus = followTraderInfoEntity.getVerifyStatus();
+				traderStatusVo.setVerifyStatus(verifyStatus);
+			}
+		}else{
+			traderStatusVo.setVerifyStatus(4);
+		}
+		return Result.ok(traderStatusVo);
+	}
 	
 	
 	

--
Gitblit v1.9.1