From a7d5859d7f95d27ed1be29c437911a083ab9703a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 06 Aug 2020 11:05:42 +0800
Subject: [PATCH] 20200806 代码提交
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 3b1580c..48b666d 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
@@ -25,6 +25,7 @@
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
+import com.xcong.excoin.modules.documentary.dao.FollowFollowerNoticeDao;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerSettingDao;
@@ -42,6 +43,7 @@
import com.xcong.excoin.modules.documentary.dto.TradeOrderInfoDto;
import com.xcong.excoin.modules.documentary.dto.UpdateDocumentaryOrderSetDto;
import com.xcong.excoin.modules.documentary.dto.UpdateTradeSetInfoDto;
+import com.xcong.excoin.modules.documentary.entity.FollowFollowerNoticeEntity;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity;
@@ -50,6 +52,7 @@
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.FollowFollowerNoticeVo;
import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;
import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;
import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo;
@@ -106,6 +109,8 @@
private FollowFollowerSettingDao followFollowerSettingDao;
@Resource
private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
+
+ private FollowFollowerNoticeDao followFollowerNoticeDao;
@Override
@@ -931,7 +936,7 @@
Long followMemberId = followFollowerProfitEntity.getMemberId();
Long tradeId = followFollowerProfitEntity.getTradeId();
columnMap.put("member_id", followMemberId);
- columnMap.put("trade_id", tradeId);
+ columnMap.put("trader_id", tradeId);
List<FollowFollowerSettingEntity> selectByMap = followFollowerSettingDao.selectByMap(columnMap);
if(CollUtil.isNotEmpty(selectByMap)) {
for(FollowFollowerSettingEntity followFollowerSettingEntity : selectByMap) {
@@ -946,6 +951,29 @@
}
return Result.ok(MessageSourceUtils.getString("member_service_0026"));
}
+
+ @Override
+ public Result getFollowFollowerNoticeList() {
+ //获取用户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) {
+ FollowFollowerNoticeVo followFollowerNoticeVo = new FollowFollowerNoticeVo();
+ String title = followFollowerNoticeEntity.getTitle();
+ followFollowerNoticeVo.setTitle(title);
+ String content = followFollowerNoticeEntity.getContent();
+ followFollowerNoticeVo.setContent(content);
+ arrayList.add(followFollowerNoticeVo);
+ }
+ }
+
+ return Result.ok(arrayList);
+ }
--
Gitblit v1.9.1