From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001 From: zainali5120 <512061637@qq.com> Date: Sun, 14 Mar 2021 20:42:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new --- src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java b/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java index f29bdcf..86015d8 100644 --- a/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java +++ b/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java @@ -2,13 +2,17 @@ import javax.validation.Valid; +import org.springframework.web.bind.annotation.RequestBody; + import com.baomidou.mybatisplus.extension.service.IService; import com.xcong.excoin.common.response.Result; import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto; +import com.xcong.excoin.modules.documentary.dto.BeTraderDto; 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; @@ -23,7 +27,7 @@ public Result getMemberIsTradeInfo(); - public Result getFollowTraderProfitInfo(@Valid RecordsPageDto recordsPageDto); + public Result getFollowTraderProfitInfo(@Valid FollowTraderProfitInfoDto recordsPageDto); public Result getHistoryOrderRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto); @@ -49,7 +53,7 @@ public Result getFollowTraderProfit(long traderId); - public Result beTrader(); + public Result beTrader(@Valid BeTraderDto beTraderDto); public Result beTraderStatus(); @@ -71,5 +75,9 @@ public Result getTradeSetLabelInfo(); + public Result beTraderCondition(); + + public Result getDocumentaryOrderSetState(String tradeId); + } -- Gitblit v1.9.1