From 50b2901ecf5aa6ec3823265a51397a37ade2f0d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 22 Mar 2021 14:13:35 +0800
Subject: [PATCH] 20210319 平仓加载中
---
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 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 6941e80..73ed183 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
@@ -5,18 +5,20 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity;
+import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.xcong.excoin.common.annotation.ControllerEndpoint;
import com.xcong.excoin.common.controller.BaseController;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.documentary.dto.FollowTraderInfoDto;
+import com.xcong.excoin.modules.documentary.dto.ModifyProfitRatioDto;
import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
@@ -93,6 +95,16 @@
public FebsResponse traderConfirm(@Valid FollowTraderInfoDto followTraderInfoDto) {
return documentaryService.traderConfirm(followTraderInfoDto);
}
+
+ /**
+ * 交易员收益率修改---确认
+ * @return
+ */
+ @PostMapping("modifyProfitRatio")
+ @ControllerEndpoint(operation = "交易员收益率修改---确认", exceptionMessage = "修改失败")
+ public FebsResponse modifyProfitRatio(@Valid ModifyProfitRatioDto modifyProfitRatioDto) {
+ return documentaryService.modifyProfitRatio(modifyProfitRatioDto);
+ }
/**
* 踢出交易员
@@ -104,6 +116,26 @@
public FebsResponse traderGetOut(@NotNull(message = "{required}") @PathVariable Long id) {
return documentaryService.traderGetOut(id);
}
+ /**
+ * 设置成首页交易员
+ * @param id
+ * @return
+ */
+ @GetMapping("traderGetOn/{id}")
+ @ControllerEndpoint(operation = "设置成首页交易员", exceptionMessage = "设置失败")
+ public FebsResponse traderGetOn(@NotNull(message = "{required}") @PathVariable Long id) {
+ return documentaryService.traderGetOn(id);
+ }
+ /**
+ * 设置成首页交易员---取消
+ * @param id
+ * @return
+ */
+ @GetMapping("traderGetOutFrist/{id}")
+ @ControllerEndpoint(operation = "设置成首页交易员", exceptionMessage = "设置失败")
+ public FebsResponse traderGetOutFrist(@NotNull(message = "{required}") @PathVariable Long id) {
+ return documentaryService.traderGetOutFrist(id);
+ }
/**
* 设置成【满员】状态
@@ -116,4 +148,26 @@
return documentaryService.traderGetFull(id);
}
+ /**
+ * 交易员数据---列表---交易员利润分成
+ */
+ @GetMapping("traderProfitInfo")
+ public FebsResponse traderProfitInfo(FollowTraderProfitInfoEntity followTraderProfitInfoEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(documentaryService.findTraderProfitInfoInfoInPage(followTraderProfitInfoEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 交易员数据---列表---跟单数据详情
+ */
+ @GetMapping("/seeFollowerInfo")
+ public FebsResponse seeFollowerInfo(QueryRequest request, FollowTraderProfitInfoEntity followTraderProfitInfoEntity,Integer parentId) {
+ if(parentId==null){
+ ViewController.idFromMember=0;
+ }
+ followTraderProfitInfoEntity.setId(ViewController.idFromMember);
+ Map<String, Object> dataTable = getDataTable(documentaryService.findlistSeeFollowerInfo(request, followTraderProfitInfoEntity));
+ return new FebsResponse().success().data(dataTable);
+ }
+
}
--
Gitblit v1.9.1