init

2023-12-30 20:14:46 +08:00
parent 53aef29552
commit 065cac5ae3
15 changed files with 270 additions and 45 deletions
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java
@@ -0,0 +1,95 @@
+package com.ruoyi.cai.controller;
+
+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.CaiGuardLog;
+import com.ruoyi.cai.service.CaiGuardLogService;
+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-30
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/cai/guardLog")
+public class CaiGuardLogController extends BaseController {
+
+    private final CaiGuardLogService iCaiGuardLogService;
+
+    /**
+     * 查询守护赠送流水列表
+     */
+    @SaCheckPermission("cai:guardLog:list")
+    @GetMapping("/list")
+    public TableDataInfo<CaiGuardLog> list(CaiGuardLog bo, PageQuery pageQuery) {
+        Page<CaiGuardLog> page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取守护赠送流水详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("cai:guardLog:query")
+    @GetMapping("/{id}")
+    public R<CaiGuardLog> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iCaiGuardLogService.getById(id));
+    }
+
+    /**
+     * 新增守护赠送流水
+     */
+    @SaCheckPermission("cai:guardLog:add")
+    @Log(title = "守护赠送流水", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiGuardLog bo) {
+        return toAjax(iCaiGuardLogService.save(bo));
+    }
+
+    /**
+     * 修改守护赠送流水
+     */
+    @SaCheckPermission("cai:guardLog:edit")
+    @Log(title = "守护赠送流水", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiGuardLog bo) {
+        return toAjax(iCaiGuardLogService.updateById(bo));
+    }
+
+    /**
+     * 删除守护赠送流水
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("cai:guardLog:remove")
+    @Log(title = "守护赠送流水", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iCaiGuardLogService.removeBatchByIds(Arrays.asList(ids), true));
+    }
+}
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
@@ -80,24 +80,4 @@ public class UserAppController {
        return R.ok(userAlbumService.resetAlbum(res,LoginHelper.getUserId()));
    }

-    @GetMapping("/recharge/log")
-    @Operation(summary = "充值记录-分页")
-    public TableDataInfo<AccountRechargeVo> rechargeLog(PageQuery query){
-        Long userId = LoginHelper.getUserId();
-        Page<CaiAccountRecharge> page = caiAccountRechargeService.page(query.build(), Wrappers.lambdaQuery(CaiAccountRecharge.class)
-                .eq(CaiAccountRecharge::getUserId, userId)
-                .orderByDesc(CaiAccountRecharge::getCreateTime));
-        return TableDataInfo.build(page,AccountRechargeVo::new);
-    }
-
-    @GetMapping("/cash/log")
-    @Operation(summary = "提现记录-分页")
-    public TableDataInfo<AccountCashVo> cashLog(PageQuery query){
-        Long userId = LoginHelper.getUserId();
-        Page<CaiAccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class)
-                .eq(CaiAccountCash::getUserId, userId)
-                .orderByDesc(CaiAccountCash::getCreateTime));
-        return TableDataInfo.build(page,AccountCashVo::new);
-    }
-
 }
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
@@ -1,11 +1,20 @@
 package com.ruoyi.cai.controller.app;

+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.CaiAccountBankcard;
+import com.ruoyi.cai.domain.CaiAccountCash;
+import com.ruoyi.cai.domain.CaiAccountRecharge;
 import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes;
 import com.ruoyi.cai.dto.app.query.WithdrawReq;
+import com.ruoyi.cai.dto.app.vo.AccountCashVo;
+import com.ruoyi.cai.dto.app.vo.AccountRechargeVo;
 import com.ruoyi.cai.manager.CurrentUserManager;
 import com.ruoyi.cai.service.CaiAccountCashService;
+import com.ruoyi.cai.service.CaiAccountRechargeService;
+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.helper.LoginHelper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,6 +30,8 @@ public class WalletController {
    private CurrentUserManager currentUserManager;
    @Autowired
    private CaiAccountCashService accountCashService;
+    @Autowired
+    private CaiAccountRechargeService accountRechargeService;

    @GetMapping("/aliInfo")
    @Operation(summary = "获取绑定支付宝信息")
@@ -44,4 +55,24 @@ public class WalletController {
        return R.ok(true);
    }

+    @GetMapping("/recharge/log")
+    @Operation(summary = "充值记录-分页")
+    public TableDataInfo<AccountRechargeVo> rechargeLog(PageQuery query){
+        Long userId = LoginHelper.getUserId();
+        Page<CaiAccountRecharge> page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(CaiAccountRecharge.class)
+                .eq(CaiAccountRecharge::getUserId, userId)
+                .orderByDesc(CaiAccountRecharge::getCreateTime));
+        return TableDataInfo.build(page,AccountRechargeVo::new);
+    }
+
+    @GetMapping("/cash/log")
+    @Operation(summary = "提现记录-分页")
+    public TableDataInfo<AccountCashVo> cashLog(PageQuery query){
+        Long userId = LoginHelper.getUserId();
+        Page<CaiAccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class)
+                .eq(CaiAccountCash::getUserId, userId)
+                .orderByDesc(CaiAccountCash::getCreateTime));
+        return TableDataInfo.build(page,AccountCashVo::new);
+    }
+
 }