From 018410a74524fedf22135a19982d1d18354b00bd Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Sat, 27 Jan 2024 22:20:49 +0800 Subject: [PATCH] init --- .../admin/{back => }/GiftController.java | 14 +------------- .../admin/{back => }/GoodsController.java | 2 +- .../{back => }/WithdrawExchangeController.java | 2 +- .../cai/controller/app/SettingAppController.java | 1 + .../src/main/java/com/ruoyi/cai/domain/Gift.java | 5 ----- .../com/ruoyi/cai/domain/WithdrawExchange.java | 3 +++ .../com/ruoyi/cai/manager/CurrentUserManager.java | 1 + 7 files changed, 8 insertions(+), 20 deletions(-) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/{back => }/GiftController.java (84%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/{back => }/GoodsController.java (98%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/{back => }/WithdrawExchangeController.java (98%) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiftController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java similarity index 84% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiftController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java index 0ebec6d7..817fc2db 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiftController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -81,16 +81,4 @@ public class GiftController extends BaseController { return toAjax(giftService.updateById(bo)); } - /** - * 删除礼物 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:gift:remove") - @Log(title = "礼物", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Integer[] ids) { - return toAjax(giftService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GoodsController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GoodsController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java index a84e91ba..d68dc88a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GoodsController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/WithdrawExchangeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/WithdrawExchangeController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java index 68554b8e..b029923d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/WithdrawExchangeController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java index c8b9a37d..e6bb187c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java @@ -62,6 +62,7 @@ public class SettingAppController { @Log(title = "提现配置", businessType = BusinessType.OTHER, isSaveDb = false) public R> withdraw(){ List list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class) + .eq(WithdrawExchange::getStatus,0) .orderByAsc(WithdrawExchange::getMoney)); return R.ok(list); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java index 89dd2d00..2e4c7335 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java @@ -54,11 +54,6 @@ public class Gift implements Serializable { */ @TableField("`desc`") private String desc; - /** - * 是否隐藏 0 不隐藏，可见 1 隐藏 - */ - @TableField("`hide`") - private Integer hide; /** * 排序 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java index 40037652..8ff125e5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java @@ -37,4 +37,7 @@ public class WithdrawExchange implements Serializable { @Schema(description = "所需货币") private Long coinNum; + private Integer status; + private String remark; + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index 7ee87a14..bbd9d2d9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -206,6 +206,7 @@ public class CurrentUserManager { bankcard.setType(1); bankcard.setBankCode("alipay"); bankcard.setBank("支付宝"); + bankcard.setUserId(LoginHelper.getUserId()); } bankcard.setCardName(res.getCardName()); bankcard.setCardAccount(res.getCardAccount());