From 513961ecebcfd0619ede7a7edb7ac5e27de28d26 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 01 一月 2025 17:11:23 +0800 Subject: [PATCH] 增加第三方支付 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 7 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 30754e1..e2133de 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 @@ -5,11 +5,14 @@ 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.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.common.core.exception.ServiceException; @@ -23,6 +26,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDateTime; /** * <p> @@ -37,23 +41,26 @@ @Resource private TokenService tokenService; @Resource - private AppUserClient appUserClient; + private AppUserService appUserService; @Resource private VipSettingService vipSettingService; + + @Resource + private BalanceChangeRecordService balanceChangeRecordService; 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(MAX_WITHDRAWAL_AMOUNT) > 0) { + BigDecimal withdrawalAmount = params.getWithdrawalAmount(); + if (withdrawalAmount.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) { + AppUser appUser = appUserService.getById(loginUserApplet.getUserid()); + if (appUser.getWithdrawableAmount().compareTo(withdrawalAmount) < 0) { throw new ServiceException("提现失败,可提现金额不足!"); } @@ -63,22 +70,46 @@ throw new ServiceException("提现失败,当前会员等级不允许提现!"); } BigDecimal vipWithdrawalMinAmount = vipSetting.getVipWithdrawalMinAmount(); - if (params.getWithdrawalAmount().compareTo(vipWithdrawalMinAmount) < 0) { + 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(params.getWithdrawalAmount().multiply(vipWithdrawalFee))); + .subtract(multiply)); WithdrawalRequests withdrawalRequests = new WithdrawalRequests(); BeanUtils.copyBeanProp(withdrawalRequests, params); + withdrawalRequests.setWithdrawalAmount(withdrawalAmount); + withdrawalRequests.setArrivalAmount(withdrawalRequests.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)); + appUser.setWithdrawnAmount(withdrawnAmount.add(withdrawalAmount).setScale(2, RoundingMode.HALF_EVEN)); + appUser.setBalance(appUser.getBalance().subtract(withdrawalAmount).setScale(2, RoundingMode.HALF_EVEN)); + appUserService.updateById(appUser); + //添加变动明细 + BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord(); + balanceChangeRecord.setAppUserId(appUser.getId()); + balanceChangeRecord.setOrderId(withdrawalRequests.getId()); + balanceChangeRecord.setChangeType(2); + balanceChangeRecord.setBeforeAmount(balance); + balanceChangeRecord.setChangeAmount(withdrawalAmount); + balanceChangeRecord.setAfterAmount(appUser.getBalance()); + balanceChangeRecord.setDelFlag(0); + balanceChangeRecord.setCreateTime(LocalDateTime.now()); + balanceChangeRecordService.save(balanceChangeRecord); } @Override -- Gitblit v1.7.1