From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 23 十月 2024 10:55:24 +0800 Subject: [PATCH] fix: 冲突 --- src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 76 +++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java index 1115c0a..30ffd9f 100644 --- a/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java +++ b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java @@ -1,20 +1,92 @@ package com.mzl.flower.service.impl.wallet; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mzl.flower.config.exception.ValidationException; +import com.mzl.flower.config.security.SecurityUtils; +import com.mzl.flower.constant.Constants; +import com.mzl.flower.dto.request.wallet.CreateWalletWithdrawRecordDTO; +import com.mzl.flower.dto.request.wallet.QueryWalletDTO; +import com.mzl.flower.dto.request.wallet.WalletWithdrawRecordDTO; +import com.mzl.flower.dto.response.supplier.SupplierDTO; +import com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO; +import com.mzl.flower.entity.wallet.WalletDO; import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO; import com.mzl.flower.mapper.wallet.WalletWithdrawRecordMapper; +import com.mzl.flower.service.supplier.SupplierService; +import com.mzl.flower.service.wallet.WalletService; import com.mzl.flower.service.wallet.WalletWithdrawRecordService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.time.LocalDateTime; +import java.util.List; /** * <p> - * 服务实现类 + * 服务实现类 * </p> * * @author @TaoJie * @since 2024-10-22 */ @Service +@Transactional +@RequiredArgsConstructor public class WalletWithdrawRecordServiceImpl extends ServiceImpl<WalletWithdrawRecordMapper, WalletWithdrawRecordDO> implements WalletWithdrawRecordService { + private final WalletWithdrawRecordMapper walletWithdrawRecordMapper; + private final WalletService walletService; + private final SupplierService supplierService; + + @Transactional + @Override + public boolean create(CreateWalletWithdrawRecordDTO dto) { + SupplierDTO supplierDTO = supplierService.getCurrentSupplier(); + if (null == supplierDTO) { + throw new ValidationException("供应商不能为空"); + } + + final WalletDO walletDO = walletService.getBySupplierId(); + if (null == walletDO) { + throw new ValidationException("钱包不能为空"); + } + // 查看钱包的金额是不是大于要提现的金额 + if (null != walletDO.getWithdrawableAmount() && null != dto.getAmount() && walletDO.getWithdrawableAmount().compareTo(dto.getAmount()) < 0) { + throw new ValidationException("钱包金额不足"); + } + WalletWithdrawRecordDO withdrawRecordDO = new WalletWithdrawRecordDO(); + withdrawRecordDO.setAmount(dto.getAmount()); + withdrawRecordDO.setSupplierId(supplierDTO.getId()); + withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.WAITING.name()); + withdrawRecordDO.setMethod(Constants.WALLET_WITHDRAW_METHOD.WEIXIN.name()); + withdrawRecordDO.create(SecurityUtils.getUserId()); + return save(withdrawRecordDO); + } + + @Override + public Page<WalletWithdrawRecordVO> queryPage(QueryWalletDTO queryWalletDTO, Page page) { + List<WalletWithdrawRecordVO> list = walletWithdrawRecordMapper.queryPage(queryWalletDTO, page); + page.setRecords(list); + return page; + } + + @Override + public void updateWallet(WalletWithdrawRecordDTO walletWithdrawRecordDTO) { + WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletWithdrawRecordDTO.getId()); + if (withdrawRecordDO == null) { + throw new ValidationException("提现记录信息不存在"); + } + if (StringUtils.isEmpty(walletWithdrawRecordDTO.getApproveState())) { + throw new ValidationException("审批状态不能为空"); + } + BeanUtils.copyProperties(walletWithdrawRecordDTO, withdrawRecordDO); + withdrawRecordDO.update(SecurityUtils.getUserId()); + withdrawRecordDO.setApproveBy(SecurityUtils.getUserId()); + withdrawRecordDO.setApproveTime(LocalDateTime.now()); + walletWithdrawRecordMapper.updateById(withdrawRecordDO); + } } -- Gitblit v1.9.3