From 9beb428f807920b0dd646edbed822313c47961c6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Apr 2021 14:45:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/agent
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index bb5d759..7934a0d 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -47,6 +47,35 @@
return new FebsResponse().success().data(data);
}
+ @GetMapping("getHistoryDocumentaryList")
+ public FebsResponse getHistoryDocumentaryList(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+ User user = getCurrentUser();
+ if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
+ contractOrderEntity.setRefererIds(FebsConstant.DEFAULT_REFERER_ID);
+ } else {
+ contractOrderEntity.setRefererIds(user.getInviteId());
+ }
+ Map<String, Object> data = getDataTable(contractOrderService.findHistoryDocumentaryListInPage(contractOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ @GetMapping("getHistoryDocumentaryprofitList")
+ public FebsResponse getHistoryDocumentaryprofitList(ContractOrderEntity contractOrderEntity, QueryRequest request,Integer parentId) {
+ User user = getCurrentUser();
+ if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
+ contractOrderEntity.setRefererIds(FebsConstant.DEFAULT_REFERER_ID);
+ } else {
+ contractOrderEntity.setRefererIds(user.getInviteId());
+ }
+ if(parentId==null){
+ ViewController.idFromMember=0;
+ }
+ contractOrderEntity.setId(ViewController.idFromMember);
+ Map<String, Object> data = getDataTable(contractOrderService.findHistoryDocumentaryprofitListInPage(contractOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+
@GetMapping("getHistoryList")
public FebsResponse getHistoryList(ContractOrderEntity contractOrderEntity, QueryRequest request) {
User user = getCurrentUser();
--
Gitblit v1.9.1