From 0c89a2588a6b69465e3c065ddea0a02d7c6535f0 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 30 Jul 2020 18:03:22 +0800 Subject: [PATCH] 20200730 代码提交 --- src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 93 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 80 insertions(+), 13 deletions(-) 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..11c7f7c 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 @@ -12,13 +12,20 @@ import com.xcong.excoin.common.response.Result; import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto; import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo; +import com.xcong.excoin.modules.documentary.dto.CancelDocumentaryOrderSetDto; +import com.xcong.excoin.modules.documentary.dto.DocumentaryOrderSetDto; import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto; import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto; import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto; import com.xcong.excoin.modules.documentary.dto.MyFollowTraderInfoDto; +import com.xcong.excoin.modules.documentary.dto.UpdateDocumentaryOrderSetDto; 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.FollowInfoVo; import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo; +import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo; +import com.xcong.excoin.modules.documentary.vo.HistoryOrderRecordsVo; import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo; import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo; import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo; @@ -41,7 +48,7 @@ /** * 获取用户类型是否是交易员 */ - @ApiOperation(value="getMemberIsTradeInfo", notes="获取用户类型是否是交易员") + @ApiOperation(value="获取用户类型是否是交易员", notes="获取用户类型是否是交易员") @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)}) @GetMapping(value = "/getMemberIsTradeInfo") public Result getMemberIsTradeInfo() { @@ -51,8 +58,8 @@ /** * 交易员列表 */ - @ApiOperation(value="getFollowTraderProfitInfo", notes="交易员列表") - @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)}) + @ApiOperation(value="交易员列表", notes="交易员列表") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowTraderProfitInfoVo.class)}) @PostMapping(value = "/getFollowTraderProfitInfo") public Result getFollowTraderProfitInfo(@RequestBody @Valid RecordsPageDto recordsPageDto) { return documentaryService.getFollowTraderProfitInfo(recordsPageDto); @@ -62,8 +69,8 @@ * 历史带单 * @return */ - @ApiOperation(value="getHistoryOrderRecords", notes="历史带单") - @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)}) + @ApiOperation(value="历史带单", notes="历史带单") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = HistoryOrderRecordsVo.class)}) @PostMapping(value = "/getHistoryOrderRecords") public Result getHistoryOrderRecords(@RequestBody @Valid HistoryOrderRecordsDto historyOrderRecordsDto) { return documentaryService.getHistoryOrderRecords(historyOrderRecordsDto); @@ -73,7 +80,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 +90,7 @@ /** * 我的跟单--头部 */ - @ApiOperation(value="getFollowInfo", notes="我的跟单--头部") + @ApiOperation(value="我的跟单--头部", notes="我的跟单--头部") @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowInfoVo.class)}) @GetMapping(value = "/getFollowInfo") public Result getFollowInfo() { @@ -91,26 +98,86 @@ } /** - * 我的跟单--我的跟单 + * 我的跟单--我的跟单--当前跟单 * @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) { - return documentaryService.getMyFollowOrderRecords(myFollowOrderDto); + @PostMapping(value = "/getNowMyFollowOrderRecords") + public Result getNowMyFollowOrderRecords(@RequestBody @Valid MyFollowOrderDto myFollowOrderDto) { + return documentaryService.getNowMyFollowOrderRecords(myFollowOrderDto); + } + + /** + * 我的跟单--我的跟单--历史跟单 + * @return + */ + @ApiOperation(value="我的跟单--我的跟单--历史跟单", notes="我的跟单--我的跟单--历史跟单") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MyFollowOrderVo.class)}) + @PostMapping(value = "/getHistoryMyFollowOrderRecords") + public Result getHistoryMyFollowOrderRecords(@RequestBody @Valid MyFollowOrderDto myFollowOrderDto) { + return documentaryService.getHistoryMyFollowOrderRecords(myFollowOrderDto); } /** * 我的跟单--我的交易员 */ - @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) { return documentaryService.getMyFollowTraderInfo(myFollowTraderInfoDto); } + /** + * 跟单---跟单设置--跟单合约 + */ + @ApiOperation(value="跟单---跟单设置--跟单合约", notes="跟单---跟单设置--跟单合约") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = DocumentaryOrderInfoVo.class)}) + @GetMapping(value = "/getDocumentaryOrderInfo") + public Result getDocumentaryOrderInfo() { + return documentaryService.getDocumentaryOrderInfo(); + } + + /** + * 跟单---跟单设置 + */ + @ApiOperation(value="跟单---跟单设置", notes="跟单---跟单设置") + @PostMapping(value = "/getDocumentaryOrderSet") + public Result getDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) { + return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto); + } + + /** + * 跟单---跟单设置--进入编辑 + */ + @ApiOperation(value="跟单---跟单设置--进入编辑", notes="跟单---跟单设置--进入编辑") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = DocumentaryOrderSetInfoVo.class)}) + @GetMapping(value = "/getDocumentaryOrderSetInfo") + public Result getDocumentaryOrderSetInfo() { + return documentaryService.getDocumentaryOrderSetInfo(); + } + + /** + * 跟单---跟单设置--取消跟随 + */ + @ApiOperation(value="跟单---跟单设置--取消跟随", notes="跟单---跟单设置--取消跟随") + @PostMapping(value = "/cancelDocumentaryOrderSetInfo") + public Result cancelDocumentaryOrderSetInfo(@RequestBody @Valid CancelDocumentaryOrderSetDto cancelDocumentaryOrderSetDto) { + return documentaryService.cancelDocumentaryOrderSetInfo(cancelDocumentaryOrderSetDto); + } + + /** + * 跟单---跟单设置--更新 + */ + @ApiOperation(value="跟单---跟单设置--更新", notes="跟单---跟单设置--更新") + @PostMapping(value = "/updateDocumentaryOrderSetInfo") + public Result updateDocumentaryOrderSetInfo(@RequestBody @Valid UpdateDocumentaryOrderSetDto updateDocumentaryOrderSetDto) { + return documentaryService.updateDocumentaryOrderSetInfo(updateDocumentaryOrderSetDto); + } + + + -- Gitblit v1.9.1