From 64a91dc0c19b32a3f04380eb8401e9dd0987714f Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期一, 14 七月 2025 17:23:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys' --- src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java index 08bbf4b..7e76aa9 100644 --- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java +++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java @@ -30,7 +30,6 @@ import com.ruoyi.sales.pojo.CommonFile; import com.ruoyi.sales.pojo.SalesLedgerProduct; import com.ruoyi.sales.service.ISalesLedgerProductService; -import com.ruoyi.sales.service.impl.SalesLedgerProductServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; @@ -252,7 +251,43 @@ @Override public int delRegistration(Long[] ids) { - return ticketRegistrationMapper.deleteBatchIds(Arrays.asList(ids)); + // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰曞璞� + LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>(); + productRecordLambdaQueryWrapper.in(ProductRecord::getId, Arrays.asList(ids)); + List<ProductRecord> productRecords = productRecordMapper.selectList(productRecordLambdaQueryWrapper); + if(CollectionUtils.isEmpty(productRecords)){ + return 0; + } + LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>(); + ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getId, productRecords.stream().map(ProductRecord::getTicketRegistrationId).collect(Collectors.toList())); + List<TicketRegistration> ticketRegistrations = ticketRegistrationMapper.selectList(ticketRegistrationLambdaQueryWrapper); + + // 淇敼浜у搧淇℃伅 + for (ProductRecord productRecord : productRecords) { + BigDecimal subtract = ticketRegistrations.get(0).getInvoiceAmount().subtract(productRecords.get(0).getTicketsAmount()); + // 灏忎簬绛変簬0鍒犻櫎 锛屽ぇ浜�0淇敼 + if(subtract.compareTo(BigDecimal.ZERO) <= 0){ + ticketRegistrationMapper.deleteById(ticketRegistrations.get(0)); + }else if(subtract.compareTo(BigDecimal.ZERO) > 0){ + ticketRegistrations.get(0).setInvoiceAmount(subtract); + ticketRegistrationMapper.updateById(ticketRegistrations.get(0)); + } + LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>(); + salesLedgerProductLambdaQueryWrapper.eq(SalesLedgerProduct::getId, productRecord.getSaleLedgerProjectId()) + .eq(SalesLedgerProduct::getType, 2); + List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductLambdaQueryWrapper); + if(!CollectionUtils.isEmpty(salesLedgerProducts)){ + for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) { + salesLedgerProduct.setFutureTickets(salesLedgerProduct.getFutureTickets().add(productRecord.getTicketsNum())); + salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getFutureTicketsAmount().add(productRecord.getTicketsAmount())); + salesLedgerProductMapper.updateById(salesLedgerProduct); + + } + } + } + // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰� + productRecordMapper.delete(productRecordLambdaQueryWrapper); + return 1; } @Override @@ -324,6 +359,7 @@ if (ticketRegistration.getStatus()) { ticketRegistrationIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getUnPaymentAmountTotal())); + ticketRegistrationIPage.setTotal(ticketRegistrationIPage.getRecords().size()); } } return ticketRegistrationIPage; @@ -346,6 +382,12 @@ return purchaseLedgerDto; } + @Override + public List<PaymentRegistrationDto> getPaymentRegistrationDtoById(Long id) { + List<PaymentRegistrationDto> paymentRegistrationDtos =purchaseLedgerMapper.getPaymentRegistrationDtoById(id); + return paymentRegistrationDtos; + } + private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) { if (products == null || products.isEmpty()) { return; -- Gitblit v1.9.3