From 6b36f5df29db44faea5a8074aa62ba2ecdeef859 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 11:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 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 d5749a3..30754e1 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,21 +1,28 @@
package com.ruoyi.account.service.impl;
+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.UserClickLog;
+import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
import com.ruoyi.account.mapper.WithdrawalRequestsMapper;
-import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.service.VipSettingService;
import com.ruoyi.account.service.WithdrawalRequestsService;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
/**
* <p>
@@ -31,17 +38,40 @@
private TokenService tokenService;
@Resource
private AppUserClient appUserClient;
+ @Resource
+ private VipSettingService vipSettingService;
+
+ public static final BigDecimal MAX_WITHDRAWAL_AMOUNT = new BigDecimal("200");
+ public static final BigDecimal VIP_WITHDRAWAL_FEE_DENOMINATOR = new BigDecimal("100");
@Override
public void withdrawalApply(WithdrawalRequestsDTO params) {
- if (params.getWithdrawalAmount().compareTo(new BigDecimal("200")) > 0) {
+ if (params.getWithdrawalAmount().compareTo(MAX_WITHDRAWAL_AMOUNT) > 0) {
throw new ServiceException("提现失败，单次提现金额不能超过200元！");
}
+
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
+
if (appUser.getWithdrawableAmount().compareTo(params.getWithdrawalAmount()) < 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 (params.getWithdrawalAmount().compareTo(vipWithdrawalMinAmount) < 0) {
+ throw new ServiceException("提现失败，提现金额不能小于" + vipWithdrawalMinAmount + "元！");
+ }
+ // 提现手续费
+ BigDecimal vipWithdrawalFee = vipSetting.getVipWithdrawalFee()
+ .divide(VIP_WITHDRAWAL_FEE_DENOMINATOR, 2, RoundingMode.HALF_UP);
+ // 减去手续费
+ params.setWithdrawalAmount(params.getWithdrawalAmount()
+ .subtract(params.getWithdrawalAmount().multiply(vipWithdrawalFee)));
WithdrawalRequests withdrawalRequests = new WithdrawalRequests();
BeanUtils.copyBeanProp(withdrawalRequests, params);
@@ -50,4 +80,14 @@
withdrawalRequests.setAuditStatus(1);
save(withdrawalRequests);
}
+
+ @Override
+ public IPage<WithdrawalRequests> pageList(WithQuery withQuery) {
+ Page<UserClickLog> page = new Page<>();
+ page.setCurrent(withQuery.getPageNum());
+ page.setSize(withQuery.getPageSize());
+ IPage<WithdrawalRequests> shopIPage = this.baseMapper.pageList(page, withQuery);
+ return shopIPage;
+ }
+
}
--
Gitblit v1.7.1