diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java deleted file mode 100644 index 480c7006..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java +++ /dev/null @@ -1,96 +0,0 @@ -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.AccountRecharge; -import com.ruoyi.cai.service.AccountRechargeService; -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-22 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/cai/accountRecharge") -public class AccountRechargeController extends BaseController { - - private final AccountRechargeService accountRechargeService; - - /** - * 查询充值记录列表 - */ - @SaCheckPermission("cai:accountRecharge:list") - @GetMapping("/list") - public TableDataInfo list(AccountRecharge bo, PageQuery pageQuery) { - Page page = accountRechargeService.page(pageQuery.build(), - Wrappers.lambdaQuery(bo).orderByDesc(AccountRecharge::getCreateTime)); - return TableDataInfo.build(page); - } - - /** - * 获取充值记录详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("cai:accountRecharge:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(accountRechargeService.getById(id)); - } - - /** - * 新增充值记录 - */ - @SaCheckPermission("cai:accountRecharge:add") - @Log(title = "充值记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody AccountRecharge bo) { - return toAjax(accountRechargeService.save(bo)); - } - - /** - * 修改充值记录 - */ - @SaCheckPermission("cai:accountRecharge:edit") - @Log(title = "充值记录", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody AccountRecharge bo) { - return toAjax(accountRechargeService.updateById(bo)); - } - - /** - * 删除充值记录 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:accountRecharge:remove") - @Log(title = "充值记录", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(accountRechargeService.removeBatchByIds(Arrays.asList(ids))); - } -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java index 5615f58c..08f0183a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java @@ -37,7 +37,6 @@ import java.util.Arrays; @RequiredArgsConstructor @RestController @RequestMapping("/cai/guardLog") -@Deprecated public class GuardLogController extends BaseController { private final GuardLogService guardLogService; 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 c77c66b8..5e99b142 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 @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.AccountBankcard; import com.ruoyi.cai.domain.AccountCash; -import com.ruoyi.cai.domain.AccountRecharge; import com.ruoyi.cai.domain.RechargeOrder; import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes; import com.ruoyi.cai.dto.app.query.WithdrawReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountRecharge.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountRecharge.java deleted file mode 100644 index fbaa83ff..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountRecharge.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.ruoyi.cai.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 充值记录对象 cai_account_recharge - * - * @author 77 - * @date 2023-12-22 - */ -@Data -@TableName("cai_account_recharge") -public class AccountRecharge implements Serializable { - - private static final long serialVersionUID=1L; - - /** - * - */ - @TableId(value = "id",type = IdType.AUTO) - private Long id; - /** - * - */ - private Long userId; - /** - * - */ - private Long goodsId; - /** - * - */ - private String orderNo; - /** - * 订单名 - */ - private String orderName; - /** - * 充值类型 0 手工充值 1 线上充值 - */ - private Integer rechargeType; - /** - * 充值金额 - */ - private BigDecimal rechargeMoney; - /** - * 充值的紫贝 - */ - private Integer coinNum; - /** - * 状态 1 申请 2 审核通过 3，审核不通过 - */ - private Integer status; - /** - * 充值平台类型 - */ - private Long platformType; - /** - * 充值平台名称 - */ - private String platformName; - /** - * - */ - private String payNo; - /** - * - */ - private String returnContent; - /** - * - */ - private BigDecimal rechargeReward; - /** - * - */ - private LocalDateTime verifyTime; - /** - * - */ - private String operateIp; - /** - * 类型: 0积分(默认)，1会员 - */ - private Integer type; - /** - * - */ - private String appid; - - private LocalDateTime createTime; - -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/bo/AgreementSettingBo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/bo/AgreementSettingBo.java deleted file mode 100644 index 6f3b9d6a..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/bo/AgreementSettingBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ruoyi.cai.domain.bo; - -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import lombok.Data; -import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; - -import java.util.Date; - -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 协议设置业务对象 cai_agreement_setting - * - * @author 77 - * @date 2024-01-14 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class AgreementSettingBo extends BaseEntity { - - /** - * ID - */ - @NotNull(message = "ID不能为空", groups = { EditGroup.class }) - private Long id; - - /** - * 用户协议 - */ - @NotBlank(message = "用户协议不能为空", groups = { AddGroup.class, EditGroup.class }) - private String userAgreement; - - /** - * 主播入驻协议 - */ - @NotBlank(message = "主播入驻协议不能为空", groups = { AddGroup.class, EditGroup.class }) - private String anchorJoinAgreement; - - -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/vo/AgreementSettingVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/vo/AgreementSettingVo.java deleted file mode 100644 index d0ff6c66..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/vo/AgreementSettingVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ruoyi.cai.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import lombok.Data; -import java.util.Date; - -import java.io.Serializable; - -/** - * 协议设置视图对象 cai_agreement_setting - * - * @author 77 - * @date 2024-01-14 - */ -@Data -@ExcelIgnoreUnannotated -public class AgreementSettingVo implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ExcelProperty(value = "ID") - private Long id; - - /** - * 用户协议 - */ - @ExcelProperty(value = "用户协议") - private String userAgreement; - - /** - * 主播入驻协议 - */ - @ExcelProperty(value = "主播入驻协议") - private String anchorJoinAgreement; - - -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountRechargeMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountRechargeMapper.java deleted file mode 100644 index fee386cc..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountRechargeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ruoyi.cai.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.AccountRecharge; - -/** - * 充值记录Mapper接口 - * - * @author 77 - * @date 2023-12-22 - */ -public interface AccountRechargeMapper extends BaseMapper { - -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountRechargeService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountRechargeService.java deleted file mode 100644 index ab34e7dc..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountRechargeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ruoyi.cai.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.AccountRecharge; - -/** - * 充值记录Service接口 - * - * @author 77 - * @date 2023-12-22 - */ -public interface AccountRechargeService extends IService { - -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountRechargeServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountRechargeServiceImpl.java deleted file mode 100644 index 705ca59a..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountRechargeServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ruoyi.cai.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.AccountRecharge; -import com.ruoyi.cai.mapper.AccountRechargeMapper; -import com.ruoyi.cai.service.AccountRechargeService; -import org.springframework.stereotype.Service; - -/** - * 充值记录Service业务层处理 - * - * @author 77 - * @date 2023-12-22 - */ -@Service -public class AccountRechargeServiceImpl extends ServiceImpl implements AccountRechargeService { -} diff --git a/ruoyi-cai/src/main/resources/mapper/cai/AccountRechargeMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountRechargeMapper.xml deleted file mode 100644 index dfc09fbe..00000000 --- a/ruoyi-cai/src/main/resources/mapper/cai/AccountRechargeMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -