From d4f2d98927d4f60f390f6146435bc370fede19ae Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 04 Aug 2020 16:46:01 +0800
Subject: [PATCH] 20200804 代碼提交
---
src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java | 7 ++-----
src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java | 2 +-
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 7 +++----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
index 4fecaae..9c8c2c0 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
@@ -59,12 +59,9 @@
*/
@ApiOperation(value="交易员设置--进入编辑", notes="交易员设置--进入编辑")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeSetInfoVo.class)})
- @ApiImplicitParams({
- @ApiImplicitParam(name = "tradeId", value = "交易员ID", required = true, dataType = "String", paramType="query")
- })
@GetMapping(value = "/getTradeSetInfo")
- public Result getTradeSetInfo(String tradeId) {
- return documentaryService.getTradeSetInfo(tradeId);
+ public Result getTradeSetInfo() {
+ return documentaryService.getTradeSetInfo();
}
/**
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java b/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java
index 9c9d57a..57ebc62 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java
@@ -49,7 +49,7 @@
public Result beTraderStatus();
- public Result getTradeSetInfo(String tradeId);
+ public Result getTradeSetInfo();
public Result updateTradeSetInfo(@Valid UpdateTradeSetInfoDto updateTradeSetInfoDto);
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 23d2a70..53784bf 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
@@ -647,11 +647,11 @@
}
@Override
- public Result getTradeSetInfo(String tradeId) {
+ public Result getTradeSetInfo() {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
- FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
TradeSetInfoVo tradeSetInfoVo = new TradeSetInfoVo();
String avatar = followTraderInfoEntity.getAvatar();
tradeSetInfoVo.setAvatar(avatar);
@@ -668,12 +668,11 @@
public Result updateTradeSetInfo(@Valid UpdateTradeSetInfoDto updateTradeSetInfoDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
-
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
String avatar = updateTradeSetInfoDto.getAvatar();
String nickname = updateTradeSetInfoDto.getNickname();
String declaration = updateTradeSetInfoDto.getDeclaration();
int isOpen = updateTradeSetInfoDto.getIsOpen();
- FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
followTraderInfoEntity.setAvatar(avatar);
followTraderInfoEntity.setNickname(nickname);
followTraderInfoEntity.setDeclaration(declaration);
--
Gitblit v1.9.1