From 7861e27efc998c3410e9d0ee20fc9e7f9a0780f5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jul 2020 21:53:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_agent
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 ceee344..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
@@ -51,9 +51,9 @@
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);
@@ -62,7 +62,7 @@
@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());
+ 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