From e8eccc34b4b1df20e2e81e304073421523894c31 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 30 Jul 2020 10:53:06 +0800
Subject: [PATCH] 20200730 代碼提交
---
src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderProfitInfoDao.java | 2 +-
src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml | 2 +-
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 14 +++++++-------
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 4 ++--
src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java | 2 ++
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
index a804c57..63e8bde 100644
--- a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
+++ b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
@@ -52,6 +52,8 @@
.antMatchers("/api/member/getAppVersionInfo").permitAll()
.antMatchers("/api/orderCoin/searchSymbolResultList").permitAll()
.antMatchers("/api/orderCoin/findCollect").permitAll()
+ .antMatchers("/api/orderCoin/findCollect").permitAll()
+ .antMatchers("/api/documentary/getFollowTraderProfitInfo").permitAll()
.anyRequest().authenticated()
.and().apply(securityConfiguereAdapter());
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
index 81f1bb4..afc32f9 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
@@ -41,7 +41,7 @@
/**
* 获取用户类型是否是交易员
*/
- @ApiOperation(value="getMemberIsTradeInfo", notes="获取用户类型是否是交易员")
+ @ApiOperation(value="获取用户类型是否是交易员", notes="获取用户类型是否是交易员")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})
@GetMapping(value = "/getMemberIsTradeInfo")
public Result getMemberIsTradeInfo() {
@@ -51,7 +51,7 @@
/**
* 交易员列表
*/
- @ApiOperation(value="getFollowTraderProfitInfo", notes="交易员列表")
+ @ApiOperation(value="交易员列表", notes="交易员列表")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})
@PostMapping(value = "/getFollowTraderProfitInfo")
public Result getFollowTraderProfitInfo(@RequestBody @Valid RecordsPageDto recordsPageDto) {
@@ -62,7 +62,7 @@
* 历史带单
* @return
*/
- @ApiOperation(value="getHistoryOrderRecords", notes="历史带单")
+ @ApiOperation(value="历史带单", notes="历史带单")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})
@PostMapping(value = "/getHistoryOrderRecords")
public Result getHistoryOrderRecords(@RequestBody @Valid HistoryOrderRecordsDto historyOrderRecordsDto) {
@@ -73,7 +73,7 @@
* 跟随者
* @return
*/
- @ApiOperation(value="getFollowRecords", notes="跟随者")
+ @ApiOperation(value="跟随者", notes="跟随者")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowRecordsVo.class)})
@PostMapping(value = "/getFollowRecords")
public Result getFollowRecords(@RequestBody @Valid FollowRecordsDto followRecordsDto) {
@@ -83,7 +83,7 @@
/**
* 我的跟单--头部
*/
- @ApiOperation(value="getFollowInfo", notes="我的跟单--头部")
+ @ApiOperation(value="我的跟单--头部", notes="我的跟单--头部")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowInfoVo.class)})
@GetMapping(value = "/getFollowInfo")
public Result getFollowInfo() {
@@ -94,7 +94,7 @@
* 我的跟单--我的跟单
* @return
*/
- @ApiOperation(value="getFollowRecords", notes="我的跟单--我的跟单")
+ @ApiOperation(value="我的跟单--我的跟单", notes="我的跟单--我的跟单")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MyFollowOrderVo.class)})
@PostMapping(value = "/getMyFollowOrderRecords")
public Result getMyFollowOrderRecords(@RequestBody @Valid MyFollowOrderDto myFollowOrderDto) {
@@ -104,7 +104,7 @@
/**
* 我的跟单--我的交易员
*/
- @ApiOperation(value="getMyFollowTraderInfo", notes="我的跟单--我的交易员")
+ @ApiOperation(value="我的跟单--我的交易员", notes="我的跟单--我的交易员")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MyFollowTraderInfoVo.class)})
@PostMapping(value = "/getMyFollowTraderInfo")
public Result getMyFollowTraderInfo(@RequestBody @Valid MyFollowTraderInfoDto myFollowTraderInfoDto) {
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderProfitInfoDao.java b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderProfitInfoDao.java
index c9b52e4..c8fa0a6 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderProfitInfoDao.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderProfitInfoDao.java
@@ -12,7 +12,7 @@
public interface FollowTraderProfitInfoDao extends BaseMapper<FollowTraderProfitInfoEntity> {
IPage<FollowTraderProfitInfoVo> selectFollowTraderProfitInfoEntity(Page<FollowTraderProfitInfoVo> page,
- @Param("record")FollowTraderProfitInfoEntity memberAccountMoneyChange);
+ @Param("record")FollowTraderProfitInfoEntity followTraderProfitInfoEntity);
IPage<HistoryOrderRecordsVo> selectHistoryOrderRecords(Page<HistoryOrderRecordsVo> page,
@Param("memberId")Long memberId);
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 f09d08f..36fb9b9 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
@@ -94,8 +94,8 @@
public Result getFollowTraderProfitInfo(@Valid RecordsPageDto recordsPageDto) {
Page<FollowTraderProfitInfoVo> page = new Page<>(recordsPageDto.getPageNum(), recordsPageDto.getPageSize());
- FollowTraderProfitInfoEntity memberAccountMoneyChange = new FollowTraderProfitInfoEntity();
- IPage<FollowTraderProfitInfoVo> followTraderProfitInfoList = followTraderProfitInfoDao.selectFollowTraderProfitInfoEntity(page, memberAccountMoneyChange);
+ FollowTraderProfitInfoEntity followTraderProfitInfoEntity = new FollowTraderProfitInfoEntity();
+ IPage<FollowTraderProfitInfoVo> followTraderProfitInfoList = followTraderProfitInfoDao.selectFollowTraderProfitInfoEntity(page, followTraderProfitInfoEntity);
List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords();
if(CollUtil.isNotEmpty(followTraderProfitInfoVoList)) {
diff --git a/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml b/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml
index 646912f..ff812a6 100644
--- a/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml
+++ b/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xcong.excoin.modules.documentary.dao.FollowTraderProfitInfoDao">
- <select id="selectFollowTraderProfitInfoEntity" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity">
+ <select id="selectFollowTraderProfitInfoEntity" resultType="com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo">
select * from follow_trader_profit_info
order by id desc
</select>
--
Gitblit v1.9.1