From 707a7b28f6955c0cf9de2d90b6361ddc6a468d59 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Tue, 16 Jun 2020 16:08:57 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin_manage.git
---
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 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 6c34410..692e346 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
@@ -1,10 +1,18 @@
package com.xcong.excoin.modules.member.controller;
+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.service.IMemberService;
+import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
+
+import lombok.RequiredArgsConstructor;
+
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
/**
@@ -13,15 +21,26 @@
**/
@Controller("memberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/member")
-public class ViewController {
-
+@RequiredArgsConstructor
+public class ViewController extends BaseController{
+
+ private final IMemberService memberService;
+
@GetMapping("member")
@RequiresPermissions("member:view")
public String member() {
return FebsUtil.view("modules/member/member");
}
- /**
+ @GetMapping("memberDetail/{id}")
+ @RequiresPermissions("member:update")
+ public String memberDetail(@PathVariable long id, Model model) {
+ MemberAuthenticationVo data = memberService.selectMemberAuthenticationById(id);
+ model.addAttribute("member", data);
+ return FebsUtil.view("modules/member/memberDetail");
+ }
+
+ /**
* 会员充值USDT记录
* @return
*/
@@ -31,5 +50,35 @@
return FebsUtil.view("modules/member/chargeUsdt");
}
+ /**
+ * 会员USDT提现记录
+ * @return
+ */
+ @GetMapping("extractUsdt")
+ @RequiresPermissions("extractUsdt:view")
+ public String extractUsdt() {
+ return FebsUtil.view("modules/member/extractUsdt");
+ }
+
+ /**
+ * 充币记录
+ * @return
+ */
+ @GetMapping("applyCoin")
+ @RequiresPermissions("applyCoins:view")
+ public String applyCoin() {
+ return FebsUtil.view("modules/member/applyCoin");
+ }
+
+ /**
+ * 提币记录
+ * @return
+ */
+ @GetMapping("withdrawCoin")
+ @RequiresPermissions("withdrawCoins:view")
+ public String withdrawCoin() {
+ return FebsUtil.view("modules/member/withdrawCoin");
+ }
+
}
--
Gitblit v1.9.1