From c69f78fa82c93d958171e9c550a031bdf1dc1c98 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 21 Jul 2020 13:14:47 +0800 Subject: [PATCH] 20200721 代码提交 --- src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java index 3848095..d714900 100644 --- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java +++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java @@ -12,6 +12,7 @@ import com.xcong.excoin.common.entity.QueryRequest; import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity; import com.xcong.excoin.modules.member.entity.MemberEntity; +import com.xcong.excoin.modules.trademanage.entity.AgentReturnEntity; import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity; import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity; import com.xcong.excoin.modules.trademanage.service.TradeManageService; @@ -34,6 +35,14 @@ Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderListInPage(contractHoldOrderEntity, request)); return new FebsResponse().success().data(data); } + /** + * 当前持仓---列表alone + */ + @GetMapping("contractHoldOrderAlone") + public FebsResponse contractHoldOrderAlone(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneInPage(contractHoldOrderEntity, request)); + return new FebsResponse().success().data(data); + } /** * 账户信息---列表 @@ -52,6 +61,24 @@ Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoInPage(memberAccountMoneyChangeEntity, request)); return new FebsResponse().success().data(data); } + + /** + * 返佣明细---alone + */ + @GetMapping("memberAgentReturnInfoAlone") + public FebsResponse memberAgentReturnInfoAlone(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneInPage(memberAccountMoneyChangeEntity, request)); + return new FebsResponse().success().data(data); + } + + /** + * 返佣总明细---列表 + */ + @GetMapping("memberAgentReturnInfos") + public FebsResponse memberAgentReturnInfos(AgentReturnEntity agentReturnEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfosInPage(agentReturnEntity, request)); + return new FebsResponse().success().data(data); + } /** * 历史委托明细---列表 @@ -62,5 +89,22 @@ return new FebsResponse().success().data(data); } + /** + * 全部历史委托明细---列表 + */ + @GetMapping("historyOrderInfoAll") + public FebsResponse historyOrderInfoAll(ContractOrderEntity contractOrderEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findMemberHistoryOrderAllInfoInPage(contractOrderEntity, request)); + return new FebsResponse().success().data(data); + } + /** + * 历史委托明细---alone + */ + @GetMapping("historyOrderInfoAlone") + public FebsResponse historyOrderInfoAlone(ContractOrderEntity contractOrderEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneInfoInPage(contractOrderEntity, request)); + return new FebsResponse().success().data(data); + } + } -- Gitblit v1.9.1