123

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java

@@ -59,7 +59,7 @@ public class AccountController extends BaseController {
     }
 
     @SaCheckPermission("cai:account:add")
-    @Log(title = "用户账户", businessType = BusinessType.INSERT)
+    @Log(title = "用户账户调账", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/updateCoin")
     public R<Void> add(@RequestBody AddRechargeOrderAdminDto bo) {

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java

@@ -60,7 +60,7 @@ public class AnchorApplyController extends BaseController {
     }
 
     @SaCheckPermission("cai:anchorApply:edit")
-    @Log(title = "播主申请管理", businessType = BusinessType.UPDATE)
+    @Log(title = "主播申请-同意", businessType = BusinessType.UPDATE)
     @PostMapping("/auditAnchorSuccess")
     public R<Void> auditAnchorSuccess(@RequestBody IdRes id) {
         anchorApplyService.auditAnchorSuccess(id.getId());
@@ -68,7 +68,7 @@ public class AnchorApplyController extends BaseController {
     }
 
     @SaCheckPermission("cai:anchorApply:edit")
-    @Log(title = "播主申请管理", businessType = BusinessType.UPDATE)
+    @Log(title = "主播申请-不同意", businessType = BusinessType.UPDATE)
     @PostMapping("/auditAnchorFail")
     public R<Void> auditAnchorFail(@RequestBody IdRes id) {
         anchorApplyService.auditAnchorFail(id.getId());

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DayIncomeStatisticsController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java

@@ -99,6 +99,7 @@ public class DynamicController extends BaseController {
     @SaCheckPermission("cai:dynamic:edit")
     @RepeatSubmit()
     @PostMapping("/top")
+    @Log(title = "主播动态置顶", businessType = BusinessType.DELETE)
     public R<Void> top(@RequestBody Dynamic bo) {
         dynamicService.top(bo.getId());
         return R.ok();
@@ -108,6 +109,7 @@ public class DynamicController extends BaseController {
     @SaCheckPermission("cai:dynamic:edit")
     @RepeatSubmit()
     @PostMapping("/unTop")
+    @Log(title = "主播动态取消置顶", businessType = BusinessType.DELETE)
     public R<Void> unTop(@RequestBody Dynamic bo) {
         dynamicService.unTop(bo.getId());
         return R.ok();

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayConfigController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayTotalController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java

@@ -6,7 +6,9 @@ import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.enums.SystemConfigGroupEnum;
 import com.ruoyi.cai.enums.systemconfig.SystemCheckResp;
 import com.ruoyi.cai.manager.SystemConfigManager;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,6 +43,7 @@ public class SystemConfigController {
 
     @GetMapping("/business/update")
     @SaCheckPermission("cai:businessConfig:edit")
+    @Log(title = "修改业务设置", businessType = BusinessType.UPDATE)
     public R<Void> businessUpdate(String key,String value){
         SystemConfigEnum[] values = SystemConfigEnum.values();
         for (SystemConfigEnum config : values) {
@@ -75,6 +78,7 @@ public class SystemConfigController {
 
     @GetMapping("/system/update")
     @SaCheckPermission("cai:systemConfig:edit")
+    @Log(title = "修改系统设置", businessType = BusinessType.UPDATE)
     public R<Boolean> systemUpdate(String key,String value){
         systemConfigManager.set(key,value);
         return R.ok(true);

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java

@@ -75,6 +75,7 @@ public class UserCameraAuditController extends BaseController {
     @SaCheckPermission("cai:userCameraAudit:edit")
     @RepeatSubmit()
     @PostMapping("/batch/audit")
+    @Log(title = "批量审核通过自拍认证", businessType = BusinessType.UPDATE)
     public R<Void> edit(@RequestBody BatchAuditReq bo) {
         userCameraAuditService.update(Wrappers.lambdaUpdate(UserCameraAudit.class)
                 .in(UserCameraAudit::getId,bo.getIds())

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java

@@ -80,6 +80,7 @@ public class UserController extends BaseController {
 
     @PostMapping("/resetAvatar")
     @SaCheckPermission("cai:user:resetAvatar")
+    @Log(title = "重置用户头像", businessType = BusinessType.UPDATE)
     public R<Void> resetAvatar(@RequestBody IdRes res){
         userService.resetAvatar(res.getId());
         return R.ok();
@@ -87,6 +88,7 @@ public class UserController extends BaseController {
 
     @PostMapping("/userForbid")
     @SaCheckPermission("cai:user:lock")
+    @Log(title = "封禁用户", businessType = BusinessType.UPDATE)
     public R<Void> userForbid(@RequestBody UserForbidReq userForbidReq){
         userForbidManager.batchForbid(userForbidReq);
         return R.ok();
@@ -131,6 +133,7 @@ public class UserController extends BaseController {
 
     @PostMapping("/resetPwd")
     @SaCheckPermission("cai:user:restPwd")
+    @Log(title = "重置用户密码", businessType = BusinessType.UPDATE)
     public R<Void> resetPwd(@RequestBody ResetPasswordReq req) {
         User user = userService.getById(req.getUserId());
         userService.resetPassword(req.getUserId(),user.getPassword());

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserErrorLogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java

@@ -62,9 +62,6 @@ public class UserMemberController extends BaseController {
         return R.ok(userMemberService.getById(id));
     }
 
-    /**
-     * 新增会员管理
-     */
     @SaCheckPermission("cai:userMember:add")
     @Log(title = "会员管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/AccountBankcardController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -32,6 +32,7 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/cai/accountBankcard")
+@Deprecated
 public class AccountBankcardController extends BaseController {
 
     private final AccountBankcardService accountBankcardService;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/BlackController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -32,6 +32,7 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/cai/black")
+@Deprecated
 public class BlackController extends BaseController {
 
     private final BlackService blackService;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiftController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiveLogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -32,6 +32,7 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/cai/giveLog")
+@Deprecated
 public class GiveLogController extends BaseController {
 
     private final GiveLogService giveLogService;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GoodsController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/MemberPriceController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/ReportCateController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserChatFilterController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserRiskLogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -32,6 +32,7 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/cai/userRiskLog")
+@Deprecated
 public class UserRiskLogController extends BaseController {
 
     private final UserRiskLogService userRiskLogService;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserVisitorController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/WithdrawExchangeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.back;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/CityController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin;
+package com.ruoyi.cai.controller.admin.init;
 
 
 import com.ruoyi.cai.service.CitysService;

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/incomeStatis/AccountCashCountDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin.incomeStatis;
+package com.ruoyi.cai.dto.admin.incomeStatis;
 
 import lombok.Data;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/incomeStatis/RechargeOrderCountDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin.incomeStatis;
+package com.ruoyi.cai.dto.admin.incomeStatis;
 
 import lombok.Data;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/incomeStatis/VipOrderCountDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin.incomeStatis;
+package com.ruoyi.cai.dto.admin.incomeStatis;
 
 import lombok.Data;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountCashMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.controller.admin.incomeStatis.AccountCashCountDTO;
+import com.ruoyi.cai.dto.admin.incomeStatis.AccountCashCountDTO;
 import com.ruoyi.cai.domain.AccountCash;
 import com.ruoyi.cai.dto.admin.vo.AccountCashAdminVo;
 import org.apache.ibatis.annotations.Param;

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/RechargeOrderMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.controller.admin.incomeStatis.RechargeOrderCountDTO;
+import com.ruoyi.cai.dto.admin.incomeStatis.RechargeOrderCountDTO;
 import com.ruoyi.cai.domain.RechargeOrder;
 import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
 import org.apache.ibatis.annotations.Param;

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/VipOrderMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.controller.admin.incomeStatis.VipOrderCountDTO;
+import com.ruoyi.cai.dto.admin.incomeStatis.VipOrderCountDTO;
 import com.ruoyi.cai.domain.VipOrder;
 import com.ruoyi.cai.dto.admin.vo.VipOrderAdminVo;
 import org.apache.ibatis.annotations.Param;

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DayIncomeStatisticsServiceImpl.java

@@ -2,9 +2,9 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.cai.controller.admin.incomeStatis.AccountCashCountDTO;
+import com.ruoyi.cai.dto.admin.incomeStatis.AccountCashCountDTO;
-import com.ruoyi.cai.controller.admin.incomeStatis.RechargeOrderCountDTO;
+import com.ruoyi.cai.dto.admin.incomeStatis.RechargeOrderCountDTO;
-import com.ruoyi.cai.controller.admin.incomeStatis.VipOrderCountDTO;
+import com.ruoyi.cai.dto.admin.incomeStatis.VipOrderCountDTO;
 import com.ruoyi.cai.domain.DayIncomeStatistics;
 import com.ruoyi.cai.mapper.AccountCashMapper;
 import com.ruoyi.cai.mapper.DayIncomeStatisticsMapper;

ruoyi-cai/src/main/resources/mapper/cai/AccountCashMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by t1.create_time desc
     </select>
-    <select id="incomeStatistics" resultType="com.ruoyi.cai.controller.admin.incomeStatis.AccountCashCountDTO">
+    <select id="incomeStatistics" resultType="com.ruoyi.cai.dto.admin.incomeStatis.AccountCashCountDTO">
         select
             sum(cash_money) as cash_money,
             count(id) as cash_money

ruoyi-cai/src/main/resources/mapper/cai/RechargeOrderMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t1.create_time desc
     </select>
     <select id="incomeStatistics"
-            resultType="com.ruoyi.cai.controller.admin.incomeStatis.RechargeOrderCountDTO">
+            resultType="com.ruoyi.cai.dto.admin.incomeStatis.RechargeOrderCountDTO">
         select
             pay_time,
             sum(if(admin=1 and recharge_type=1 and recharge_coin > 0,recharge_coin,0)) as modify_coin_add,

ruoyi-cai/src/main/resources/mapper/cai/VipOrderMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by t1.create_time desc
     </select>
-    <select id="incomeStatistics" resultType="com.ruoyi.cai.controller.admin.incomeStatis.VipOrderCountDTO">
+    <select id="incomeStatistics" resultType="com.ruoyi.cai.dto.admin.incomeStatis.VipOrderCountDTO">
         select
             sum(price) as vip_money,
             count(id) as vip_count