From 7c8869bb01261a5321a6ac624e575fe83bc869a6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Mar 2021 10:28:00 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 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 b2857d5..9a30625 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);
@@ -748,6 +749,18 @@
String nickname = followTraderInfoEntity.getNickname();
String declaration = followTraderInfoEntity.getDeclaration();
Integer isAll = followTraderInfoEntity.getIsAll();
+ Integer followNum = followTraderInfoEntity.getFollowNum();
+ //获取当前跟单人数
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("trade_id", traderId);
+ columnMap.put("is_follow", FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ followTraderProfitInfoVo.setFollowNumNow(selectByMap.size());
+ }else {
+ followTraderProfitInfoVo.setFollowNumNow(0);
+ }
+ followTraderProfitInfoVo.setFollowNum(followNum);
followTraderProfitInfoVo.setAvatar(avatar);
followTraderProfitInfoVo.setNickname(nickname);
followTraderProfitInfoVo.setDeclaration(declaration);
@@ -1253,6 +1266,37 @@
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);
+ }
+ return Result.ok(documentaryOrderSetStateVo);
+
+ }
--
Gitblit v1.9.1