From 5bf271bdaee169546ec97e583cd049160bbfc756 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 06 Aug 2020 17:52:52 +0800
Subject: [PATCH] 20200806 代码提交
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 8180bf1..5a23cb7 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
@@ -35,6 +35,7 @@
import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitInfoDao;
import com.xcong.excoin.modules.documentary.dto.CancelDocumentaryOrderSetDto;
import com.xcong.excoin.modules.documentary.dto.DocumentaryOrderSetDto;
+import com.xcong.excoin.modules.documentary.dto.FollowFollowerNoticeDto;
import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto;
import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;
import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;
@@ -455,7 +456,7 @@
FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
if (traderInfoEntity != null) {
- return Result.fail("交易员不能进行跟单");
+ return Result.fail(MessageSourceUtils.getString("documentary_service_0014"));
}
FollowFollowerSettingEntity isExistSetting = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
@@ -649,6 +650,14 @@
List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
+ }
+
+ //合约不能持仓
+ Map<String, Object> contractHoldColumnMap = new HashMap<>();
+ contractHoldColumnMap.put("member_id", memberId);
+ List<ContractHoldOrderEntity> contractHoldOrderEntitys = contractHoldOrderDao.selectByMap(contractHoldColumnMap);
+ if(CollUtil.isNotEmpty(contractHoldOrderEntitys)) {
+ return Result.fail(MessageSourceUtils.getString("documentary_service_0013"));
}
Map<String, Object> columnMap = new HashMap<>();
@@ -997,21 +1006,25 @@
}
@Override
- public Result getFollowFollowerNoticeList() {
+ public Result getFollowFollowerNoticeList(FollowFollowerNoticeDto followFollowerNoticeDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
List<FollowFollowerNoticeVo> arrayList = new ArrayList<>();
- Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("member_id", memberId);
- List<FollowFollowerNoticeEntity> selectByMap = followFollowerNoticeDao.selectByMap(columnMap );
- if(CollUtil.isNotEmpty(selectByMap)) {
- for(FollowFollowerNoticeEntity followFollowerNoticeEntity : selectByMap) {
+ Page<FollowFollowerNoticeEntity> page = new Page<>(followFollowerNoticeDto.getPageNum(), followFollowerNoticeDto.getPageSize());
+ FollowFollowerNoticeEntity followFollowerNoticeEntity = new FollowFollowerNoticeEntity();
+ followFollowerNoticeEntity.setMemberId(memberId);
+ IPage<FollowFollowerNoticeEntity> followFollowerNoticelist = followFollowerNoticeDao.selectFollowFollowerNoticePage(page, followFollowerNoticeEntity);
+ List<FollowFollowerNoticeEntity> records = followFollowerNoticelist.getRecords();
+ if(CollUtil.isNotEmpty(records)) {
+ for(FollowFollowerNoticeEntity followFollowerNotice : records) {
FollowFollowerNoticeVo followFollowerNoticeVo = new FollowFollowerNoticeVo();
- String title = followFollowerNoticeEntity.getTitle();
+ String title = followFollowerNotice.getTitle();
followFollowerNoticeVo.setTitle(title);
- String content = followFollowerNoticeEntity.getContent();
+ String content = followFollowerNotice.getContent();
followFollowerNoticeVo.setContent(content);
+ Date createTime = followFollowerNotice.getCreateTime();
+ followFollowerNoticeVo.setCreateTime(createTime);
arrayList.add(followFollowerNoticeVo);
}
}
--
Gitblit v1.9.1