From e83a86dafca1dac779c1fecdbead60be1a2457de Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Jun 2022 15:54:25 +0800
Subject: [PATCH] 20220528
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 55 ++++++++++++++++++++-----------------------------------
1 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index efd106c..057d595 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.mall.entity.AppVersion;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.entity.MallShopApply;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
@@ -26,6 +27,16 @@
public static long idFromMoneyFlow;
public static long idFromAgentAllMember;
+
+ /**
+ * 平台账单
+ * @return
+ */
+ @GetMapping("mallDataList")
+ @RequiresPermissions("mallDataList:view")
+ public String mallDataList() {
+ return FebsUtil.view("modules/mallMember/mallDataList");
+ }
/**
* 会员列表
@@ -229,44 +240,18 @@
return FebsUtil.view("modules/mallMember/appVerSionUpdate");
}
- /**
- * 新闻中心-列表
- * @return
- */
- @GetMapping("newsInfoList")
- @RequiresPermissions("newsInfoList:view")
- public String newsInfoList() {
- return FebsUtil.view("modules/mallMember/newsInfoList");
+
+ @GetMapping("shopApply")
+ public String shopApply() {
+ return FebsUtil.view("modules/mallMember/shopApply");
}
- /**
- * 新闻中心-新增
- * @return
- */
- @GetMapping("newsInfoAdd")
- @RequiresPermissions("newsInfoAdd:add")
- public String newsInfoAdd() {
- return FebsUtil.view("modules/mallMember/newsInfoAdd");
+ @GetMapping("applyDetail/{id}")
+ public String applyDetail(@PathVariable("id") Long id, Model model) {
+ MallShopApply apply = mallMemberService.findShopApplyById(id);
+ model.addAttribute("apply", apply);
+ return FebsUtil.view("modules/mallMember/shopApplyInfo");
}
-
- /**
- * 新闻中心-详情
- * @param id
- * @param model
- * @return
- */
- @GetMapping("newsInfoUpdate/{id}")
- @RequiresPermissions("newsInfoUpdate:update")
- public String newsInfoUpdate(@PathVariable long id, Model model) {
- MallNewsInfo data = mallMemberService.getNewsInfoById(id);
- model.addAttribute("newsInfo", data);
- return FebsUtil.view("modules/mallMember/newsInfoUpdate");
- }
-
-
-
-
-
--
Gitblit v1.9.1