From 6444e8ab5afb8cfeba903a857908ea4d5aaf3d9d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 14:26:28 +0800
Subject: [PATCH] 20210304   最大持仓数设置0时,显示为空

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 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 954db79..d1a96e7 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
@@ -60,6 +60,7 @@
 import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity;
 import com.xcong.excoin.modules.documentary.service.DocumentaryService;
+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.FollowFollowerNoticeVo;
@@ -621,7 +622,9 @@
         documentaryOrderSetInfoVo.setFollowCnt(followCnt);
         
         Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();
-        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);
+        if(maxFollowCnt >= 0){
+        	documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);
+		}
         
 		return Result.ok(documentaryOrderSetInfoVo);
 	}
@@ -1131,6 +1134,7 @@
 		}
 		MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberId);
 		if(ObjectUtil.isNotEmpty(memberSettingEntity)) {
+			log.info(memberId + "的消息提醒状态变更");
 			memberSettingEntity.setMessageReminder(0);
 			memberSettingDao.updateById(memberSettingEntity);
 		}
@@ -1158,6 +1162,13 @@
 		}
 		return Result.ok(arrayList);
 	}
+
+	@Override
+	public Result beTraderCondition() {
+		String type = "apply_trader_rule";
+		List<BeTraderConditionVo> beTraderConditionVos = followTraderInfoDao.selectBeTraderCondition(type);
+		return Result.ok(beTraderConditionVos);
+	}
 	
 	
 	

--
Gitblit v1.9.1