Merge branch 'whole_new_trc20' into whole_new

Helius

2021-02-24 05c74ca131add20dbcf23dc109e63c21b3e2be29

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

@@ -14,6 +14,7 @@
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.HistoryOrderRecordsDto;

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

@@ -22,6 +23,7 @@
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.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;

@@ -56,6 +58,16 @@
   @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);

   }

   

   /**

@@ -153,11 +165,11 @@
   }

   

   /**

    *  跟单---跟单设置

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

    */

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

   @PostMapping(value = "/getDocumentaryOrderSet")

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

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

   @PostMapping(value = "/addDocumentaryOrderSet")

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

      return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto);

   }