From 620a9fd5a96642612231698e236a218d50b6c221 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 15:35:44 +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 | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 e77cb45..e5168e9 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;
@@ -510,6 +511,15 @@
return Result.fail(MessageSourceUtils.getString("documentary_service_0014"));
}
+ //不可以处于跟单状态
+ Map<String, Object> columnMaps = new HashMap<>();
+ columnMaps.put("member_id", memberId);
+ columnMaps.put("is_follow", 1);
+ List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
+ if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
+ return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
+ }
+
//判断当前用户是否是逐仓模式
MemberEntity selectById2 = memberDao.selectById(memberId);
Integer contractPositionType = selectById2.getContractPositionType();
@@ -595,6 +605,7 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
DocumentaryOrderSetInfoVo documentaryOrderSetInfoVo = new DocumentaryOrderSetInfoVo();
long parseLong = Long.parseLong(tradeId);
+
//获取【跟随者设置】数据
FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
@@ -621,8 +632,11 @@
documentaryOrderSetInfoVo.setFollowCnt(followCnt);
Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();
- documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);
-
+ if(maxFollowCnt > 0){
+ documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt.toString());
+ }
+ documentaryOrderSetInfoVo.setMaxFollowCnt(null);
+ log.info(memberId + "-最大持仓张数-"+maxFollowCnt.toString());
return Result.ok(documentaryOrderSetInfoVo);
}
@@ -1069,6 +1083,18 @@
long id = outFollowInfoDto.getId();
//获取【跟随者收益】
FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectById(id);
+
+ //当前有跟单合约不允许移除
+ //获取【跟随者-订单关联表】
+ Map<String, Object> selectColumnMap = new HashMap<>();
+ selectColumnMap.put("member_id", followFollowerProfitEntity.getMemberId());
+ selectColumnMap.put("trade_member_id", memberId);
+ selectColumnMap.put("order_type", FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
+ List<FollowFollowerOrderRelationEntity> followFollowerOrderRelationEntitys = followFollowerOrderRelationDao.selectByMap(selectColumnMap);
+ if(CollUtil.isNotEmpty(followFollowerOrderRelationEntitys)) {
+ return Result.fail(MessageSourceUtils.getString("documentary_service_0019"));
+ }
+
followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);
followFollowerProfitDao.updateById(followFollowerProfitEntity);
@@ -1119,6 +1145,7 @@
}
MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberId);
if(ObjectUtil.isNotEmpty(memberSettingEntity)) {
+ log.info(memberId + "的消息提醒状态变更");
memberSettingEntity.setMessageReminder(0);
memberSettingDao.updateById(memberSettingEntity);
}
@@ -1146,6 +1173,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