From 1ab612fa454477bfaec03b0fe9133f8881ce29cc Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 16:16:02 +0800
Subject: [PATCH] yys 回款---财务收入，付款---财务支出
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 196 +++++++++++++++++++++++++++++--------------------
1 files changed, 116 insertions(+), 80 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 ae93c3b..7f9b4cd 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,6 +4,8 @@
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.CustomerInteractionDto;
@@ -13,12 +15,15 @@
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ReceiptPaymentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
@@ -37,39 +42,73 @@
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+
+ @Autowired
+ private SalesLedgerProductMapper salesLedgerProductMapper;
@Autowired
private InvoiceLedgerMapper invoiceLedgerMapper;
+ @Autowired
+ private AccountIncomeService accountIncomeService;
+
/**
* 鍥炴鐧昏鏂板
- * @param receiptPayment
+ * @param receiptPaymentList
* @return
*/
@Override
- public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
- ReceiptPayment byId = receiptPayment;
- if (!ObjectUtils.isEmpty(receiptPayment.getId())){
- byId = this.getById(receiptPayment.getId());
+ @Transactional(rollbackFor = Exception.class)
+ public int receiptPaymentSaveOrUpdate(List<ReceiptPayment> receiptPaymentList) {
+ for (ReceiptPayment receiptPayment : receiptPaymentList) {
+ ReceiptPayment byId = receiptPayment;
+ if (!ObjectUtils.isEmpty(receiptPayment.getId())){
+ receiptPayment = this.getById(receiptPayment.getId());
+ }
+ SalesLedger salesLedger = salesLedgerMapper.selectById(receiptPayment.getSalesLedgerId());
+ if(null==salesLedger) throw new RuntimeException("鏈壘鍒伴攢鍞崟");
+ // 宸插洖娆鹃噾棰�
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(receiptPayment.getSalesLedgerProductId());
+ if(null==salesLedgerProduct) throw new RuntimeException("鏈壘鍒伴攢鍞崟浜у搧");
+ if (salesLedgerProduct.getPendingInvoiceTotal().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
+ throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
+ }
+ if(null==receiptPayment.getId()){
+ 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("0");
+ accountIncome.setCustomerName(salesLedger.getCustomerName());
+ accountIncome.setIncomeMoney(salesLedger.getContractAmount());
+ 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 = receiptPayment.getReceiptPaymentAmount().subtract(byId.getReceiptPaymentAmount());
+ salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(subtract));
+ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ 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);
}
- InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectById(byId.getInvoiceLedgerId());
- Page<ReceiptPaymentDto> objectPage = new Page<>();
- ReceiptPaymentDto receiptPaymentDto = new ReceiptPaymentDto();
- receiptPaymentDto.setInvoiceLedgerId(invoiceLedger.getId());
- IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(objectPage, receiptPaymentDto);
- ReceiptPaymentDto receiptPaymentDto1 = receiptPaymentDtoIPage.getRecords().get(0);
- if (!ObjectUtils.isEmpty(byId.getId())){
- receiptPaymentDto1.setNoReceiptAmount(receiptPaymentDto1.getNoReceiptAmount().add(byId.getReceiptPaymentAmount()));
- }
- if (receiptPaymentDto1.getNoReceiptAmount().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
- throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
- }
- if(null==receiptPayment.getId()){
-
- return receiptPaymentMapper.insert(receiptPayment);
- }else {
-
- return receiptPaymentMapper.updateById(receiptPayment);
- }
+ return 1;
}
/**
@@ -79,6 +118,33 @@
*/
@Override
public int receiptPaymentUpdate(ReceiptPayment receiptPayment) {
+ ReceiptPayment byId = receiptPayment;
+ if (!ObjectUtils.isEmpty(receiptPayment.getId())){
+ receiptPayment = this.getById(receiptPayment.getId());
+ }
+ SalesLedger salesLedger = salesLedgerMapper.selectById(receiptPayment.getSalesLedgerId());
+ if(null==salesLedger) throw new RuntimeException("鏈壘鍒伴攢鍞崟");
+ // 宸插洖娆鹃噾棰�
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(receiptPayment.getSalesLedgerProductId());
+ if(null==salesLedgerProduct) throw new RuntimeException("鏈壘鍒伴攢鍞崟浜у搧");
+ if (salesLedgerProduct.getPendingInvoiceTotal().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
+ throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
+ }
+ 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());
return receiptPaymentMapper.updateById(receiptPayment);
}
@@ -91,6 +157,20 @@
public int receiptPaymentDel(List<Integer> ids) {
LambdaQueryWrapper<ReceiptPayment> delQuery = new LambdaQueryWrapper<>();
delQuery.in(ReceiptPayment::getId, ids);
+ List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(delQuery);
+ if(CollectionUtils.isEmpty(receiptPayments)) throw new RuntimeException("鏈壘鍒板洖娆剧櫥璁�");
+ // 閲嶆柊璁＄畻閿�鍞骇鍝佸洖娆鹃噾棰�
+ for (ReceiptPayment receiptPayment : receiptPayments) {
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(receiptPayment.getSalesLedgerProductId());
+ salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().subtract(receiptPayment.getReceiptPaymentAmount()));
+ 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);
}
@@ -161,9 +241,16 @@
@Override
public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
- if (receiptPaymentDto.getStatus()) {
- receiptPaymentDtoIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
- }
+// if (receiptPaymentDto.getStatus()) {
+// long count = receiptPaymentDtoIPage.getRecords()
+// .stream()
+// .filter(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()))
+// .count();
+// receiptPaymentDtoIPage
+// .getRecords()
+// .removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
+// receiptPaymentDtoIPage.setTotal(receiptPaymentDtoIPage.getTotal() - count);
+// }
receiptPaymentDtoIPage.getRecords().forEach(item -> {
// 姣旇緝鍥炴閲戦 == 寰呭洖娆鹃噾棰�
if (item.getInvoiceTotal().compareTo(item.getReceiptPaymentAmountTotal()) == 0) {
@@ -238,59 +325,8 @@
* @return
*/
@Override
- public List<CustomerInteractionDto> customerInteractions(ReceiptPaymentDto receiptPaymentDto) {
- ArrayList<CustomerInteractionDto> result = new ArrayList<>();
- List<CustomerInteractionDto> customerInteractionDtos = receiptPaymentMapper.customerInteractions(receiptPaymentDto);
- if(CollectionUtils.isEmpty(customerInteractionDtos)){
- return result;
- }
- // 搴旀敹鎬婚噾棰濋噾棰濊绠�
- BigDecimal amountTotal = BigDecimal.ZERO;
- Map<LocalDate, List<CustomerInteractionDto>> dateListMap = customerInteractionDtos.stream().collect(
- Collectors.groupingBy(
- CustomerInteractionDto::getHappenTime,
- LinkedHashMap::new,
- Collectors.toList()
- )
- );
- for (LocalDate localDate : dateListMap.keySet()) {
- BigDecimal currentReceiptAmount = BigDecimal.ZERO;
- BigDecimal invoiceAmount = BigDecimal.ZERO;
- BigDecimal currentDateTotal = BigDecimal.ZERO;
- List<CustomerInteractionDto> customerInteractionDtoList = dateListMap.get(localDate);
- // 璁＄畻褰撳ぉ鏀舵鏁�
- currentReceiptAmount = customerInteractionDtoList.stream()
- .filter(item ->item.getType() == 0)
- .map(CustomerInteractionDto::getReceiptAmount)
- .reduce(BigDecimal.ZERO,BigDecimal::add);
- // 璁＄畻褰撳ぉ寮�绁ㄦ暟
- invoiceAmount = customerInteractionDtoList.stream()
- .filter(item ->item.getType() == 1)
- .map(CustomerInteractionDto::getInvoiceAmount)
- .reduce(BigDecimal.ZERO,BigDecimal::add);
- // 璁＄畻褰撴棩姹囨��
- currentDateTotal = currentDateTotal.add(invoiceAmount).subtract(currentReceiptAmount);
- CustomerInteractionDto customerInteractionDto = new CustomerInteractionDto();
- customerInteractionDto.setHappenTime(localDate);
- customerInteractionDto.setInvoiceAmount(invoiceAmount);
- customerInteractionDto.setReceiptAmount(currentReceiptAmount);
- amountTotal = customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount());
- customerInteractionDto.setUnReceiptAmount(amountTotal);
- result.add(customerInteractionDto);
- }
- ArrayList<CustomerInteractionDto> newResult = new ArrayList<>();
- for (int i = 0; i < result.size(); i++) {
- CustomerInteractionDto customerInteractionDto = result.get(i);
- if (i == 0) {
- customerInteractionDto.setUnReceiptAmount(customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount()));
- }else {
- CustomerInteractionDto customerInteractionDto1 = result.get(i-1);
- customerInteractionDto.setUnReceiptAmount(customerInteractionDto1.getUnReceiptAmount()
- .add(customerInteractionDto.getInvoiceAmount()).subtract(customerInteractionDto.getReceiptAmount()));
- }
- newResult.add(customerInteractionDto);
- }
- return newResult;
+ public List<InvoiceLedgerDto> customerInteractions(InvoiceLedgerDto receiptPaymentDto) {
+ return receiptPaymentMapper.invoiceLedgerSalesAccount(receiptPaymentDto);
}
/**
--
Gitblit v1.9.3