From ee4173967ebc3b71e8548dc8111d47fc3213f8d9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jul 2020 21:53:00 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 1026d32..bb5d759 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,6 +4,7 @@
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;
@@ -50,11 +51,20 @@
public FebsResponse getHistoryList(ContractOrderEntity contractOrderEntity, QueryRequest request) {
User user = getCurrentUser();
if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
- contractOrderEntity.setRefererId(FebsConstant.DEFAULT_REFERER_ID);
+ contractOrderEntity.setRefererIds(FebsConstant.DEFAULT_REFERER_ID);
} else {
- contractOrderEntity.setRefererId(user.getInviteId());
+ contractOrderEntity.setRefererIds(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.setInviteId(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