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 | 46 ++++++++++++----------------------------------
1 files changed, 12 insertions(+), 34 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 950237f..3a56560 100644
--- a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
@@ -4,15 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.mapper.BorrowInfoMapper;
-import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.pojo.BorrowInfo;
-import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.account.service.BorrowInfoService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -34,10 +32,9 @@
private final BorrowInfoMapper borrowInfoMapper;
private final AccountIncomeService accountIncomeService;
- private final AccountExpenseService accountExpenseService;
@Override
- public R<?> listPage(Page page, BorrowInfo borrowInfo) {
+ public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(borrowInfo != null){
if(StringUtils.isNotEmpty(borrowInfo.getEntryDateStart()) && StringUtils.isNotEmpty(borrowInfo.getEntryDateEnd())){
@@ -51,11 +48,11 @@
borrowInfoLambdaQueryWrapper.like(BorrowInfo::getBorrowerName, borrowInfo.getBorrowerName());
}
}
- return R.ok(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
+ return AjaxResult.success(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
}
@Override
- public R<?> add(BorrowInfo borrowInfo) {
+ public AjaxResult add(BorrowInfo borrowInfo) {
int insert = borrowInfoMapper.insert(borrowInfo);
if(insert > 0){
// 娣诲姞鎴愬姛锛岃繘鍏ユ敹鍏ョ鐞�
@@ -70,13 +67,13 @@
accountIncome.setInputTime(DateUtils.getNowDate());
accountIncome.setInputUser(borrowInfo.getBorrowerName());
accountIncomeService.save(accountIncome);
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
- return R.ok(null, "娣诲姞澶辫触");
+ return AjaxResult.success("娣诲姞澶辫触");
}
@Override
- public R<?> updateBorrowInfo(BorrowInfo borrowInfo) {
+ public AjaxResult updateBorrowInfo(BorrowInfo borrowInfo) {
int update = borrowInfoMapper.updateById(borrowInfo);
if(update > 0){
// 淇敼鎴愬姛锛屼慨鏀规敹鍏ョ鐞�
@@ -88,40 +85,21 @@
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("5");
- accountExpense.setExpenseMoney(borrowInfo.getBorrowAmount());
- accountExpense.setExpenseDescribed("杩樻");
- accountExpense.setExpenseMethod("3");
- accountExpense.setInputTime(DateUtils.getNowDate());
- accountExpense.setInputUser(borrowInfo.getBorrowerName());
- accountExpenseService.save(accountExpense);
- }
- return R.ok(null, "淇敼鎴愬姛");
+ return AjaxResult.success("淇敼鎴愬姛");
}
- return R.ok(null, "淇敼澶辫触");
+ return AjaxResult.success("淇敼澶辫触");
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
int delete = borrowInfoMapper.deleteBatchIds(ids);
if(delete > 0){
// 鍒犻櫎鎴愬姛锛屽垹闄ゆ敹鍏ョ鐞�
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 R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
- return R.ok(null, "鍒犻櫎澶辫触");
+ return AjaxResult.success("鍒犻櫎澶辫触");
}
}
--
Gitblit v1.9.3