From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
index e2133de..70092ba 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
@@ -1,20 +1,16 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.api.model.BalanceChangeRecord;
-import com.ruoyi.account.api.model.UserClickLog;
-import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.api.model.*;
import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
import com.ruoyi.account.mapper.WithdrawalRequestsMapper;
-import com.ruoyi.account.service.AppUserService;
-import com.ruoyi.account.service.BalanceChangeRecordService;
-import com.ruoyi.account.service.VipSettingService;
-import com.ruoyi.account.service.WithdrawalRequestsService;
+import com.ruoyi.account.service.*;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
@@ -50,49 +46,62 @@
public static final BigDecimal MAX_WITHDRAWAL_AMOUNT = new BigDecimal("200");
public static final BigDecimal VIP_WITHDRAWAL_FEE_DENOMINATOR = new BigDecimal("100");
+
+ @Resource
+ private AppUserBankService appUserBankService;
@Override
public void withdrawalApply(WithdrawalRequestsDTO params) {
BigDecimal withdrawalAmount = params.getWithdrawalAmount();
- if (withdrawalAmount.compareTo(MAX_WITHDRAWAL_AMOUNT) > 0) {
+ if (withdrawalAmount.compareTo(MAX_WITHDRAWAL_AMOUNT) > 0 && params.getWithdrawalMethod().equals(1)) {
throw new ServiceException("提现失败，单次提现金额不能超过200元！");
}
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
+ Integer vipId = appUser.getVipId();
+ VipSetting vipSetting = vipSettingService.getVipSettingById(vipId);
+ BigDecimal withdrawableAmount = appUser.getWithdrawableAmount();
+
+ BigDecimal vipWithdrawalMinAmount = vipSetting.getVipWithdrawalMinAmount();
+ if (vipWithdrawalMinAmount.compareTo(withdrawableAmount) > 0) {
+ throw new ServiceException("提现失败，提现门槛为："+vipWithdrawalMinAmount+"元！");
+ }
+
if (appUser.getWithdrawableAmount().compareTo(withdrawalAmount) < 0) {
throw new ServiceException("提现失败，可提现金额不足！");
}
- Integer vipId = appUser.getVipId();
- VipSetting vipSetting = vipSettingService.getVipSettingById(vipId);
+
if (vipSetting.getVipWithdrawalRole() == 0) {
throw new ServiceException("提现失败，当前会员等级不允许提现！");
}
- BigDecimal vipWithdrawalMinAmount = vipSetting.getVipWithdrawalMinAmount();
- if (withdrawalAmount.compareTo(vipWithdrawalMinAmount) < 0) {
- throw new ServiceException("提现失败，提现金额不能小于" + vipWithdrawalMinAmount + "元！");
- }
-
+
// 提现手续费
BigDecimal vipWithdrawalFee = vipSetting.getVipWithdrawalFee()
.divide(VIP_WITHDRAWAL_FEE_DENOMINATOR, 2, RoundingMode.HALF_UP);
// 减去手续费
BigDecimal multiply = params.getWithdrawalAmount().multiply(vipWithdrawalFee);
- params.setWithdrawalAmount(params.getWithdrawalAmount()
- .subtract(multiply));
+ params.setWithdrawalAmount(params.getWithdrawalAmount().subtract(multiply));
WithdrawalRequests withdrawalRequests = new WithdrawalRequests();
BeanUtils.copyBeanProp(withdrawalRequests, params);
+ if(2 == params.getWithdrawalMethod()){
+ AppUserBank appUserBank = appUserBankService.getOne(new LambdaQueryWrapper<AppUserBank>().eq(AppUserBank::getAppUserId, loginUserApplet.getUserid()));
+ if(null == appUserBank){
+ throw new ServiceException("请先添加提款账户！");
+ }
+ withdrawalRequests.setAccountHolder(appUserBank.getBankName());
+ withdrawalRequests.setBankCardNumber(appUserBank.getBankNumber());
+ }
withdrawalRequests.setWithdrawalAmount(withdrawalAmount);
- withdrawalRequests.setArrivalAmount(withdrawalRequests.getWithdrawalAmount());
+ withdrawalRequests.setArrivalAmount(params.getWithdrawalAmount());
withdrawalRequests.setServiceCharge(multiply);
withdrawalRequests.setDelFlag(0);
withdrawalRequests.setAppUserId(SecurityUtils.getUserId());
withdrawalRequests.setAuditStatus(1);
save(withdrawalRequests);
//修改用户的可提现金额
- BigDecimal withdrawableAmount = appUser.getWithdrawableAmount();
BigDecimal withdrawnAmount = appUser.getWithdrawnAmount();
BigDecimal balance = appUser.getBalance();
appUser.setWithdrawableAmount(withdrawableAmount.subtract(withdrawalAmount).setScale(2, RoundingMode.HALF_EVEN));
@@ -102,13 +111,13 @@
//添加变动明细
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setOrderId(withdrawalRequests.getId());
balanceChangeRecord.setChangeType(2);
- balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(withdrawalAmount);
- balanceChangeRecord.setAfterAmount(appUser.getBalance());
balanceChangeRecord.setDelFlag(0);
balanceChangeRecord.setCreateTime(LocalDateTime.now());
+ balanceChangeRecord.setChangeDirection(-1);
balanceChangeRecordService.save(balanceChangeRecord);
}
--
Gitblit v1.7.1