From 0c92259e4df497acede01817298c527c9d2ba347 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 01 Dec 2020 14:35:53 +0800
Subject: [PATCH] Merge branch 'outcenter-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage.git into outcenter-bak
---
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 101 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index 96a9556..4ebf3dc 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -3,6 +3,7 @@
import com.xcong.excoin.common.controller.BaseController;
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.utils.FebsUtil;
+import com.xcong.excoin.modules.member.dto.MemberLimitDto;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.service.IMemberService;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
@@ -17,6 +18,8 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import java.util.Map;
+
/**
* @author wzy
* @date 2020-06-10
@@ -28,13 +31,13 @@
private final IMemberService memberService;
- @GetMapping("addCoin/{id}")
- @RequiresPermissions("addCoin:update")
- public String addCoin(@PathVariable long id, Model model) {
- MemberEntity data = memberService.selectMemberByid(id);
- model.addAttribute("member", data);
- return FebsUtil.view("modules/member/addCoin");
- }
+// @GetMapping("addCoin/{id}")
+// @RequiresPermissions("addCoin:update")
+// public String addCoin(@PathVariable long id, Model model) {
+// MemberEntity data = memberService.selectMemberByid(id);
+// model.addAttribute("member", data);
+// return FebsUtil.view("modules/member/addCoin");
+// }
/**
* 代理关系
@@ -44,6 +47,16 @@
@RequiresPermissions("agentInfo:view")
public String agentInfo() {
return FebsUtil.view("modules/member/agentInfo");
+ }
+
+ /**
+ * 个人信息--上下级关系查询
+ * @return
+ */
+ @GetMapping("memberDataInfoListSearch")
+ @RequiresPermissions("memberDataInfoListSearch:view")
+ public String memberDataInfoListSearch() {
+ return FebsUtil.view("modules/member/memberDataInfoListSearch");
}
/**
@@ -64,6 +77,52 @@
@RequiresPermissions("memberDataInfo:view")
public String memberDataInfo() {
return FebsUtil.view("modules/member/memberDataInfo");
+ }
+
+ /**
+ * 平台全部信息
+ * @return
+ */
+ @GetMapping("memberDataInfoAll")
+ @RequiresPermissions("memberDataInfoAll:view")
+ public String memberDataInfoAll() {
+ return FebsUtil.view("modules/member/memberDataInfoAll");
+ }
+ /**
+ * 平台详细信息---列表alone
+ * @return
+ */
+ @GetMapping("memberDataInfoAlone")
+ @RequiresPermissions("memberDataInfoAlone:view")
+ public String memberDataInfoAlone() {
+ return FebsUtil.view("modules/member/memberDataInfoAlone");
+ }
+ /**
+ * 平台详细信息---列表Test
+ * @return
+ */
+ @GetMapping("memberDataInfoAloneTest")
+ @RequiresPermissions("memberDataInfoAloneTest:view")
+ public String memberDataInfoAloneTest() {
+ return FebsUtil.view("modules/member/memberDataInfoAloneTest");
+ }
+ /**
+ * 平台全部信息---列表alone
+ * @return
+ */
+ @GetMapping("memberDataInfoAllAlone")
+ @RequiresPermissions("memberDataInfoAllAlone:view")
+ public String memberDataInfoAllAlone() {
+ return FebsUtil.view("modules/member/memberDataInfoAllAlone");
+ }
+ /**
+ * 平台全部信息---列表Test
+ * @return
+ */
+ @GetMapping("memberDataInfoAllAloneTest")
+ @RequiresPermissions("memberDataInfoAllAloneTest:view")
+ public String memberDataInfoAllAloneTest() {
+ return FebsUtil.view("modules/member/memberDataInfoAllAloneTest");
}
/**
* 基础数据---查询
@@ -88,6 +147,12 @@
return FebsUtil.view("modules/member/memberAlone");
}
+ @GetMapping("memberAloneTest")
+ @RequiresPermissions("memberAloneTest:view")
+ public String memberAloneTest() {
+ return FebsUtil.view("modules/member/memberAloneTest");
+ }
+
@GetMapping("memberDetail/{id}")
@RequiresPermissions("member:update")
public String memberDetail(@PathVariable long id, Model model) {
@@ -96,10 +161,19 @@
return FebsUtil.view("modules/member/memberDetail");
}
/**
+ * 会员列表---个人详情
+ */
+ @GetMapping("memberDetailInfo/{inviteId}")
+ @RequiresPermissions("memberDetailInfo:detail")
+ public String memberDetailInfo(@PathVariable String inviteId, Model model) {
+ MemberInfoDetailVo data = memberService.selectMemberInfoDetailByInviteId(inviteId);
+ model.addAttribute("member", data);
+ return FebsUtil.view("modules/member/memberDetailInfo");
+ }
+ /**
* 提币审核管理---个人详情
*/
@GetMapping("memberInfoDetail/{id}")
- @RequiresPermissions("memberInfoDetail:update")
public String memberInfoDetail(@PathVariable long id, Model model) {
MemberInfoDetailVo data = memberService.selectMemberInfoDetailById(id);
model.addAttribute("member", data);
@@ -140,10 +214,19 @@
* 充币记录---alone
* @return
*/
+ @GetMapping("applyCoinAloneTest")
+ @RequiresPermissions("applyCoinAloneTest:view")
+ public String applyCoinAloneTest() {
+ return FebsUtil.view("modules/member/applyCoinAloneTest");
+ }
+ /**
+ * 充币记录---alone
+ * @return
+ */
@GetMapping("applyCoinAlone")
@RequiresPermissions("applyCoinAlone:view")
public String applyCoinAlone() {
- return FebsUtil.view("modules/member/applyCoinAlone");
+ return FebsUtil.view("modules/member/applyCoinAlone");
}
/**
@@ -181,6 +264,14 @@
public String memberTest() {
return FebsUtil.view("modules/member/memberTest");
}
-
+
+ @GetMapping("memberLimit")
+ @RequiresPermissions("member:update")
+ public String memberLimit(Model model) {
+ MemberLimitDto stringStringMap = memberService.memberLimit();
+ model.addAttribute("member",stringStringMap);
+ return FebsUtil.view("modules/member/limit");
+ }
+
}
--
Gitblit v1.9.1