From 10d1ff54ad831fb9be2c1f2babac04fbdc25b509 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Fri, 26 Apr 2024 22:22:34 +0800 Subject: [PATCH] 123 --- .../java/com/ruoyi/cai/domain/AccountCash.java | 8 ++++++++ .../com/ruoyi/cai/enums/SystemConfigEnum.java | 1 + .../service/impl/AccountCashServiceImpl.java | 18 +++++++++++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java index 539330cd..febb645a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java @@ -50,6 +50,14 @@ public class AccountCash implements Serializable { */ @ExcelProperty(value = "提现紫贝") private Long withdrawCoin; + /** + * 提现紫贝返还值 + */ + private Long coinCallbackCoin; + /** + * 提现紫贝手续费 + */ + private Long coinFees; /** * 提现金额 */ 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 57b9b89f..f53afb2b 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 @@ -30,6 +30,7 @@ public enum SystemConfigEnum { 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()), + WITHDRAW_RATE("0.1", "提现手续费(拒绝提现不返回手续费)",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), GUARD_PRICE("1314", "守护价格",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), WINDOW_GIFT_THRESHOLD("10", "礼物飘窗阈值",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), WINDOW_RECHARGE_THRESHOLD("10", "充值飘窗阈值",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java index 78e28bc9..934b301e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.cai.service.impl; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,7 +13,9 @@ import com.ruoyi.cai.dto.admin.vo.account.ExportBatchAuditVo; import com.ruoyi.cai.dto.app.query.WithdrawReq; import com.ruoyi.cai.enums.AccountCashStatusEnum; import com.ruoyi.cai.enums.AuditStatusEnum; +import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.manager.IdManager; +import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.mapper.AccountCashMapper; import com.ruoyi.cai.notice.YunxinHttpService; import com.ruoyi.cai.notice.dto.CashSuccessSendMesDTO; @@ -20,14 +23,13 @@ import com.ruoyi.cai.pay.OrderNoUtil; import com.ruoyi.cai.pay.OrderTypeEnum; import com.ruoyi.cai.rank.RankAdminManager; import com.ruoyi.cai.rank.bean.RankAdminBean; -import com.ruoyi.cai.service.AccountCashService; import com.ruoyi.cai.service.AccountBankcardService; +import com.ruoyi.cai.service.AccountCashService; import com.ruoyi.cai.service.AccountService; import com.ruoyi.cai.service.WithdrawExchangeService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.ServletUtils; -import io.undertow.util.AttachmentList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,6 +52,8 @@ public class AccountCashServiceImpl extends ServiceImpl