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

@@ -14,7 +14,9 @@
import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;

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,6 +24,8 @@
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;

@@ -51,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);

   }

   

   /**

@@ -64,7 +78,7 @@
   @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);

   }

   

@@ -153,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);

   }