From e595e12fa1ec230ec866dadbe13779765ae6d075 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 09 六月 2025 17:24:10 +0800 Subject: [PATCH] 开票台账删除 --- src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 152 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..c2b0619 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,33 @@ 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.CustomerInteractionDto; +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.*; +import java.util.stream.Collectors; @Service public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService { @Autowired private ReceiptPaymentMapper receiptPaymentMapper; + + @Autowired + private SalesLedgerMapper salesLedgerMapper; /** * 鍥炴鐧昏鏂板 @@ -67,7 +76,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 +125,128 @@ 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); + } + + /** + * 鏌ヨ鍥炴璁板綍鍒嗛〉 + */ + @Override + public IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto) { + return receiptPaymentMapper.receiptPaymentHistoryListPage(page, receiptPaymentDto); + } + + /** + * 瀹㈡埛寰�鏉ヨ褰曟煡璇� + * @param receiptPaymentDto + * @return + */ + @Override + public List<CustomerInteractionDto> customerInteractions(ReceiptPaymentDto receiptPaymentDto) { + ArrayList<CustomerInteractionDto> result = new ArrayList<>(); + List<CustomerInteractionDto> customerInteractionDtos = receiptPaymentMapper.customerInteractions(receiptPaymentDto); + if(CollectionUtils.isEmpty(customerInteractionDtos)){ + return result; + } + // 搴旀敹鎬婚噾棰濋噾棰濊绠� + BigDecimal amountTotal = BigDecimal.ZERO; + Map<LocalDate, List<CustomerInteractionDto>> dateListMap = customerInteractionDtos.stream().collect( + Collectors.groupingBy( + CustomerInteractionDto::getHappenTime, + LinkedHashMap::new, + Collectors.toList() + ) + ); + for (LocalDate localDate : dateListMap.keySet()) { + BigDecimal currentReceiptAmount = BigDecimal.ZERO; + BigDecimal invoiceAmount = BigDecimal.ZERO; + BigDecimal currentDateTotal = BigDecimal.ZERO; + List<CustomerInteractionDto> customerInteractionDtoList = dateListMap.get(localDate); + // 璁$畻褰撳ぉ鏀舵鏁� + currentReceiptAmount = customerInteractionDtoList.stream() + .filter(item ->item.getType() == 0) + .map(CustomerInteractionDto::getReceiptAmount) + .reduce(BigDecimal.ZERO,BigDecimal::add); + // 璁$畻褰撳ぉ寮�绁ㄦ暟 + invoiceAmount = customerInteractionDtoList.stream() + .filter(item ->item.getType() == 1) + .map(CustomerInteractionDto::getInvoiceAmount) + .reduce(BigDecimal.ZERO,BigDecimal::add); + // 璁$畻褰撴棩姹囨�� + currentDateTotal = currentDateTotal.add(invoiceAmount).subtract(currentReceiptAmount); + CustomerInteractionDto customerInteractionDto = new CustomerInteractionDto(); + customerInteractionDto.setHappenTime(localDate); + customerInteractionDto.setInvoiceAmount(invoiceAmount); + customerInteractionDto.setReceiptAmount(currentReceiptAmount); + amountTotal = amountTotal.add(currentDateTotal); + customerInteractionDto.setUnReceiptAmount(amountTotal); + result.add(customerInteractionDto); + } + return result; + } + + /** + * 鏌ヨ鍥炴璁板綍鍒嗛〉 + */ + @Override + public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) { + return receiptPaymentMapper.receiptPaymentHistoryListNoPage( receiptPaymentDto); + } } -- Gitblit v1.9.3