From 4ddf8b517a730a7cf5d60ff1755f3e38b98fda01 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 20 十二月 2024 15:03:46 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 3c5e0b5..06c8936 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
@@ -6,6 +6,7 @@
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.api.model.UserSignRecord;
+import com.ruoyi.account.mapper.AppUserMapper;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
@@ -75,6 +76,8 @@
private UserPointService userPointService;
@Resource
private VipSettingService vipSettingService;
+ @Resource
+ private AppUserMapper appUserMapper;
@ResponseBody
@@ -504,6 +507,16 @@
appUserService.updateById(byId);
return R.ok();
}
+ @GetMapping("/change/shop")
+ @ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"})
+ public R<AppUser> shop(Long id,Long shopId)
+ {
+ AppUser byId = appUserService.getById(id);
+ byId.setShopId(shopId);
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
public Long getTop(Long inviteId){
AppUser byId = appUserService.getById(inviteId);
@@ -622,5 +635,25 @@
return R.ok(appUser);
}
+ /**
+ * 用户统计
+ */
+ @GetMapping("/statistics")
+ @ApiOperation(value = "用户统计",tags = {"管理后台-首页统计-用户统计"})
+ public R<UserStatistics> statistics() {
+ UserStatistics userStatistics = appUserMapper.getUserStatistics();
+ return R.ok(userStatistics);
+ }
+
+ /**
+ * 用户统计详情
+ */
+ @GetMapping("/statistics/detail")
+ @ApiOperation(value = "用户统计详情",tags = {"管理后台-首页统计-用户统计详情"})
+ public R<UserStatisticsDetail> statisticsDetail(@ApiParam(value = "用户id") Long userId) {
+ UserStatisticsDetail userStatisticsDetail = appUserMapper.getUserStatisticsDetail(userId);
+ return R.ok(userStatisticsDetail);
+ }
+
}
--
Gitblit v1.7.1