123

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_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`;
 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;

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;
     /**
      * 提现金额
      */

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;
 

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()),

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java

@@ -52,8 +52,6 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
     private WithdrawTotalCache withdrawTotalCache;
     @Autowired
     private RankAdminManager rankAdminManager;
-    @Autowired
-    private SystemConfigManager systemConfigManager;
     @Override
     public void withdraw(WithdrawReq res) {
         AccountBankcard one = accountBankcardService.getOne(Wrappers.lambdaQuery(AccountBankcard.class)
@@ -65,7 +63,6 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
         if(withdrawExchange == null){
             throw new ServiceException("参数不正确");
         }
-        BigDecimal withdrawRate = systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.WITHDRAW_RATE);
         Long traceId = IdManager.nextId();
         Long coinNum = withdrawExchange.getCoinNum();
         accountService.withdraw(res.getUserId(), coinNum,traceId);
@@ -74,13 +71,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
         cash.setTraceId(traceId);
         cash.setOrderNo(OrderNoUtil.createOrderNo(OrderTypeEnum.WITHDRAW_ORDER_SUB));
         cash.setWithdrawCoin(coinNum);
-        cash.setCoinFees(0L);
+        cash.setCoinCallbackCoin(withdrawExchange.getCoinCallbackNum());
-        cash.setCoinCallbackCoin(coinNum);
-        if(withdrawRate != null && !withdrawRate.equals(BigDecimal.ZERO)){
-            long coinFees = NumberUtil.mul(coinNum, withdrawRate).longValue();
-            cash.setCoinFees(coinFees);
-            cash.setCoinCallbackCoin(coinNum-coinFees);
-        }
         cash.setCashMoney(BigDecimal.valueOf(withdrawExchange.getMoney()));
         cash.setRealCashMoney(BigDecimal.valueOf(withdrawExchange.getMoney()));
         cash.setCashFees(BigDecimal.ZERO);