diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java new file mode 100644 index 00000000..55bec06f --- /dev/null +++ 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 list(CaiGuardLog bo, PageQuery pageQuery) { + Page page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + return TableDataInfo.build(page); + } + + /** + * 获取守护赠送流水详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:guardLog:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iCaiGuardLogService.removeBatchByIds(Arrays.asList(ids), true)); + } +} diff --git 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 index 2bbc6920..0e6e2e3e 100644 --- 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 rechargeLog(PageQuery query){ - Long userId = LoginHelper.getUserId(); - Page 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 cashLog(PageQuery query){ - Long userId = LoginHelper.getUserId(); - Page page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class) - .eq(CaiAccountCash::getUserId, userId) - .orderByDesc(CaiAccountCash::getCreateTime)); - return TableDataInfo.build(page,AccountCashVo::new); - } - } diff --git 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 index e31f12ee..61cf08c8 100644 --- 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 rechargeLog(PageQuery query){ + Long userId = LoginHelper.getUserId(); + Page 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 cashLog(PageQuery query){ + Long userId = LoginHelper.getUserId(); + Page page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class) + .eq(CaiAccountCash::getUserId, userId) + .orderByDesc(CaiAccountCash::getCreateTime)); + return TableDataInfo.build(page,AccountCashVo::new); + } + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountCash.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountCash.java index 1ee400c3..7f57581b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountCash.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountCash.java @@ -33,6 +33,10 @@ public class CaiAccountCash implements Serializable { * 订单号 */ private String orderNo; + /** + * 提现紫贝 + */ + private Long withdrawCoin; /** * 提现金额 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardLog.java new file mode 100644 index 00000000..8e65adb3 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardLog.java @@ -0,0 +1,51 @@ +package com.ruoyi.cai.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 守护赠送流水对象 cai_guard_log + * + * @author 77 + * @date 2023-12-30 + */ +@Data +@TableName("cai_guard_log") +public class CaiGuardLog implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * 自增id + */ + @TableId(value = "id") + private Long id; + /** + * 女神 + */ + private Long fromUserId; + /** + * 赠送人 + */ + private Long toUserId; + /** + * 赠送个数 + */ + private Long guardNum; + /** + * 守护值 + */ + private Long guardValue; + /** + * 流水ID + */ + private Long consumeLogId; + + private LocalDateTime createTime; + private LocalDateTime updateTime; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiWithdrawExchange.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiWithdrawExchange.java index 5ad6c5c6..1b3cd55b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiWithdrawExchange.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiWithdrawExchange.java @@ -29,11 +29,11 @@ public class CaiWithdrawExchange implements Serializable { * 兑换金额 */ @Schema(description = "兑换金额") - private Integer money; + private Long money; /** * 所需货币数量 */ @Schema(description = "所需货币") - private Integer coinNum; + private Long coinNum; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawReq.java index 646f969d..6e188ed8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawReq.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawReq.java @@ -6,22 +6,11 @@ import lombok.Data; @Data @Schema(description = "提现入参") public class WithdrawReq { - /** * 提现配置ID */ @Schema(description = "提现配置ID") private Long withdrawSettingId; - /** - * 兑换金额 - */ - @Schema(description = "兑换金额") - private Long money; - /** - * 所需货币数量 - */ - @Schema(description = "所需货币数量") - private Long coinNum; @Schema(description = "当前用户ID",accessMode = Schema.AccessMode.READ_ONLY) private Long userId; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java new file mode 100644 index 00000000..17c9fccb --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cai.domain.CaiGuardLog; + +/** + * 守护赠送流水Mapper接口 + * + * @author 77 + * @date 2023-12-30 + */ +public interface CaiGuardLogMapper extends BaseMapper { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java index ba33f1a9..a1648b10 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java @@ -16,5 +16,5 @@ public interface CaiAccountService extends IService { CaiConsumeLog decr(CaiConsumeLog log); - boolean withdraw(Long userId, Long incomeCoin); + void withdraw(Long userId, Long incomeCoin); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java new file mode 100644 index 00000000..c6dab595 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.CaiGuardLog; + +/** + * 守护赠送流水Service接口 + * + * @author 77 + * @date 2023-12-30 + */ +public interface CaiGuardLogService extends IService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java index e02bb506..897e8427 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java @@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiAccountBankcard; import com.ruoyi.cai.domain.CaiAccountCash; +import com.ruoyi.cai.domain.CaiWithdrawExchange; import com.ruoyi.cai.dto.app.query.WithdrawReq; import com.ruoyi.cai.mapper.CaiAccountCashMapper; import com.ruoyi.cai.service.CaiAccountBankcardService; import com.ruoyi.cai.service.CaiAccountCashService; import com.ruoyi.cai.service.CaiAccountService; +import com.ruoyi.cai.service.CaiWithdrawExchangeService; import com.ruoyi.common.exception.ServiceException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +23,8 @@ public class CaiAccountCashServiceImpl extends ServiceImpl implements CaiGuardLogService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java index b381f586..e25da7d4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java @@ -91,7 +91,7 @@ public class CaiGuardTotalServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + +