From ccf8e35d90bcfe06d9c28af3029c806d1ceb1b11 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期一, 14 七月 2025 15:57:43 +0800 Subject: [PATCH] yys 修改bug --- src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 68 +++++++++++++++++++++++++++++----- 1 files changed, 58 insertions(+), 10 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 99dd081..d15dc22 100644 --- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java +++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java @@ -128,6 +128,8 @@ throw new IllegalArgumentException("閲囪喘鍙拌处璁板綍涓嶅瓨鍦紝ID: " + ticketRegistrationDto.getPurchaseLedgerId()); } + + // 3. 鍒涘缓鎴栨洿鏂扮エ鎹櫥璁板疄浣� TicketRegistration ticketRegistration = new TicketRegistration(); BeanUtils.copyProperties(ticketRegistrationDto, ticketRegistration); @@ -150,15 +152,24 @@ // 6. 澧炲姞閲囪喘鍙拌处浜у搧寮�绁ㄨ褰� List<SalesLedgerProduct> salesLedgerProducts = ticketRegistrationDto.getProductData(); if (CollectionUtils.isNotEmpty(salesLedgerProducts)) { + int insert = 0 ; for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) { - ProductRecord productRecord = new ProductRecord(); - productRecord.setTicketRegistrationId(ticketRegistration.getId()); - productRecord.setPurchaseLedgerId(ticketRegistrationDto.getPurchaseLedgerId()); - productRecord.setCreatedAt(DateUtils.getNowDate()); - BeanUtils.copyProperties(salesLedgerProduct, productRecord); - productRecord.setId(null); - productRecord.setType("2"); - productRecordMapper.insert(productRecord); + //鎺掗櫎鎺夊紑绁ㄤ负0鐨勬暟鎹� + if (salesLedgerProduct.getTicketsNum() != null && salesLedgerProduct.getTicketsNum().compareTo(BigDecimal.ZERO) > 0) { + ProductRecord productRecord = new ProductRecord(); + + productRecord.setTicketRegistrationId(ticketRegistration.getId()); + productRecord.setPurchaseLedgerId(ticketRegistrationDto.getPurchaseLedgerId()); + productRecord.setCreatedAt(DateUtils.getNowDate()); + BeanUtils.copyProperties(salesLedgerProduct, productRecord); + productRecord.setSaleLedgerProjectId(salesLedgerProduct.getId()); + productRecord.setId(null); + productRecord.setType("2"); + insert = productRecordMapper.insert(productRecord); + } + if (insert <= 0) { + throw new RuntimeException("浜у搧寮�绁ㄦ暟閮戒负0锛岃妫�鏌�"); + } } } // 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰� @@ -176,7 +187,7 @@ * @param tempFileIds 涓存椂鏂囦欢ID鍒楄〃 * @throws IOException 鏂囦欢鎿嶄綔寮傚父 */ - private void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException { + public void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException { if (CollectionUtils.isEmpty(tempFileIds)) { return; } @@ -241,7 +252,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 @@ -313,6 +360,7 @@ if (ticketRegistration.getStatus()) { ticketRegistrationIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getUnPaymentAmountTotal())); + ticketRegistrationIPage.setTotal(ticketRegistrationIPage.getRecords().size()); } } return ticketRegistrationIPage; -- Gitblit v1.9.3