From 9ff7e9a2c0e6fc338d8a239566ef9346081fa672 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 09:47:41 +0800
Subject: [PATCH] refactor(account): 删除BorrowInfo借款信息相关代码及接口
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 39 ---------------------------------------
1 files changed, 0 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index 5145f4f..b3befc5 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,8 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
@@ -37,7 +35,6 @@
private final ReceiptPaymentMapper receiptPaymentMapper;
private final SalesLedgerMapper salesLedgerMapper;
private final SalesLedgerProductMapper salesLedgerProductMapper;
- private final AccountIncomeService accountIncomeService;
/**
* 鍥炴鐧昏鏂板
@@ -64,19 +61,6 @@
salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(receiptPayment.getReceiptPaymentAmount()));
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
receiptPaymentMapper.insert(receiptPayment);
- // 澧炲姞璐㈠姟鏀跺叆璁板綍
- AccountIncome accountIncome = new AccountIncome();
- accountIncome.setIncomeDate(salesLedger.getEntryDate());
- accountIncome.setIncomeType("3");
- accountIncome.setCustomerName(salesLedger.getCustomerName());
- accountIncome.setIncomeMoney(receiptPayment.getReceiptPaymentAmount());
- accountIncome.setIncomeMethod("0");
- accountIncome.setInputTime(new Date());
- accountIncome.setInputUser(salesLedger.getEntryPerson());
- accountIncome.setIncomeDescribed("鍥炴鏀跺叆");
- accountIncome.setBusinessId(Long.parseLong(receiptPayment.getId().toString()));
- accountIncome.setBusinessType(1);
- accountIncomeService.save(accountIncome);
}else {
BigDecimal subtract = byId.getReceiptPaymentAmount().subtract(receiptPayment.getReceiptPaymentAmount());
salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(subtract));
@@ -84,15 +68,6 @@
receiptPayment.setReceiptPaymentAmount(byId.getReceiptPaymentAmount());
receiptPayment.setReceiptPaymentType(byId.getReceiptPaymentType());
receiptPaymentMapper.updateById(receiptPayment);
- // 淇敼璐㈠姟鏀跺叆璁板綍
- LambdaQueryWrapper<AccountIncome> accountIncomeLambdaQueryWrapper = new LambdaQueryWrapper<>();
- accountIncomeLambdaQueryWrapper.eq(AccountIncome::getBusinessId, receiptPayment.getId())
- .eq(AccountIncome::getBusinessType, 1);
- AccountIncome accountIncome = accountIncomeService.getOne(accountIncomeLambdaQueryWrapper);
- if(null!=accountIncome){
- accountIncome.setIncomeMoney(receiptPayment.getReceiptPaymentAmount());
- accountIncomeService.updateById(accountIncome);
- }
}
salesLedgerProductMapper.updateById(salesLedgerProduct);
}
@@ -121,15 +96,6 @@
BigDecimal subtract = receiptPayment.getReceiptPaymentAmount().subtract(byId.getReceiptPaymentAmount());
salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(subtract));
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
- // 淇敼璐㈠姟鏀跺叆璁板綍
- LambdaQueryWrapper<AccountIncome> accountIncomeLambdaQueryWrapper = new LambdaQueryWrapper<>();
- accountIncomeLambdaQueryWrapper.eq(AccountIncome::getBusinessId, receiptPayment.getId())
- .eq(AccountIncome::getBusinessType, 1);
- AccountIncome accountIncome = accountIncomeService.getOne(accountIncomeLambdaQueryWrapper);
- if(null!=accountIncome){
- accountIncome.setIncomeMoney(receiptPayment.getReceiptPaymentAmount());
- accountIncomeService.updateById(accountIncome);
- }
salesLedgerProductMapper.updateById(salesLedgerProduct);
receiptPayment.setReceiptPaymentAmount(byId.getReceiptPaymentAmount());
receiptPayment.setReceiptPaymentType(byId.getReceiptPaymentType());
@@ -154,11 +120,6 @@
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
salesLedgerProductMapper.updateById(salesLedgerProduct);
}
- // 鍒犻櫎璐㈠姟鏀跺叆璁板綍
- LambdaQueryWrapper<AccountIncome> accountIncomeLambdaQueryWrapper = new LambdaQueryWrapper<>();
- accountIncomeLambdaQueryWrapper.in(AccountIncome::getBusinessId, ids)
- .eq(AccountIncome::getBusinessType, 1);
- accountIncomeService.remove(accountIncomeLambdaQueryWrapper);
return receiptPaymentMapper.delete(delQuery);
}
--
Gitblit v1.9.3