From d95c4537ad861e25f4371fc62feb16122dc4ac2d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 09:03:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index d477903..433086e 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -5,6 +5,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.management.api.feignClient.ManagementClient;
+import com.ruoyi.management.api.model.TPage;
import com.ruoyi.study.domain.TUser;
import com.ruoyi.study.dto.AppUserQuery;
import com.ruoyi.study.dto.UserInfoQuery;
@@ -42,8 +44,28 @@
@Autowired
private IVipOrderService vipOrderService;
+ @Autowired
+ private ManagementClient managementClient;
+ @PostMapping("/getPage")
+ @ApiOperation(value = "获取注意事项", tags = {"家长端-注意事项"})
+ public AjaxResult<TPage> getPage() {
+ List<TPage> data = managementClient.getPage1().getData();
+ for (TPage datum : data) {
+ if (datum.getType() == 4){
+ return AjaxResult.success(datum);
+ }
+ }
+ return AjaxResult.success();
+ }
+ @PostMapping("/updateUserInfo")
+ @ApiOperation(value = "修改个人资料", tags = {"家长端-个人中心"})
+
+ public AjaxResult updateUserInfo() {
+
+ return AjaxResult.success("修改成功");
+ }
@PostMapping("/userList")
- @ApiOperation(value = "用户列表", tags = {"用户管理"})
+ @ApiOperation(value = "用户列表", tags = {"管理后台-用户管理"})
public R<PageInfo<AppUserVO>> couponReceive(AppUserQuery query) {
PageInfo<AppUserVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<AppUserVO> list = userService.listAll(query);
@@ -64,7 +86,7 @@
}
@PostMapping("/getUserInfo")
- @ApiOperation(value = "查看用户详情", tags = {"用户管理"})
+ @ApiOperation(value = "查看用户详情", tags = {"管理后台-用户管理"})
public R<UserInfoVO> getUserInfo(UserInfoQuery dto) {
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
UserInfoVO res = new UserInfoVO();
@@ -109,7 +131,7 @@
return R.ok(res);
}
@PostMapping("/freeze")
- @ApiOperation(value = "冻结/解冻", tags = {"用户管理"})
+ @ApiOperation(value = "冻结/解冻", tags = {"管理后台-用户管理"})
public R freeze(Integer id) {
TUser byId = userService.getById(id);
if (byId.getState() == 1) {
@@ -123,7 +145,7 @@
@PostMapping("/vipOrderList")
- @ApiOperation(value = "列表查询", tags = {"会员管理"})
+ @ApiOperation(value = "列表查询", tags = {"管理后台-会员管理"})
public R<PageInfo<VipOrderVO>> vipOrderList(AppUserQuery query) {
PageInfo<VipOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<VipOrderVO> list = vipOrderService.listAll(query);
--
Gitblit v1.7.1