From 394a93c64be8d057a2c3553aaca0045d08010f6a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Jul 2020 17:48:59 +0800
Subject: [PATCH] 20200720 代码提交
---
src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 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..8ab6521 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,15 @@
Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoInPage(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 +80,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