From 9b532eeb6068971abb09d4c90b94431eb14b4e83 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 11:36:09 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index a8dc0a4..d42a490 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -34,6 +34,7 @@
import javax.annotation.Resource;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -516,6 +517,32 @@
}
return R.ok(byId);
}
+
+ @Resource
+ private UserChangeLogService userChangeLogService;
+ @GetMapping("/change/vip")
+ @ApiOperation(value = "用户列表-修改会员等级", tags = {"管理后台"})
+ public R<Page<AppUser>> changevip(Long id,Integer vipId)
+ {
+ AppUser byId = appUserService.getById(id);
+
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(byId.getId());
+ userChangeLog.setBeforeVipId(byId.getVipId());
+ userChangeLog.setAfterVipId(vipId);
+ if (userChangeLog.getBeforeVipId()>userChangeLog.getAfterVipId()) {
+ userChangeLog.setChangeType(0);
+ }else {
+ userChangeLog.setChangeType(1);
+ }
+ userChangeLogService.save(userChangeLog);
+ byId.setVipId(vipId);
+ appUserService.updateById(byId);
+ return R.ok();
+
+ }
+
@GetMapping("/bottom")
@ApiOperation(value = "用户列表-绑定下级列表", tags = {"管理后台"})
public R<Page<AppUser>> bottom(Long id,Integer pageNum,Integer pageSize)
--
Gitblit v1.7.1