From b4aa242d1b818a8ad3a285166caedb699bbcb460 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:51:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 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 d4793f1..543c152 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
@@ -6,14 +6,27 @@
import com.mzl.flower.dto.request.wallet.CreateWalletWithdrawRecordDTO;
import com.mzl.flower.dto.response.supplier.SupplierDTO;
import com.mzl.flower.entity.wallet.WalletDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzl.flower.config.exception.ValidationException;
+import com.mzl.flower.config.security.SecurityUtils;
+import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
+import com.mzl.flower.dto.request.wallet.WalletWithdrawRecordDTO;
+import com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.time.LocalDateTime;
+import java.util.List;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -25,6 +38,8 @@
* @since 2024-10-22
*/
@Service
+@Transactional
+@RequiredArgsConstructor
public class WalletWithdrawRecordServiceImpl extends ServiceImpl<WalletWithdrawRecordMapper, WalletWithdrawRecordDO> implements WalletWithdrawRecordService {
@Autowired
private WalletService walletService;
@@ -40,7 +55,7 @@
throw new ValidationException("供应商不能为空");
}
- final WalletDO walletDO = walletService.getBySupplierId(supplierDTO.getId());
+ final WalletDO walletDO = walletService.getBySupplierId();
if(null==walletDO){
throw new ValidationException("钱包不能为空");
}
@@ -56,6 +71,30 @@
withdrawRecordDO.setMethod(Constants.WALLET_WITHDRAW_METHOD.WEIXIN.name());
withdrawRecordDO.create(SecurityUtils.getUserId());
+
+ private final WalletWithdrawRecordMapper walletWithdrawRecordMapper;
+ @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);
+ }
return save(withdrawRecordDO);
}
--
Gitblit v1.9.3