Merge remote-tracking branch 'origin/whole_new' into whole_new

zainali5120

2021-03-14 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f

 src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java

@@ -7,14 +7,16 @@
import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.RestController;



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.FollowFollowerNoticeDto;

import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto;

import com.xcong.excoin.modules.documentary.dto.FollowTraderProfitInfoDto;

import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;

import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;

import com.xcong.excoin.modules.documentary.dto.MyFollowTraderInfoDto;

@@ -22,15 +24,21 @@
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.DocumentaryOrderSetStateVo;

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;

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;



import io.swagger.annotations.Api;

import io.swagger.annotations.ApiImplicitParam;

import io.swagger.annotations.ApiImplicitParams;

import io.swagger.annotations.ApiOperation;

import io.swagger.annotations.ApiParam;

import io.swagger.annotations.ApiResponse;

import io.swagger.annotations.ApiResponses;

import lombok.extern.slf4j.Slf4j;

@@ -38,7 +46,7 @@
@RestController

@Slf4j

@RequestMapping(value = "/api/documentary")

@Api(value = "MemberQuickBuySaleController", tags = "跟单")

@Api(value = "DocumentaryController", tags = "跟单---跟随者")

public class DocumentaryController {

   

   @Resource

@@ -47,11 +55,21 @@
   /**

    *  获取用户类型是否是交易员

    */

   @ApiOperation(value="获取用户类型是否是交易员", notes="获取用户类型是否是交易员")

   @ApiOperation(value="获取用户是否是交易员", notes="获取用户是否是交易员")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})

   @GetMapping(value = "/getMemberIsTradeInfo")

   public Result  getMemberIsTradeInfo() {

   @GetMapping(value = "/getMemberIsTrader")

   public Result  getMemberIsTrader() {

      return documentaryService.getMemberIsTradeInfo();

   }

	
   /**

    *  通知消息

    */

   @ApiOperation(value="通知消息", notes="通知消息")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowFollowerNoticeVo.class)})

   @PostMapping(value = "/getFollowFollowerNoticeList")

   public Result  getFollowFollowerNoticeList(@RequestBody @Valid FollowFollowerNoticeDto followFollowerNoticeDto) {

      return documentaryService.getFollowFollowerNoticeList(followFollowerNoticeDto);

   }

   

   /**

@@ -60,8 +78,18 @@
   @ApiOperation(value="交易员列表", notes="交易员列表")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowTraderProfitInfoVo.class)})

   @PostMapping(value = "/getFollowTraderProfitInfo")

   public Result  getFollowTraderProfitInfo(@RequestBody @Valid RecordsPageDto recordsPageDto) {

   public Result  getFollowTraderProfitInfo(@RequestBody @Valid FollowTraderProfitInfoDto recordsPageDto) {

      return documentaryService.getFollowTraderProfitInfo(recordsPageDto);

   }

	
   /**

    *  交易员详情---头部

    */

   @ApiOperation(value="交易员详情---头部", notes="交易员详情---头部")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowTraderProfitInfoVo.class)})

   @GetMapping(value = "/getFollowTraderProfit")

   public Result  getFollowTraderProfit(@ApiParam(name = "traderId", value = "交易员ID", example = "1") @RequestParam(value = "traderId", required = false) long traderId) {

      return documentaryService.getFollowTraderProfit(traderId);

   }

   

   /**

@@ -69,7 +97,7 @@
    * @return

    */

   @ApiOperation(value="历史带单", notes="历史带单")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = HistoryOrderRecordsVo.class)})

   @PostMapping(value = "/getHistoryOrderRecords")

   public Result  getHistoryOrderRecords(@RequestBody @Valid HistoryOrderRecordsDto historyOrderRecordsDto) {

      return documentaryService.getHistoryOrderRecords(historyOrderRecordsDto);

@@ -139,11 +167,23 @@
   }

   

   /**

    *  跟单---跟单设置

    *  跟单---跟单设置--是否已跟单

    */

   @ApiOperation(value="跟单---跟单设置", notes="跟单---跟单设置")

   @PostMapping(value = "/getDocumentaryOrderSet")

   public Result  getDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {

   @ApiOperation(value="跟单---跟单设置--是否已跟单", notes="跟单---跟单设置--是否已跟单")

   @ApiImplicitParams({

      @ApiImplicitParam(name = "tradeId", value = "交易员ID", required = true, dataType = "String", paramType="query")

   })

   @GetMapping(value = "/getDocumentaryOrderSetState")

   public Result  getDocumentaryOrderSetState(String tradeId) {

      return documentaryService.getDocumentaryOrderSetState(tradeId);

   }

	
   /**

    *  跟单---跟单设置--新增跟单

    */

   @ApiOperation(value="跟单---跟单设置--新增跟单", notes="跟单---跟单设置--新增跟单")

   @PostMapping(value = "/addDocumentaryOrderSet")

   public Result  addDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {

      return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto);

   }

   

@@ -152,9 +192,12 @@
    */

   @ApiOperation(value="跟单---跟单设置--进入编辑", notes="跟单---跟单设置--进入编辑")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = DocumentaryOrderSetInfoVo.class)})

   @ApiImplicitParams({

      @ApiImplicitParam(name = "tradeId", value = "交易员ID", required = true, dataType = "String", paramType="query")

   })

   @GetMapping(value = "/getDocumentaryOrderSetInfo")

   public Result  getDocumentaryOrderSetInfo() {

      return documentaryService.getDocumentaryOrderSetInfo();

   public Result  getDocumentaryOrderSetInfo(String tradeId) {

      return documentaryService.getDocumentaryOrderSetInfo(tradeId);

   }

   

   /**