From db755501635521cf10bfe89ecd7ee977f384b968 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Dec 2021 15:02:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/java/cc/mrbird/febs/video/controller/ViewVideoMemberController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/video/controller/ViewVideoMemberController.java b/src/main/java/cc/mrbird/febs/video/controller/ViewVideoMemberController.java
index 70ba945..f0d44bb 100644
--- a/src/main/java/cc/mrbird/febs/video/controller/ViewVideoMemberController.java
+++ b/src/main/java/cc/mrbird/febs/video/controller/ViewVideoMemberController.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.video.entity.AppVersion;
import cc.mrbird.febs.video.entity.VideoMemberEntity;
import cc.mrbird.febs.video.mapper.VideoMemberMapper;
import cc.mrbird.febs.video.service.IAdminVideoMemberService;
@@ -31,6 +32,18 @@
return FebsUtil.view("videoMember/memberList");
}
+
+ /**
+ * 会员订单列表
+ * @return
+ */
+ @GetMapping("orderList")
+ @RequiresPermissions("orderList:view")
+ public String orderList() {
+ return FebsUtil.view("videoMember/orderList");
+ }
+
+
/**
* 会员列表-设置会员
* @param id
@@ -44,4 +57,38 @@
return FebsUtil.view("videoMember/setVip");
}
+ /**
+ * App版本-列表
+ * @return
+ */
+ @GetMapping("appVersionList")
+ @RequiresPermissions("appVersionList:view")
+ public String appVersionList() {
+ return FebsUtil.view("videoMember/appVersionList");
+ }
+
+ /**
+ * App版本-新增
+ * @return
+ */
+ @GetMapping("appVersionAdd")
+ @RequiresPermissions("appVersionAdd:add")
+ public String appVersionAdd() {
+ return FebsUtil.view("videoMember/appVersionAdd");
+ }
+
+ /**
+ * App版本-详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("appVerSionUpdate/{id}")
+ @RequiresPermissions("appVerSionUpdate:update")
+ public String appVerSionUpdate(@PathVariable long id, Model model) {
+ AppVersion data = adminVideoMemberService.getAppVersionInfoById(id);
+ model.addAttribute("appVersion", data);
+ return FebsUtil.view("videoMember/appVerSionUpdate");
+ }
+
}
--
Gitblit v1.9.1