From 8d04ade530ef1bafe4553f6b44b561ee0faf70c2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 11 十二月 2025 17:15:00 +0800
Subject: [PATCH] yys 大修改
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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..0cde135 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,9 @@
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.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.CustomerInteractionDto;
@@ -19,6 +22,7 @@
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;
@@ -39,6 +43,8 @@
private SalesLedgerMapper salesLedgerMapper;
@Autowired
private InvoiceLedgerMapper invoiceLedgerMapper;
+ @Autowired
+ private AccountIncomeService accountIncomeService;
/**
* 鍥炴鐧昏鏂板
@@ -46,6 +52,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
ReceiptPayment byId = receiptPayment;
if (!ObjectUtils.isEmpty(receiptPayment.getId())){
@@ -64,10 +71,28 @@
throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
}
if(null==receiptPayment.getId()){
-
+ AccountIncome accountIncome = new AccountIncome();
+ accountIncome.setIncomeDate(DateUtils.toDate(receiptPayment.getReceiptPaymentDate()));
+ accountIncome.setIncomeType("0");
+ accountIncome.setCustomerName(receiptPaymentDto1.getCustomerName());
+ accountIncome.setIncomeMoney(receiptPayment.getReceiptPaymentAmount());
+ accountIncome.setIncomeMethod("0");
+ accountIncome.setInputTime(new Date());
+ accountIncome.setInputUser(receiptPayment.getRegistrant());
+ accountIncome.setIncomeDescribed("鍥炴鐧昏锛�" + invoiceLedger.getInvoiceNo());
+ accountIncome.setInvoiceNumber(invoiceLedger.getInvoiceNo());
+ accountIncomeService.save(accountIncome);
return receiptPaymentMapper.insert(receiptPayment);
}else {
-
+ AccountIncome salesLedgerDB = accountIncomeService.getByInvoiceNumber(invoiceLedger.getInvoiceNo());
+ List<AccountIncome> accountIncomeDBs = accountIncomeService.getByInvoiceNumberList(salesLedgerDB.getInvoiceNumber());
+ if (!org.springframework.util.CollectionUtils.isEmpty(accountIncomeDBs)) {
+ accountIncomeDBs.forEach(accountIncomeDB -> {
+ accountIncomeDB.setIncomeMoney(receiptPayment.getReceiptPaymentAmount());
+ accountIncomeDB.setInputUser(receiptPayment.getRegistrant());
+ accountIncomeService.updateById(accountIncomeDB);
+ });
+ }
return receiptPaymentMapper.updateById(receiptPayment);
}
}
--
Gitblit v1.9.3