diff --git a/doc/haha.sql b/doc/haha.sql index 6bf14f37..f93da9ba 100644 --- a/doc/haha.sql +++ b/doc/haha.sql @@ -1,5 +1,9 @@ ALTER TABLE `cai_account_cash` - ADD COLUMN `coin_callback_coin` int(11) NOT NULL DEFAULT 0 COMMENT '提现紫贝返还值' AFTER `withdraw_coin`, - ADD COLUMN `coin_fees` int(11) NOT NULL DEFAULT 0 COMMENT '提现紫贝手续费' AFTER `coin_callback_coin`; + ADD COLUMN `coin_callback_coin` int(11) NOT NULL DEFAULT 0 COMMENT '提现紫贝返还值' AFTER `withdraw_coin`; update cai_account_cash set coin_callback_coin = withdraw_coin; + +ALTER TABLE `cai_withdraw_exchange` + ADD COLUMN `coin_callback_num` bigint(20) NOT NULL DEFAULT 0 COMMENT '失败返还货币' AFTER `coin_num`; +update cai_withdraw_exchange +set coin_callback_num = coin_num; 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 febb645a..4bc06358 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 @@ -54,10 +54,6 @@ public class AccountCash implements Serializable { * 提现紫贝返还值 */ private Long coinCallbackCoin; - /** - * 提现紫贝手续费 - */ - private Long coinFees; /** * 提现金额 */ 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 8ff125e5..c6024f60 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,6 +37,9 @@ public class WithdrawExchange implements Serializable { @Schema(description = "所需货币") private Long coinNum; + @Schema(description = "失败返还货币") + private Long coinCallbackNum; + private Integer status; 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 f53afb2b..57b9b89f 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,7 +30,6 @@ 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 934b301e..f75bde30 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 @@ -52,8 +52,6 @@ public class AccountCashServiceImpl extends ServiceImpl