From 0050395dfb05425f0a929bc1587b971d78f1e95e Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期一, 26 五月 2025 17:47:28 +0800 Subject: [PATCH] 首页数据排序 --- src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 1 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..16cc5e9 100644 --- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java +++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java @@ -4,17 +4,24 @@ 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.HashMap; import java.util.List; +import java.util.Map; import java.util.Objects; @Service @@ -22,6 +29,9 @@ @Autowired private ReceiptPaymentMapper receiptPaymentMapper; + + @Autowired + private SalesLedgerMapper salesLedgerMapper; /** * 鍥炴鐧昏鏂板 @@ -67,7 +77,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 +126,55 @@ 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; + } } -- Gitblit v1.9.3