From 35086a393d3bf72d69d27fc412006270743d0da7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Jun 2020 17:12:51 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 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 408f862..ceee344 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
@@ -4,8 +4,11 @@
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.contract.entity.AgentReturnEntity;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
+import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.service.IContractHoldOrderService;
+import com.xcong.excoin.modules.contract.service.IContractOrderService;
import com.xcong.excoin.system.entity.User;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -30,6 +33,8 @@
private final IContractHoldOrderService contractHoldOrderService;
+ private final IContractOrderService contractOrderService;
+
@GetMapping("getHoldList")
public FebsResponse getHoldList(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
User user = getCurrentUser();
@@ -41,4 +46,25 @@
Map<String, Object> data = getDataTable(contractHoldOrderService.findHoldList(contractHoldOrderEntity, request));
return new FebsResponse().success().data(data);
}
+
+ @GetMapping("getHistoryList")
+ public FebsResponse getHistoryList(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+ User user = getCurrentUser();
+ if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
+ contractOrderEntity.setRefererId(FebsConstant.DEFAULT_REFERER_ID);
+ } else {
+ contractOrderEntity.setRefererId(user.getInviteId());
+ }
+ Map<String, Object> data = getDataTable(contractOrderService.findHistoryOrderListInPage(contractOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ @GetMapping("getReturnList")
+ public FebsResponse getReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request) {
+ User user = getCurrentUser();
+ agentReturnEntity.setReturnInviteId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
+
+ Map<String, Object> data = getDataTable(contractOrderService.findAgentReturnList(agentReturnEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
--
Gitblit v1.9.1