From f5f828b22c5d9ae19991a5e14a5090df63e41f81 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 09 Jul 2020 17:18:30 +0800
Subject: [PATCH] 20200709  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 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 d665654..b501da7 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,13 +3,11 @@
 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.entity.MemberCoinChargeEntity;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
 import com.xcong.excoin.modules.member.service.IMemberService;
 import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
 
 import lombok.RequiredArgsConstructor;
-
-import java.util.List;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -29,13 +27,53 @@
 	
 	private final IMemberService memberService;
 	
-	@GetMapping("memberDataInfo/{id}")
+	@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");
+    }
+	
+	/**
+     * 代理关系
+     * @return
+     */
+    @GetMapping("agentInfo")
+    @RequiresPermissions("agentInfo:view")
+    public String agentInfo() {
+        return FebsUtil.view("modules/member/agentInfo");
+    }
+	
+	/**
+     * 个人信息
+     * @return
+     */
+    @GetMapping("memberDataInfoList")
+    @RequiresPermissions("memberDataInfoList:view")
+    public String memberDataInfoList() {
+        return FebsUtil.view("modules/member/memberDataInfoList");
+    }
+	
+	/**
+     * 基础数据
+     * @return
+     */
+    @GetMapping("memberDataInfo")
     @RequiresPermissions("memberDataInfo:view")
-    public String memberDataInfo(@PathVariable long id, Model model) {
-		List<MemberCoinChargeEntity> data = memberService.selectMemberDataInfoById(id);
-    	model.addAttribute("memberCoinChargeEntity", data);
+    public String memberDataInfo() {
         return FebsUtil.view("modules/member/memberDataInfo");
     }
+    /**
+	 * 基础数据---查询
+	 */
+    @GetMapping("memberDataInfoLists/{id}")
+    @RequiresPermissions("memberDataInfoLists:view")
+    public String memberDataInfoList(@PathVariable long id, Model model) {
+    	MemberEntity memberEntity = memberService.selectMemberByid(id);
+    	model.addAttribute("member", memberEntity);
+        return FebsUtil.view("modules/member/memberDataInfoList");
+    }
 	
     @GetMapping("member")
     @RequiresPermissions("member:view")

--
Gitblit v1.9.1