From 2ab6b6860e4f7bee67a0f66831b9b1fb0f420710 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 10:45:01 +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/sales/service/impl/ReceiptPaymentServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 15febe9..1762e02 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -27,7 +27,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
@@ -79,9 +79,9 @@
// 澧炲姞璐㈠姟鏀跺叆璁板綍
AccountIncome accountIncome = new AccountIncome();
accountIncome.setIncomeDate(salesLedger.getEntryDate());
- accountIncome.setIncomeType("0");
+ accountIncome.setIncomeType("3");
accountIncome.setCustomerName(salesLedger.getCustomerName());
- accountIncome.setIncomeMoney(salesLedger.getContractAmount());
+ accountIncome.setIncomeMoney(receiptPayment.getReceiptPaymentAmount());
accountIncome.setIncomeMethod("0");
accountIncome.setInputTime(new Date());
accountIncome.setInputUser(salesLedger.getEntryPerson());
--
Gitblit v1.9.3