From 736d26948492ac036a0e2ec2e5d83c7b764d34ed Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 23 Jul 2020 10:51:26 +0800 Subject: [PATCH] 20200723 代码提交 --- src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 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 7f7a733..d253769 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 @@ -35,6 +35,22 @@ 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); + } + /** + * 当前持仓---列表Test + */ + @GetMapping("contractHoldOrderAloneTest") + public FebsResponse contractHoldOrderAloneTest(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneTestInPage(contractHoldOrderEntity, request)); + return new FebsResponse().success().data(data); + } /** * 账户信息---列表 @@ -46,11 +62,29 @@ } /** + * 账户信息---列表alone + */ + @GetMapping("memberAccountInfoAlone") + public FebsResponse memberAccountInfoAlone(MemberEntity memberEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findmemberAccountInfoAloneListInPage(memberEntity, request)); + return new FebsResponse().success().data(data); + } + + /** * 返佣明细---列表 */ @GetMapping("memberAgentReturnInfo") public FebsResponse memberAgentReturnInfo(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) { 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); } @@ -72,5 +106,30 @@ 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); + } + /** + * 历史委托明细---Test + */ + @GetMapping("historyOrderInfoAloneTest") + public FebsResponse historyOrderInfoAloneTest(ContractOrderEntity contractOrderEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(tradeManageService.findhistoryOrderInfoAloneTestInfoInPage(contractOrderEntity, request)); + return new FebsResponse().success().data(data); + } + } -- Gitblit v1.9.1