From 9347c9a4a91f9e0b6562fe72a25aa06a76a928e7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 09:25:33 +0800
Subject: [PATCH] refactor(account): 移除AccountExpense相关代码
---
src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
index ee69c6f..3a56560 100644
--- a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
@@ -2,20 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.AccountExpense;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.mapper.BorrowInfoMapper;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.pojo.BorrowInfo;
-import com.ruoyi.account.mapper.BorrowInfoMapper;
-import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.account.service.BorrowInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.sales.service.ReceiptPaymentService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -30,16 +27,11 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class BorrowInfoServiceImpl extends ServiceImpl<BorrowInfoMapper, BorrowInfo> implements BorrowInfoService {
- @Autowired
- private BorrowInfoMapper borrowInfoMapper;
-
- @Autowired
- private AccountIncomeService accountIncomeService;
-
- @Autowired
- private AccountExpenseService accountExpenseService;
+ private final BorrowInfoMapper borrowInfoMapper;
+ private final AccountIncomeService accountIncomeService;
@Override
public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
@@ -93,21 +85,6 @@
one.setIncomeMoney(borrowInfo.getBorrowAmount());
accountIncomeService.updateById(one);
}
- // 鏄惁涓鸿繕娆�
- if(borrowInfo.getStatus() != null && borrowInfo.getStatus() == 2){
- // 鏂板鏀嚭璁板綍
- AccountExpense accountExpense = new AccountExpense();
- accountExpense.setBusinessId(borrowInfo.getId());
- accountExpense.setBusinessType(2);
- accountExpense.setExpenseDate(DateUtils.toDate(borrowInfo.getRepayDate()));
- accountExpense.setExpenseType("4");
- accountExpense.setExpenseMoney(borrowInfo.getBorrowAmount());
- accountExpense.setExpenseDescribed("杩樻");
- accountExpense.setExpenseMethod("3");
- accountExpense.setInputTime(DateUtils.getNowDate());
- accountExpense.setInputUser(borrowInfo.getBorrowerName());
- accountExpenseService.save(accountExpense);
- }
return AjaxResult.success("淇敼鎴愬姛");
}
return AjaxResult.success("淇敼澶辫触");
@@ -121,10 +98,6 @@
accountIncomeService.remove(new LambdaQueryWrapper<AccountIncome>()
.in(AccountIncome::getBusinessId, ids)
.eq(AccountIncome::getBusinessType, 2));
- // 鍒犻櫎鏀嚭绠＄悊
- accountExpenseService.remove(new LambdaQueryWrapper<AccountExpense>()
- .in(AccountExpense::getBusinessId, ids)
- .eq(AccountExpense::getBusinessType, 2));
return AjaxResult.success("鍒犻櫎鎴愬姛");
}
return AjaxResult.success("鍒犻櫎澶辫触");
--
Gitblit v1.9.3