From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 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..950237f 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,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.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 com.ruoyi.framework.web.domain.R;
+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,19 +29,15 @@
*/
@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;
+ private final AccountExpenseService accountExpenseService;
@Override
- public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
+ public R<?> listPage(Page page, BorrowInfo borrowInfo) {
LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(borrowInfo != null){
if(StringUtils.isNotEmpty(borrowInfo.getEntryDateStart()) && StringUtils.isNotEmpty(borrowInfo.getEntryDateEnd())){
@@ -56,11 +51,11 @@
borrowInfoLambdaQueryWrapper.like(BorrowInfo::getBorrowerName, borrowInfo.getBorrowerName());
}
}
- return AjaxResult.success(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
+ return R.ok(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
}
@Override
- public AjaxResult add(BorrowInfo borrowInfo) {
+ public R<?> add(BorrowInfo borrowInfo) {
int insert = borrowInfoMapper.insert(borrowInfo);
if(insert > 0){
// 娣诲姞鎴愬姛锛岃繘鍏ユ敹鍏ョ鐞�
@@ -75,13 +70,13 @@
accountIncome.setInputTime(DateUtils.getNowDate());
accountIncome.setInputUser(borrowInfo.getBorrowerName());
accountIncomeService.save(accountIncome);
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
- return AjaxResult.success("娣诲姞澶辫触");
+ return R.ok(null, "娣诲姞澶辫触");
}
@Override
- public AjaxResult updateBorrowInfo(BorrowInfo borrowInfo) {
+ public R<?> updateBorrowInfo(BorrowInfo borrowInfo) {
int update = borrowInfoMapper.updateById(borrowInfo);
if(update > 0){
// 淇敼鎴愬姛锛屼慨鏀规敹鍏ョ鐞�
@@ -100,7 +95,7 @@
accountExpense.setBusinessId(borrowInfo.getId());
accountExpense.setBusinessType(2);
accountExpense.setExpenseDate(DateUtils.toDate(borrowInfo.getRepayDate()));
- accountExpense.setExpenseType("4");
+ accountExpense.setExpenseType("5");
accountExpense.setExpenseMoney(borrowInfo.getBorrowAmount());
accountExpense.setExpenseDescribed("杩樻");
accountExpense.setExpenseMethod("3");
@@ -108,13 +103,13 @@
accountExpense.setInputUser(borrowInfo.getBorrowerName());
accountExpenseService.save(accountExpense);
}
- return AjaxResult.success("淇敼鎴愬姛");
+ return R.ok(null, "淇敼鎴愬姛");
}
- return AjaxResult.success("淇敼澶辫触");
+ return R.ok(null, "淇敼澶辫触");
}
@Override
- public AjaxResult delete(List<Long> ids) {
+ public R<?> delete(List<Long> ids) {
int delete = borrowInfoMapper.deleteBatchIds(ids);
if(delete > 0){
// 鍒犻櫎鎴愬姛锛屽垹闄ゆ敹鍏ョ鐞�
@@ -125,8 +120,8 @@
accountExpenseService.remove(new LambdaQueryWrapper<AccountExpense>()
.in(AccountExpense::getBusinessId, ids)
.eq(AccountExpense::getBusinessType, 2));
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
- return AjaxResult.success("鍒犻櫎澶辫触");
+ return R.ok(null, "鍒犻櫎澶辫触");
}
}
--
Gitblit v1.9.3