From 7b45e34503cb185eda387107b2e6bde33447f24a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 05 六月 2025 15:12:05 +0800
Subject: [PATCH] 销售台账bug修改

---
 src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java |   88 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 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 93d3783..62add42 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,24 +4,31 @@
 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.sales.dto.InvoiceLedgerDto;
 import com.ruoyi.sales.dto.ReceiptPaymentDto;
 import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
 import com.ruoyi.sales.pojo.ReceiptPayment;
+import com.ruoyi.sales.pojo.SalesLedger;
 import com.ruoyi.sales.service.ReceiptPaymentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.YearMonth;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService {
 
     @Autowired
     private ReceiptPaymentMapper receiptPaymentMapper;
+
+    @Autowired
+    private SalesLedgerMapper salesLedgerMapper;
 
     /**
      * 鍥炴鐧昏鏂板
@@ -67,7 +74,23 @@
      */
     @Override
     public IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
-        return receiptPaymentMapper.receiptPaymentListPage(page, receiptPaymentDto);
+        // 璁＄畻鍒嗛〉鍓峱age.current-1 * limit鏉℃暟鐨勭患鍚堣绠楀凡缁忔敹鍥炵殑鍥炴閲戦
+        // 璁＄畻宸茬粡鍒嗛〉鐨勬潯鏁�
+        long total = (page.getCurrent() - 1) * page.getSize();
+        BigDecimal receiptAmount = receiptPaymentMapper.getReceiptAmount(receiptPaymentDto.getCustomerId(), total);
+        if(ObjectUtils.isEmpty(receiptAmount)){
+            receiptAmount = BigDecimal.ZERO;
+        }
+        IPage<ReceiptPaymentDto> iPage = receiptPaymentMapper.receiptPaymentListPage(page, receiptPaymentDto);
+        // 寮�绁ㄦ�婚噾棰�
+        BigDecimal invoiceTotal = CollectionUtils.isEmpty(iPage.getRecords()) ? BigDecimal.ZERO : iPage.getRecords().get(0).getInvoiceTotal();
+        // 褰撳墠搴旀敹閲戦
+        BigDecimal currentUnReceiptAmount = invoiceTotal.subtract(receiptAmount);
+        for (ReceiptPaymentDto record : iPage.getRecords()) {
+            currentUnReceiptAmount = currentUnReceiptAmount.subtract(record.getReceiptPaymentAmount());
+            record.setNoReceiptAmount(currentUnReceiptAmount);
+        }
+        return iPage;
     }
 
     /**
@@ -100,4 +123,63 @@
 
         return totalContractAmount;
     }
+
+    /**
+     * 鏌ヨ宸茬粡缁戝畾鍙戠エ鐨勫紑绁ㄥ彴璐�
+     * @param page
+     * @param receiptPaymentDto
+     * @return
+     */
+    @Override
+    public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+        return receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
+    }
+
+    /**
+     * 寮�绁ㄥ彴璐﹁鎯�
+     * @param id
+     * @return
+     */
+    @Override
+    public InvoiceLedgerDto invoiceInfo(Integer id) {
+        return receiptPaymentMapper.invoiceInfo(id);
+    }
+
+    @Override
+    public Map<String,BigDecimal> getAmountMouth() {
+        List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
+        BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)
+                .filter(Objects::nonNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        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 receiveAmount = receiptPayments.stream()
+                .map(ReceiptPayment::getReceiptPaymentAmount)
+                .filter(Objects::nonNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        // 鏋勫缓缁撴灉
+        Map<String, BigDecimal> result = new HashMap<>();
+        result.put("receiveAmount", receiveAmount);
+        result.put("contractAmount", contractAmount);
+        return result;
+    }
+
+    /**
+     * 鏌ヨ鍥炴璁板綍
+     */
+    @Override
+    public List<ReceiptPaymentDto> receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto) {
+        return receiptPaymentMapper.receiptPaymentHistoryList(receiptPaymentDto);
+    }
 }

--
Gitblit v1.9.3