init

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AccountCash;
+import com.ruoyi.cai.dto.admin.vo.AccountCashAdminVo;
 import com.ruoyi.cai.service.CaiAccountCashService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -44,8 +45,8 @@ public class AccountCashController extends BaseController {
      */
     @SaCheckPermission("cai:accountCash:list")
     @GetMapping("/list")
-    public TableDataInfo<AccountCash> list(AccountCash bo, PageQuery pageQuery) {
-        Page<AccountCash> page = accountCashService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<AccountCashAdminVo> list(AccountCashAdminVo bo, PageQuery pageQuery) {
+        Page<AccountCashAdminVo> page = accountCashService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 

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

@@ -0,0 +1,95 @@
+package com.ruoyi.cai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.cai.domain.Account;
+import com.ruoyi.cai.dto.admin.vo.AccountAdminVo;
+import com.ruoyi.cai.service.CaiAccountService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+/**
+ * 用户账户
+ *
+ * @author 77
+ * @date 2023-12-31
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/cai/account")
+public class AccountController extends BaseController {
+
+    private final CaiAccountService accountService;
+
+    /**
+     * 查询用户账户列表
+     */
+    @SaCheckPermission("cai:account:list")
+    @GetMapping("/list")
+    public TableDataInfo<AccountAdminVo> list(AccountAdminVo bo, PageQuery pageQuery) {
+        Page<AccountAdminVo> page = accountService.pageAdmin(pageQuery,bo);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取用户账户详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("cai:account:query")
+    @GetMapping("/{id}")
+    public R<Account> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(accountService.getById(id));
+    }
+
+    /**
+     * 新增用户账户
+     */
+    @SaCheckPermission("cai:account:add")
+    @Log(title = "用户账户", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Account bo) {
+        return toAjax(accountService.save(bo));
+    }
+
+    /**
+     * 修改用户账户
+     */
+    @SaCheckPermission("cai:account:edit")
+    @Log(title = "用户账户", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Account bo) {
+        return toAjax(accountService.updateById(bo));
+    }
+
+    /**
+     * 删除用户账户
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("cai:account:remove")
+    @Log(title = "用户账户", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(accountService.removeBatchByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UnionUser;
+import com.ruoyi.cai.dto.admin.vo.UnionUserAdminVo;
 import com.ruoyi.cai.service.CaiUnionUserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +42,8 @@ public class UnionUserController extends BaseController {
      */
     @SaCheckPermission("cai:unionUser:list")
     @GetMapping("/list")
-    public TableDataInfo<UnionUser> list(UnionUser bo, PageQuery pageQuery) {
-        Page<UnionUser> page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<UnionUserAdminVo> list(UnionUserAdminVo bo, PageQuery pageQuery) {
+        Page<UnionUserAdminVo> page = caiUnionUserService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 

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

@@ -3,7 +3,9 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.User;
+import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
 import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
+import com.ruoyi.cai.manager.UserAdminManager;
 import com.ruoyi.cai.service.CaiUserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -35,6 +37,7 @@ import java.util.Arrays;
 public class UserController extends BaseController {
 
     private final CaiUserService caiUserService;
+    private final UserAdminManager userAdminManager;
 
     /**
      * 查询用户列表
@@ -75,8 +78,8 @@ public class UserController extends BaseController {
     @Log(title = "用户", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody User bo) {
-        return toAjax(caiUserService.updateById(bo));
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserUpdateAdminReq bo) {
+        return toAjax(userAdminManager.updateUser(bo));
     }
 
     /**

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

@@ -1,9 +1,9 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserCount;
+import com.ruoyi.cai.dto.admin.vo.UserCountAdminVo;
 import com.ruoyi.cai.service.CaiUserCountService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,11 +41,17 @@ public class UserCountController extends BaseController {
      */
     @SaCheckPermission("cai:userCount:list")
     @GetMapping("/list")
-    public TableDataInfo<UserCount> list(UserCount bo, PageQuery pageQuery) {
-        Page<UserCount> page = caiUserCountService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<UserCountAdminVo> list(UserCountAdminVo bo, PageQuery pageQuery) {
+        Page<UserCountAdminVo> page = caiUserCountService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
+    @GetMapping("/reset")
+    public R<Void> reset(Long userId) {
+        caiUserCountService.reset(userId);
+        return R.ok();
+    }
+
 
     /**
      * 获取用户信息数量统计详细信息