From 7dc74a0c7bab3eb92ef9ca82401b6f0943960751 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Jun 2020 11:48:47 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java | 2 --
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 2 +-
src/main/resources/mapper/modules/AgentReturnDao.xml | 2 +-
3 files changed, 2 insertions(+), 4 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..7918a1b 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
@@ -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);
diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
index ec79197..5541fe9 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
@@ -64,8 +64,6 @@
private int closingType;
@TableField(exist = false)
- private String returnInviteId;
- @TableField(exist = false)
private String phone;
@TableField(exist = false)
private String email;
diff --git a/src/main/resources/mapper/modules/AgentReturnDao.xml b/src/main/resources/mapper/modules/AgentReturnDao.xml
index 9b73a76..17d214c 100644
--- a/src/main/resources/mapper/modules/AgentReturnDao.xml
+++ b/src/main/resources/mapper/modules/AgentReturnDao.xml
@@ -11,6 +11,6 @@
from kss_framework.agent_return a
left join member_authentication b on a.member_id=b.member_id
left join member c on a.member_id=c.id
- where return_invite_id=#{record.returnInviteId}
+ where invite_id=#{record.inviteId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1