Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-19 60f70f7409ec1ece8905e088fb43e0cb0258a70b

 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
@@ -632,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(String userName) {
      UserStatisticsDetail userStatisticsDetail = appUserMapper.getUserStatisticsDetail(userName);
      return R.ok(userStatisticsDetail);
   }

}