init

2024-01-03 21:37:47 +08:00
parent 34ee13959a
commit 161b589e64
15 changed files with 245 additions and 88 deletions
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java
@@ -3,8 +3,10 @@ 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.AddRechargeOrderAdminDto;
 import com.ruoyi.cai.dto.admin.vo.AccountAdminVo;
 import com.ruoyi.cai.service.AccountService;
+import com.ruoyi.cai.service.RechargeOrderService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -12,15 +14,12 @@ 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;

 /**
 * 用户账户
@@ -35,6 +34,7 @@ import java.util.Arrays;
 public class AccountController extends BaseController {

    private final AccountService accountService;
+    private final RechargeOrderService rechargeOrderService;

    /**
     * 查询用户账户列表
@@ -58,38 +58,12 @@ public class AccountController extends BaseController {
        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)));
+    @PostMapping("/updateCoin")
+    public R<Void> add(@RequestBody AddRechargeOrderAdminDto bo) {
+        rechargeOrderService.updateAdminRechargeOrder(bo);
+        return R.ok();
    }
 }
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java
@@ -3,8 +3,10 @@ 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.RechargeOrder;
+import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
 import com.ruoyi.cai.service.RechargeOrderService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -14,7 +16,9 @@ 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 com.ruoyi.common.utils.BeanConvertUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -35,6 +39,7 @@ import java.util.Arrays;
 public class RechargeOrderController extends BaseController {

    private final RechargeOrderService rechargeOrderService;
+    private final UserService userService;

    /**
     * 查询充值订单列表
@@ -53,9 +58,12 @@ public class RechargeOrderController extends BaseController {
     */
    @SaCheckPermission("cai:rechargeOrder:query")
    @GetMapping("/{id}")
-    public R<RechargeOrder> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(rechargeOrderService.getById(id));
+    public R<RechargeOrderAdminVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        RechargeOrder rechargeOrder = rechargeOrderService.getById(id);
+        RechargeOrderAdminVo res = BeanConvertUtil.convertTo(rechargeOrder, RechargeOrderAdminVo::new);
+        User user = userService.getById(res.getUserId());
+        BeanUtils.copyProperties(user,res);
+        return R.ok(res);
    }

    /**
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.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.UserAlbum;
+import com.ruoyi.cai.dto.admin.vo.UserAlbumAdminVo;
 import com.ruoyi.cai.service.UserAlbumService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*;

 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import java.util.Arrays;

 /**
@@ -41,8 +43,8 @@ public class UserAlbumController extends BaseController {
     */
    @SaCheckPermission("cai:userAlbum:list")
    @GetMapping("/list")
-    public TableDataInfo<UserAlbum> list(UserAlbum bo, PageQuery pageQuery) {
-        Page<UserAlbum> page = userAlbumService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<UserAlbumAdminVo> list(UserAlbumAdminVo bo, PageQuery pageQuery) {
+        Page<UserAlbumAdminVo> page = userAlbumService.pageAdmin(pageQuery, bo);
        return TableDataInfo.build(page);
    }

@@ -69,15 +71,16 @@ public class UserAlbumController extends BaseController {
        return toAjax(userAlbumService.save(bo));
    }

-    /**
-     * 修改主播集锦
-     */
    @SaCheckPermission("cai:userAlbum:edit")
    @Log(title = "主播集锦", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserAlbum bo) {
-        return toAjax(userAlbumService.updateById(bo));
+    @PutMapping("/audit")
+    public R<Void> audit(@RequestBody UserAlbum bo) {
+        Wrappers.lambdaUpdate(UserAlbum.class)
+                .eq(UserAlbum::getId,bo.getId())
+                .set(UserAlbum::getAuditStatus,bo.getAuditStatus())
+                .set(UserAlbum::getAuditTime, LocalDateTime.now());
+        return R.ok();
    }

    /**