From e36a5a9ddd4aff09c71fc3e82ea2b1a70261552d Mon Sep 17 00:00:00 2001 From: 777 <123@qwe.com> Date: Tue, 9 Dec 2025 11:27:23 +0800 Subject: [PATCH] nnnn --- .../cai/admin/AccountController.java | 3 +- .../cai/admin/SystemConfigController.java | 22 +++ .../com/ruoyi/cai/dto/AddPointAdminDto.java | 2 +- .../ruoyi/cai/dto/ChangePointsAdminDto.java | 23 +++ .../com/ruoyi/cai/enums/SystemConfigEnum.java | 140 ++++++++++-------- .../cai/enums/SystemConfigGroupEnum.java | 7 +- .../ruoyi/cai/manager/ConsumerManager.java | 2 + .../cai/service/PointRecordLogService.java | 1 + .../impl/PointRecordLogServiceImpl.java | 8 +- 9 files changed, 141 insertions(+), 67 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/ChangePointsAdminDto.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java index bf0801b2..80125aec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.Account; import com.ruoyi.cai.dto.AddPointAdminDto; import com.ruoyi.cai.dto.AddRechargeOrderAdminDto; +import com.ruoyi.cai.dto.ChangePointsAdminDto; import com.ruoyi.cai.dto.admin.vo.AccountAdminVo; import com.ruoyi.cai.manager.ConsumerManager; import com.ruoyi.cai.service.AccountService; @@ -79,7 +80,7 @@ public class AccountController extends BaseController { @SaCheckPermission("cai:account:add") @Log(title = "用户积分调账", businessType = BusinessType.INSERT) @RepeatSubmit() - @PostMapping("/updatePoint") + @PostMapping("/changePoints") public R adminUpdatePoint(@RequestBody AddPointAdminDto bo) { pointRecordLogService.adminUpdatePoint(bo); return R.ok(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SystemConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SystemConfigController.java index f71f2012..784e5d56 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SystemConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SystemConfigController.java @@ -23,6 +23,28 @@ import java.util.Map; public class SystemConfigController { @Autowired private SystemConfigManager systemConfigManager; + + + @GetMapping("/business/v2/all") + @SaCheckPermission("cai:businessConfig:query") + public R> businessBusiness(String businessType){ + List responses = new ArrayList<>(); + Map allSystemConfig = systemConfigManager.getAllSystemConfig(); + SystemConfigEnum[] values = SystemConfigEnum.values(); + for (SystemConfigEnum value : values) { + if(value.getGroup().name().equalsIgnoreCase(businessType)){ + SystemConfigResponse sys = new SystemConfigResponse(); + sys.setKey(value.getKey()); + sys.setValue(allSystemConfig.getOrDefault(value.getKey(),value.getDefaultValue())); + sys.setDesc(value.getDesc()); + sys.setInputType(value.getInputType()); + responses.add(sys); + } + } + return R.ok(responses); + } + + @GetMapping("/business/all") @SaCheckPermission("cai:businessConfig:query") public R> businessAll(){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/AddPointAdminDto.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/AddPointAdminDto.java index 59b66e3b..28afd5b0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/AddPointAdminDto.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/AddPointAdminDto.java @@ -15,7 +15,7 @@ public class AddPointAdminDto implements Serializable { /** * 调整的金额 */ - private Long point; + private Long changePoints; /** * 是否参与分销 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/ChangePointsAdminDto.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/ChangePointsAdminDto.java new file mode 100644 index 00000000..d0dda7a1 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/ChangePointsAdminDto.java @@ -0,0 +1,23 @@ + +package com.ruoyi.cai.dto; + +import lombok.Data; + +@Data +public class ChangePointsAdminDto { + /** + * 员工ID + */ + private String usercode; + + /** + * 调整的金额 + */ + private Long changePoints; + /** + * 是否参与分销 + */ + private boolean distribution; + private String remark; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java index 1ecf1d27..d3fbc7ac 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java @@ -12,16 +12,72 @@ import lombok.Setter; */ @Getter public enum SystemConfigEnum { - OPEN_IP_NUMBER("5", "IP每日登录次数超过多少次封",SystemConfigGroupEnum.BUSINESS), - OPEN_IP_AUTO("1", "开启自动定时封IP",SystemConfigGroupEnum.BUSINESS), - OPEN_RESET_PASSWORD("1", "开启重置密码",SystemConfigGroupEnum.BUSINESS, new BooleanSystemConfigCheck()), - TD_KF("", "土豆客服账号",SystemConfigGroupEnum.BUSINESS), + /** + * 安全配置 + */ + OPEN_IP_NUMBER("5", "IP每日登录次数超过多少次封",SystemConfigGroupEnum.SECURITY), + OPEN_IP_AUTO("1", "开启自动定时封IP",SystemConfigGroupEnum.SECURITY), + OPEN_RESET_PASSWORD("1", "开启重置密码",SystemConfigGroupEnum.SECURITY, new BooleanSystemConfigCheck()), + LOGIN_PASSWORD_ERROR_MAX_NUM("5", "登录输错密码上限",SystemConfigGroupEnum.SECURITY, new NumberSystemConfigCheck()), + SENSITIVE_ENABLE("1", "是否开启手机号脱敏",SystemConfigGroupEnum.SECURITY,new BooleanSystemConfigCheck()), + OPEN_CLEAN_DYNAMIC("1", "开启动态定时清除",SystemConfigGroupEnum.SECURITY,new BooleanSystemConfigCheck()), + YUNXIN_ONLINE_ENABLE("1", "是否开启云信监控在线状态",SystemConfigGroupEnum.SECURITY,new BooleanSystemConfigCheck()), + OPEN_TEST("0", "开启测试模式",SystemConfigGroupEnum.SECURITY,new BooleanSystemConfigCheck()), + SMS_CODE_ADMIN("", "万能验证码",SystemConfigGroupEnum.SECURITY), + PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SECURITY), + IPV6_FILTER("0", "是否开启IPV6请求拦截",SystemConfigGroupEnum.SECURITY, new BooleanSystemConfigCheck()), + IPV6_FILTER_PATH("/api/auth/login", "IPV6拦截路由配置（逗号分隔）",SystemConfigGroupEnum.SECURITY, new BooleanSystemConfigCheck(),"textarea"), + VIP_PRIVATE_PLUS("0", "开启VIP隐私模式增强模式",SystemConfigGroupEnum.SECURITY,new BooleanSystemConfigCheck()), + OPEN_ANCHOR_CHAT_COUNT("0", "开启主播主动消息统计",SystemConfigGroupEnum.SECURITY,new BooleanSystemConfigCheck()), + // 4-recordId拦截 5-recordId加强拦截 6-性别拦截 7-vip加强拦截 + IM_FILTER_PLUS("0", "IM拦截配置（勿动，开发配置）",SystemConfigGroupEnum.SECURITY), + OPEN_OLD_REGISTER_CODE("0", "是否开启无验证码注册接口",SystemConfigGroupEnum.SECURITY, new BooleanSystemConfigCheck()), + OPEN_NOTICE("1", "是否开启告警",SystemConfigGroupEnum.SECURITY, new BooleanSystemConfigCheck()), + PAY_ERROR_NUM_NOTICE("2", "连续调用支付失败N次，发起告警",SystemConfigGroupEnum.SECURITY, new NumberSystemConfigCheck()), + PAY_NOTIFY_ERROR_NUM_NOTICE("5", "连续调用N次支付，但是依旧未支付成功，发起告警",SystemConfigGroupEnum.SECURITY, new NumberSystemConfigCheck()), + + /** + * 域名配置 + */ + SHARE_TYPE("1", "分享方式 1-分享链接 2-x4y生成",SystemConfigGroupEnum.DOMAIN), + Y4X_TYPE("10021", "y4x的Type",SystemConfigGroupEnum.DOMAIN), + Y4X_TOKEN("9d42f94ebb346cd6fcd6fb5b9cddcd16", "y4x的Token",SystemConfigGroupEnum.DOMAIN), + SHARE_URL("https://h5.qx96688.com/index/invite/index", "分享链接",SystemConfigGroupEnum.DOMAIN), + SHARE_BASE_URL("https://www.baidu.com/#/share", "真实分享链接",SystemConfigGroupEnum.DOMAIN), + /** + * 支付配置 + */ + OPEN_ALI_PAY("1", "是否开启四方支付宝支付",SystemConfigGroupEnum.PAY,new BooleanSystemConfigCheck()), + OPEN_SOURCE_ALI_PAY("1", "是否开启原生支付宝支付(废弃)",SystemConfigGroupEnum.PAY,new BooleanSystemConfigCheck()), + OPEN_WX_PAY("1", "是否开启微信支付",SystemConfigGroupEnum.PAY,new BooleanSystemConfigCheck()), + ALI_PAY_FIRST("1", "支付宝支付显示是否在前面",SystemConfigGroupEnum.PAY,new BooleanSystemConfigCheck()), + OPEN_WITHDRAW("1", "是否开启提现功能",SystemConfigGroupEnum.PAY,new BooleanSystemConfigCheck()), + PAY_LIMIT("200000", "原生支付的阈值（元）",SystemConfigGroupEnum.PAY, new NumberSystemConfigCheck()), + V12_PRIVATE_KEY_PATH("/home/server/api/sign/6888803128553.pfx", "V12德商私钥路径",SystemConfigGroupEnum.PAY), + V12_PRIVATE_KEY_PASSWORD("926645", "V12德商私钥密码",SystemConfigGroupEnum.PAY), + V12_XIAOCHENGXU_ORG_ID("gh_62790d4f9c57", "V12德商小程序原始id",SystemConfigGroupEnum.PAY), + V12_XIAOCHENGXU_PATH("pages/zf/index?", "V12德商小程序页面路径",SystemConfigGroupEnum.PAY), + V12_WX_APP_ID("wxae39c7eed3221d26", "微信开放平台ID",SystemConfigGroupEnum.PAY), + /** + * 域名配置 + */ + COS_DOMAIN("http://ap-shanghai.myqcloud.com/", "文件系统域名前缀",SystemConfigGroupEnum.DOMAIN), + PRIVACY_AGREEMENT("/#/agreement/privacy", "隐私协议地址",SystemConfigGroupEnum.DOMAIN), + USER_AGREEMENT("/#/agreement/user", "用户协议地址",SystemConfigGroupEnum.DOMAIN), + ANCHOR_JOIN_AGREEMENT("/#/agreement/anchor-join", "主播入驻协议地址",SystemConfigGroupEnum.DOMAIN), + WS_SOCKET_URL("ws://localhost:8080/ws?token=%s&room_id=%s", "ws通讯地址",SystemConfigGroupEnum.DOMAIN), + UPLOAD_FILE_DOMAIN("http://127.0.0.1:8080", "文件上传域名服务器",SystemConfigGroupEnum.DOMAIN), + // 七牛云 ?imageView2/2/w/120/h/120 + // 腾讯云 ?thumbnail=120y120&imageView + IM_ICON_SUFFIX("?thumbnail=120y120&imageView", "im头像后缀",SystemConfigGroupEnum.DOMAIN), + IM_ICON_PREFIX("0", "是否加im头像前缀域名",SystemConfigGroupEnum.DOMAIN, new BooleanSystemConfigCheck()), + /** + * 业务配置 + */ RANK_LOVE_DAY_AWARD("13800,10800,8800,5800,3800,2800,2800,2800,2800,2800,2800", "魅力榜日榜前10名奖励", SystemConfigGroupEnum.BUSINESS, new NumberListSystemConfigCheck(10)), RANK_LOVE_WEEK_AWARD("88800,58800,38800,28800,18800,13800,13800,13800,13800,13800,13800,13800", "魅力榜周榜前10名奖励",SystemConfigGroupEnum.BUSINESS, new NumberListSystemConfigCheck(10)), RANK_INVITE_DAY_AWARD("13800,10800,8800,5800,3800,2800,2800,2800,2800,2800,2800", "邀请榜日榜前10名奖励",SystemConfigGroupEnum.BUSINESS,new NumberListSystemConfigCheck(10)), RANK_INVITE_WEEK_AWARD("88800,58800,38800,28800,18800,13800,13800,13800,13800,13800,13800,13800", "邀请榜周榜前10名奖励",SystemConfigGroupEnum.BUSINESS,new NumberListSystemConfigCheck(10)), - INVITE_BIND_RATE("1000", "邀请绑定成功率[0-1000]数字越大成功率越高",SystemConfigGroupEnum.BUSINESS, new RangeIntegerSystemConfigCheck(0,1000)), - OPEN_REGISTER("1", "开启注册",SystemConfigGroupEnum.BUSINESS, new BooleanSystemConfigCheck()), INIT_VIDEO_MESSAGE("提示：禁止任何涉黄、任何微信QQ引导到其它平台行为", "视频接通提示语",SystemConfigGroupEnum.BUSINESS), HOME_DIALOG_TEXT("当日邀请5个新用户充值：奖励108\n" + "当日邀请10个新用户充值：奖励168\n" + @@ -41,24 +97,9 @@ public enum SystemConfigEnum { "魅力榜，邀请榜、日榜、周榜双榜奖励！！！\n" + "单笔充值120送普通会员\n" + "单笔充值300送超级会员", "首页弹窗内容",SystemConfigGroupEnum.BUSINESS,null,"textarea"), - SHARE_TYPE("1", "分享方式 1-分享链接 2-x4y生成",SystemConfigGroupEnum.BUSINESS), - Y4X_TYPE("10021", "y4x的Type",SystemConfigGroupEnum.BUSINESS), - Y4X_TOKEN("9d42f94ebb346cd6fcd6fb5b9cddcd16", "y4x的Token",SystemConfigGroupEnum.BUSINESS), - SHARE_URL("https://h5.qx96688.com/index/invite/index", "分享链接",SystemConfigGroupEnum.BUSINESS), - SHARE_BASE_URL("https://www.baidu.com/#/share", "真实分享链接",SystemConfigGroupEnum.BUSINESS), - OPEN_MESSAGE("1", "开启聊天功能",SystemConfigGroupEnum.BUSINESS), - OPEN_VIDEO("1", "开启视频功能",SystemConfigGroupEnum.BUSINESS), -// INVITE_GIFT_RATE("100", "礼物分销成功率",SystemConfigGroupEnum.BUSINESS, new RateIntegerSystemConfigCheck()), -// INVITE_GUARD_RATE("100", "守护分销成功率",SystemConfigGroupEnum.BUSINESS, new RateIntegerSystemConfigCheck()), -// INVITE_VIDEO_RATE("100", "视频分销成功率",SystemConfigGroupEnum.BUSINESS, new RateIntegerSystemConfigCheck()), - ANCHOR_AVATAR_IGNORE_AUDIT("0", "开启主播头像免审核",SystemConfigGroupEnum.BUSINESS, new BooleanSystemConfigCheck()), - ANCHOR_ALBUM_AVATAR_IGNORE_AUDIT("0", "开启主播相册免审核",SystemConfigGroupEnum.BUSINESS, new BooleanSystemConfigCheck()), - NO_ANCHOR_AVATAR_IGNORE_AUDIT("0", "开启非主播头像免审核",SystemConfigGroupEnum.BUSINESS, new BooleanSystemConfigCheck()), - NO_ANCHOR_ALBUM_AVATAR_IGNORE_AUDIT("0", "开启非主播相册免审核",SystemConfigGroupEnum.BUSINESS, new BooleanSystemConfigCheck()), REGISTER_AWARD("88", "注册奖励",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), FAST_PAY_AWARD("300", "首充奖励",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), JOIN_ANCHOR_INVITE_AWARD("300", "主播入驻邀请人奖励",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), - LOGIN_PASSWORD_ERROR_MAX_NUM("5", "登录输错密码上限",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), GUARD_PRICE("1314", "守护价格",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), WINDOW_GIFT_THRESHOLD("10", "礼物飘窗阈值",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), WINDOW_RECHARGE_THRESHOLD("10", "充值飘窗阈值",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), @@ -74,19 +115,11 @@ public enum SystemConfigEnum { DEFAULT_PAY_INCOME_RATE("0.3", "默认分销上级充值提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), DEFAULT_PAY_POINT_RATE("0.07", "默认分销上级充值的积分提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), PAY_INCOME_RATE("0", "分销上级充值提成（配置大于0数据后将强制使用该提成）",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), -// @Deprecated -// DEFAULT_UNION_GIFT_INCOME_RATE("0.01", "默认工会礼物提成",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), DEFAULT_UNION_VIDEO_INCOME_RATE("0.01", "默认工会视频提成",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), DEFAULT_UNION_ONE_INCOME_RATE("0.07", "默认工会一级提成",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), TODAY_GREET_MAX("100", "每日主播群打招呼次数",SystemConfigGroupEnum.BUSINESS,new NumberSystemConfigCheck()), GREET_INTERVAL_MIN("30", "群打招呼的间隔时间（分钟）",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), ANCHOR_TOP_MIN("30", "小火箭置顶间隔时间（分钟）",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), - OPEN_ALI_PAY("1", "是否开启四方支付宝支付",SystemConfigGroupEnum.BUSINESS,new BooleanSystemConfigCheck()), - OPEN_SOURCE_ALI_PAY("1", "是否开启原生支付宝支付(废弃)",SystemConfigGroupEnum.BUSINESS,new BooleanSystemConfigCheck()), - OPEN_WX_PAY("1", "是否开启微信支付",SystemConfigGroupEnum.BUSINESS,new BooleanSystemConfigCheck()), - ALI_PAY_FIRST("1", "支付宝支付显示是否在前面",SystemConfigGroupEnum.BUSINESS,new BooleanSystemConfigCheck()), - OPEN_WITHDRAW("1", "是否开启提现功能",SystemConfigGroupEnum.BUSINESS,new BooleanSystemConfigCheck()), - HOME_RECOMMEND_FOLLOWS_LIMIT("20", "首页随机推荐关注用户数量",SystemConfigGroupEnum.BUSINESS,new NumberSystemConfigCheck()), WITHDRAW_RULE_REMARK("平台50元起提现，最快2小时到账（每天不限次数），22点后提现次日中午10点到账", "提现规则说明",SystemConfigGroupEnum.BUSINESS), INVITE_REMARK_RANK("(邀请上周榜排名奖励）\n" + "第一名：888元\n" + @@ -118,40 +151,25 @@ public enum SystemConfigEnum { "第五名：38元\n" + "第六至十名：28元\n" + "提示：凡是刷魅力榜的封号，平台拥有对本次活动的最终解释权。", "魅力榜榜单说明", SystemConfigGroupEnum.BUSINESS, null,"textarea"), - SENSITIVE_ENABLE("1", "是否开启手机号脱敏",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()), - OPEN_CLEAN_DYNAMIC("1", "开启动态定时清除",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()), - YUNXIN_ONLINE_ENABLE("1", "是否开启云信监控在线状态",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()), - OPEN_TEST("0", "开启测试模式",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()), - SMS_CODE_ADMIN("", "万能验证码",SystemConfigGroupEnum.SYSTEM), - PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM), - IPV6_FILTER("0", "是否开启IPV6请求拦截",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), - IPV6_FILTER_PATH("/api/auth/login", "IPV6拦截路由配置（逗号分隔）",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck(),"textarea"), - VIP_PRIVATE_PLUS("0", "开启VIP隐私模式增强模式",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()), - OPEN_ANCHOR_CHAT_COUNT("0", "开启主播主动消息统计",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()), - // 4-recordId拦截 5-recordId加强拦截 6-性别拦截 7-vip加强拦截 - IM_FILTER_PLUS("0", "IM拦截配置（勿动，开发配置）",SystemConfigGroupEnum.SYSTEM), - COS_DOMAIN("http://ap-shanghai.myqcloud.com/", "文件系统域名前缀",SystemConfigGroupEnum.SYSTEM), - PAY_LIMIT("200000", "原生支付的阈值（元）",SystemConfigGroupEnum.SYSTEM, new NumberSystemConfigCheck()), + /** + * 系统配置 + */ SYSTEM_CUSTOMER_SERVICE("2,4", "系统客服",SystemConfigGroupEnum.SYSTEM), - PRIVACY_AGREEMENT("/#/agreement/privacy", "隐私协议地址",SystemConfigGroupEnum.SYSTEM), - USER_AGREEMENT("/#/agreement/user", "用户协议地址",SystemConfigGroupEnum.SYSTEM), - OPEN_OLD_REGISTER_CODE("0", "是否开启无验证码注册接口",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), - ANCHOR_JOIN_AGREEMENT("/#/agreement/anchor-join", "主播入驻协议地址",SystemConfigGroupEnum.SYSTEM), + TD_KF("", "土豆客服账号",SystemConfigGroupEnum.SYSTEM), PAY_CUSTOM("", "支付定向测试",SystemConfigGroupEnum.SYSTEM), - WS_SOCKET_URL("ws://localhost:8080/ws?token=%s&room_id=%s", "ws通讯地址",SystemConfigGroupEnum.SYSTEM), - OPEN_NOTICE("1", "是否开启告警",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), - PAY_ERROR_NUM_NOTICE("2", "连续调用支付失败N次，发起告警",SystemConfigGroupEnum.SYSTEM, new NumberSystemConfigCheck()), - PAY_NOTIFY_ERROR_NUM_NOTICE("5", "连续调用N次支付，但是依旧未支付成功，发起告警",SystemConfigGroupEnum.SYSTEM, new NumberSystemConfigCheck()), - V12_PRIVATE_KEY_PATH("/home/server/api/sign/6888803128553.pfx", "V12德商私钥路径",SystemConfigGroupEnum.SYSTEM), - V12_PRIVATE_KEY_PASSWORD("926645", "V12德商私钥密码",SystemConfigGroupEnum.SYSTEM), - V12_XIAOCHENGXU_ORG_ID("gh_62790d4f9c57", "V12德商小程序原始id",SystemConfigGroupEnum.SYSTEM), - V12_XIAOCHENGXU_PATH("pages/zf/index?", "V12德商小程序页面路径",SystemConfigGroupEnum.SYSTEM), - V12_WX_APP_ID("wxae39c7eed3221d26", "微信开放平台ID",SystemConfigGroupEnum.SYSTEM), - UPLOAD_FILE_DOMAIN("http://127.0.0.1:8080", "文件上传域名服务器",SystemConfigGroupEnum.SYSTEM), - // 七牛云 ?imageView2/2/w/120/h/120 - // 腾讯云 ?thumbnail=120y120&imageView - IM_ICON_SUFFIX("?thumbnail=120y120&imageView", "im头像后缀",SystemConfigGroupEnum.SYSTEM), - IM_ICON_PREFIX("0", "是否加im头像前缀域名",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), + INVITE_BIND_RATE("1000", "邀请绑定成功率[0-1000]数字越大成功率越高",SystemConfigGroupEnum.SYSTEM, new RangeIntegerSystemConfigCheck(0,1000)), + OPEN_REGISTER("1", "开启注册",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), + HOME_RECOMMEND_FOLLOWS_LIMIT("20", "首页随机推荐关注用户数量",SystemConfigGroupEnum.SYSTEM,new NumberSystemConfigCheck()), + OPEN_MESSAGE("1", "开启聊天功能",SystemConfigGroupEnum.SYSTEM), + OPEN_VIDEO("1", "开启视频功能",SystemConfigGroupEnum.SYSTEM), + // INVITE_GIFT_RATE("100", "礼物分销成功率",SystemConfigGroupEnum.SYSTEM, new RateIntegerSystemConfigCheck()), +// INVITE_GUARD_RATE("100", "守护分销成功率",SystemConfigGroupEnum.SYSTEM, new RateIntegerSystemConfigCheck()), +// INVITE_VIDEO_RATE("100", "视频分销成功率",SystemConfigGroupEnum.SYSTEM, new RateIntegerSystemConfigCheck()), + ANCHOR_AVATAR_IGNORE_AUDIT("0", "开启主播头像免审核",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), + ANCHOR_ALBUM_AVATAR_IGNORE_AUDIT("0", "开启主播相册免审核",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), + NO_ANCHOR_AVATAR_IGNORE_AUDIT("0", "开启非主播头像免审核",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), + NO_ANCHOR_ALBUM_AVATAR_IGNORE_AUDIT("0", "开启非主播相册免审核",SystemConfigGroupEnum.SYSTEM, new BooleanSystemConfigCheck()), + ; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigGroupEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigGroupEnum.java index 893654ef..c6e339e0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigGroupEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigGroupEnum.java @@ -1,5 +1,10 @@ package com.ruoyi.cai.enums; public enum SystemConfigGroupEnum { - SYSTEM,BUSINESS + SYSTEM, + BUSINESS, + SECURITY, + PAY, + DOMAIN + ; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java index 6f319333..25b2fcd2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java @@ -6,6 +6,7 @@ import com.ruoyi.cai.domain.ConsumeLog; import com.ruoyi.cai.domain.Gift; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.AddRechargeOrderAdminDto; +import com.ruoyi.cai.dto.ChangePointsAdminDto; import com.ruoyi.cai.dto.admin.vo.order.UpdateAdminRechargeOrderDTO; import com.ruoyi.cai.dto.app.query.GiveGiftReq; import com.ruoyi.cai.dto.app.query.GiveGuardReq; @@ -247,4 +248,5 @@ public class ConsumerManager { } + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PointRecordLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PointRecordLogService.java index edf2ac8b..104a8ae5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PointRecordLogService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PointRecordLogService.java @@ -5,6 +5,7 @@ import com.ruoyi.cai.domain.PointRecordLog; import com.ruoyi.cai.domain.RechargeOrder; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.AddPointAdminDto; +import com.ruoyi.cai.dto.ChangePointsAdminDto; /** * 用户积分分销Service接口 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java index 45822a5d..48d7be16 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java @@ -49,13 +49,13 @@ public class PointRecordLogServiceImpl extends ServiceImpl