From 487b30b77565d9b12f203a1234a93b80a8c59177 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 20 五月 2025 13:58:00 +0800
Subject: [PATCH] 回款台账
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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 0b34ba0..93d3783 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -11,7 +11,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.YearMonth;
import java.util.List;
+import java.util.Objects;
@Service
public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService {
@@ -25,8 +29,12 @@
* @return
*/
@Override
- public int receiptPaymentAdd(ReceiptPayment receiptPayment) {
- return receiptPaymentMapper.insert(receiptPayment);
+ public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
+ if(null==receiptPayment.getId()){
+ return receiptPaymentMapper.insert(receiptPayment);
+ }else {
+ return receiptPaymentMapper.updateById(receiptPayment);
+ }
}
/**
@@ -61,4 +69,35 @@
public IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
return receiptPaymentMapper.receiptPaymentListPage(page, receiptPaymentDto);
}
+
+ /**
+ * 鍥炴鐧昏璇︽儏
+ * @param id
+ * @return
+ */
+ @Override
+ public ReceiptPaymentDto receiptPaymentInfo(Integer id) {
+ return receiptPaymentMapper.receiptPaymentInfo(id);
+ }
+
+ @Override
+ public BigDecimal getReceiptAmount() {
+ LocalDate now = LocalDate.now();
+ YearMonth currentMonth = YearMonth.from(now);
+
+ // 鍒涘缓LambdaQueryWrapper
+ LambdaQueryWrapper<ReceiptPayment> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.ge(ReceiptPayment::getReceiptPaymentDate, currentMonth.atDay(1).atStartOfDay()) // 澶т簬绛変簬鏈湀绗竴澶�
+ .lt(ReceiptPayment::getReceiptPaymentDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 灏忎簬涓嬫湀绗竴澶�
+
+ // 鎵ц鏌ヨ骞惰绠楁�诲拰
+ List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(queryWrapper);
+
+ BigDecimal totalContractAmount = receiptPayments.stream()
+ .map(ReceiptPayment::getReceiptPaymentAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ return totalContractAmount;
+ }
}
--
Gitblit v1.9.3