From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 295 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 190 insertions(+), 105 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 d154370..a98d924 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -1,23 +1,27 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.enums.FileNameType;
+import com.ruoyi.common.enums.SalesLedgerType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.other.mapper.TempFileMapper;
-import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
+import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
+import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
@@ -26,27 +30,20 @@
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.math.BigDecimal;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -72,11 +69,9 @@
private final ProductRecordMapper productRecordMapper;
- @Autowired
- private PaymentRegistrationMapper paymentRegistrationMapper;
+ private final ISalesLedgerProductService salesLedgerProductService;
- @Value("${file.upload-dir}")
- private String uploadDir;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
@Override
@@ -120,13 +115,17 @@
throw new IllegalArgumentException("閲囪喘鍙拌处璁板綍涓嶅瓨鍦紝ID: " + ticketRegistrationDto.getPurchaseLedgerId());
}
+
+
// 3. 鍒涘缓鎴栨洿鏂扮エ鎹櫥璁板疄浣�
TicketRegistration ticketRegistration = new TicketRegistration();
BeanUtils.copyProperties(ticketRegistrationDto, ticketRegistration);
ticketRegistration.setPurchaseContractNumber(purchaseLedger.getPurchaseContractNumber());
ticketRegistration.setTenantId(purchaseLedger.getTenantId());
+ ticketRegistration.setIssueDate(ticketRegistrationDto.getEntryDate());
ticketRegistration.setContractAmount(purchaseLedger.getContractAmount());
ticketRegistration.setSalesLedgerId(purchaseLedger.getSalesLedgerId());
+ ticketRegistration.setEnterDate(ticketRegistrationDto.getEnterDate());
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productData = ticketRegistrationDto.getProductData();
@@ -140,98 +139,151 @@
// 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);
+ //鍚屾鏇存柊鍏朵粬鍓╀綑鏁伴噺鍜岄噾棰�
+ productRecordMapper.update(
+ null,
+ new LambdaUpdateWrapper<ProductRecord>()
+ .eq(ProductRecord::getPurchaseLedgerId, ticketRegistrationDto.getPurchaseLedgerId())
+ .set(ProductRecord::getFutureTickets, salesLedgerProduct.getFutureTickets())
+ .set(ProductRecord::getFutureTicketsAmount, salesLedgerProduct.getFutureTicketsAmount())
+ );
+ productRecord.setSaleLedgerProjectId(salesLedgerProduct.getId());
+ productRecord.setId(null);
+ productRecord.setType("2");
+ insert += productRecordMapper.insert(productRecord);
+ }
}
- }
- // 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
- if (ticketRegistrationDto.getTempFileIds() != null && !ticketRegistrationDto.getTempFileIds().isEmpty()) {
- migrateTempFilesToFormal(ticketRegistration.getId(), ticketRegistrationDto.getTempFileIds());
+ if (insert <= 0) {
+ throw new RuntimeException("浜у搧寮�绁ㄦ暟閮戒负0锛岃妫�鏌�");
+ }
}
return rowsAffected;
}
- /**
- * 灏嗕复鏃舵枃浠惰縼绉诲埌姝ｅ紡鐩綍
- *
- * @param businessId 涓氬姟ID锛堥攢鍞彴璐D锛�
- * @param tempFileIds 涓存椂鏂囦欢ID鍒楄〃
- * @throws IOException 鏂囦欢鎿嶄綔寮傚父
- */
- private void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException {
- if (CollectionUtils.isEmpty(tempFileIds)) {
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int delRegistration(Long[] ids) {
+
+ // 鏌ヨ瑕佸垹闄ょ殑浜у搧鏉ョエ璁板綍
+ LambdaQueryWrapper<ProductRecord> productWrapper = new LambdaQueryWrapper<>();
+ productWrapper.in(ProductRecord::getId, Arrays.asList(ids));
+ List<ProductRecord> productRecords = productRecordMapper.selectList(productWrapper);
+
+ if (CollectionUtils.isEmpty(productRecords)) {
+ return 0;
+ }
+
+ // 鏀堕泦鍏宠仈ID
+ Set<Long> ticketRegistrationIds = productRecords.stream()
+ .map(ProductRecord::getTicketRegistrationId)
+ .collect(Collectors.toSet());
+
+ Set<Long> salesLedgerProductIds = productRecords.stream()
+ .map(ProductRecord::getSaleLedgerProjectId)
+ .collect(Collectors.toSet());
+
+ // 鏌ヨ鏉ョエ鐧昏
+ List<TicketRegistration> ticketRegistrations =
+ ticketRegistrationMapper.selectBatchIds(ticketRegistrationIds);
+
+ // 澶勭悊鏉ョエ鐧昏閲戦銆佷粯娆炬祦姘�
+ for (TicketRegistration ticket : ticketRegistrations) {
+
+ // 璇ユ潵绁ㄧ櫥璁颁笅鎵�鏈変骇鍝佽褰�
+ List<ProductRecord> recordsOfTicket = productRecords.stream()
+ .filter(r -> r.getTicketRegistrationId().equals(ticket.getId()))
+ .collect(Collectors.toList());
+
+ // 璁＄畻瑕佸洖閫�鐨勯噾棰�
+ BigDecimal rollbackAmount = recordsOfTicket.stream()
+ .map(ProductRecord::getTicketsAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal remain = ticket.getInvoiceAmount().subtract(rollbackAmount);
+
+ if (remain.compareTo(BigDecimal.ZERO) <= 0) {
+ // 鍒犻櫎鏉ョエ鐧昏
+ ticketRegistrationMapper.deleteById(ticket.getId());
+ // 鍒犻櫎浠樻娴佹按
+ paymentRegistrationMapper.delete(
+ new LambdaQueryWrapper<PaymentRegistration>()
+ .eq(PaymentRegistration::getTicketRegistrationId, ticket.getId())
+ );
+ } else {
+ ticket.setInvoiceAmount(remain);
+ ticketRegistrationMapper.updateById(ticket);
+ }
+ }
+
+ // 鍥為��閿�鍞彴璐︿骇鍝佺殑鏈潵绁�
+ for (ProductRecord record : productRecords) {
+
+ LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SalesLedgerProduct::getId, record.getSaleLedgerProjectId())
+ .eq(SalesLedgerProduct::getType, 2);
+
+ SalesLedgerProduct product = salesLedgerProductMapper.selectOne(wrapper);
+ if (product != null) {
+ product.setFutureTickets(
+ product.getFutureTickets().add(record.getTicketsNum())
+ );
+ product.setFutureTicketsAmount(
+ product.getFutureTicketsAmount().add(record.getTicketsAmount())
+ );
+ salesLedgerProductMapper.updateById(product);
+ }
+ }
+
+ // 鍒犻櫎浜у搧鏉ョエ璁板綍
+ productRecordMapper.delete(productWrapper);
+
+ // 閲嶆柊璁＄畻 currentInvoiceAmount
+ for (Long productId : salesLedgerProductIds) {
+ refreshCurrentInvoiceAmount(productId);
+ }
+
+ return 1;
+ }
+
+ private void refreshCurrentInvoiceAmount(Long salesLedgerProductId) {
+
+ // 鏌ヨ璇ヤ骇鍝佹渶鏂颁竴鏉℃潵绁ㄨ褰�
+ LambdaQueryWrapper<ProductRecord> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductRecord::getSaleLedgerProjectId, salesLedgerProductId)
+ .orderByDesc(ProductRecord::getCreatedAt)
+ .last("limit 1");
+
+ ProductRecord latestRecord = productRecordMapper.selectOne(wrapper);
+
+ SalesLedgerProduct product =
+ salesLedgerProductMapper.selectById(salesLedgerProductId);
+
+ if (product == null) {
return;
}
- // 鏋勫缓姝ｅ紡鐩綍璺緞锛堟寜涓氬姟绫诲瀷鍜屾棩鏈熷垎缁勶級
- String formalDir = uploadDir + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE);
-
- Path formalDirPath = Paths.get(formalDir);
-
- // 纭繚姝ｅ紡鐩綍瀛樺湪锛堥�掑綊鍒涘缓锛�
- if (!Files.exists(formalDirPath)) {
- Files.createDirectories(formalDirPath);
+ if (latestRecord == null) {
+ // 娌℃湁浠讳綍鏉ョエ璁板綍
+ product.setTicketsAmount(BigDecimal.ZERO);
+ } else {
+ // 姘歌繙鍙栨渶鏂颁竴鏉�
+ product.setTicketsAmount(latestRecord.getTicketsAmount());
}
- for (String tempFileId : tempFileIds) {
- // 鏌ヨ涓存椂鏂囦欢璁板綍
- TempFile tempFile = tempFileMapper.selectById(tempFileId);
- if (tempFile == null) {
- log.warn("涓存椂鏂囦欢涓嶅瓨鍦紝璺宠繃澶勭悊: {}", tempFileId);
- continue;
- }
-
- // 鏋勫缓姝ｅ紡鏂囦欢鍚嶏紙鍖呭惈涓氬姟ID鍜屾椂闂存埑锛岄伩鍏嶅啿绐侊級
- String originalFilename = tempFile.getOriginalName();
- String fileExtension = FilenameUtils.getExtension(originalFilename);
- String formalFilename = businessId + "_" +
- System.currentTimeMillis() + "_" +
- UUID.randomUUID().toString().substring(0, 8) +
- (com.ruoyi.common.utils.StringUtils.hasText(fileExtension) ? "." + fileExtension : "");
-
- Path formalFilePath = formalDirPath.resolve(formalFilename);
-
- try {
- // 鎵ц鏂囦欢杩佺Щ锛堜娇鐢ㄥ師瀛愭搷浣滅‘淇濆畨鍏ㄦ�э級
- Files.move(
- Paths.get(tempFile.getTempPath()),
- formalFilePath,
- StandardCopyOption.REPLACE_EXISTING,
- StandardCopyOption.ATOMIC_MOVE
- );
- log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
-
- // 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛�
- CommonFile fileRecord = new CommonFile();
- fileRecord.setCommonId(businessId);
- fileRecord.setName(originalFilename);
- fileRecord.setUrl(formalFilePath.toString());
- fileRecord.setCreateTime(LocalDateTime.now());
- fileRecord.setType(tempFile.getType());
- commonFileMapper.insert(fileRecord);
-
- log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
- } catch (IOException e) {
- log.error("鏂囦欢杩佺Щ澶辫触: {}", tempFile.getTempPath(), e);
- // 鍙�夋嫨鍥炴粴浜嬪姟鎴栬褰曞け璐ユ枃浠�
- throw new IOException("鏂囦欢杩佺Щ寮傚父", e);
- }
- }
+ salesLedgerProductMapper.updateById(product);
}
-
- @Override
- public int delRegistration(Long[] ids) {
- return ticketRegistrationMapper.deleteBatchIds(Arrays.asList(ids));
- }
@Override
public TicketRegistrationDto getRegistrationById(TicketRegistrationDto ticketRegistrationDto) {
@@ -272,12 +324,16 @@
@Override
public IPage<TicketRegistration> selectTicketRegistrationListPage(Page page, TicketRegistration ticketRegistration) {
LambdaQueryWrapper<TicketRegistration> queryWrapper = new LambdaQueryWrapper<>();
- if (StringUtils.isNotBlank(ticketRegistration.getPurchaseContractNumber())) {
- queryWrapper.like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getPurchaseContractNumber())
- .like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierName());
+ if (StringUtils.isNotBlank(ticketRegistration.getSupplierNameOrContractNo())) {
+ queryWrapper.and(wrapper -> wrapper
+ .like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getSupplierNameOrContractNo())
+ .or()
+ .like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierNameOrContractNo())
+ .or()
+ .like(TicketRegistration::getSalesContractNo, ticketRegistration.getSupplierNameOrContractNo()));
}
- if (ObjectUtils.isEmpty(ticketRegistration.getIssueDateStart())&&ObjectUtils.isEmpty(ticketRegistration.getIssueDateEnd())) {
- queryWrapper.between(TicketRegistration::getIssueDate,LocalDate.parse(ticketRegistration.getIssueDateStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd")), LocalDate.parse(ticketRegistration.getIssueDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ if (!ObjectUtils.isEmpty(ticketRegistration.getIssueDateStart()) && !ObjectUtils.isEmpty(ticketRegistration.getIssueDateEnd())) {
+ queryWrapper.between(TicketRegistration::getIssueDate, LocalDate.parse(ticketRegistration.getIssueDateStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd")), LocalDate.parse(ticketRegistration.getIssueDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
IPage<TicketRegistration> ticketRegistrationIPage = ticketRegistrationMapper.selectPage(page, queryWrapper);
// 璁＄畻宸蹭粯娆鹃噾棰�
@@ -302,9 +358,37 @@
if (ticketRegistration.getStatus()) {
ticketRegistrationIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getUnPaymentAmountTotal()));
+ ticketRegistrationIPage.setTotal(ticketRegistrationIPage.getRecords().size());
}
}
+ ticketRegistrationIPage.getRecords().forEach(item -> {
+ // 宸蹭粯娆鹃噾棰� == 寰呬粯娆鹃噾棰�
+ item.setStatusName(item.getPaymentAmountTotal().compareTo(item.getInvoiceAmount()) == 0 ? "宸插畬鎴愪粯娆�" : "鏈畬鎴愪粯娆�");
+ });
return ticketRegistrationIPage;
+ }
+
+ @Override
+ public PurchaseLedgerDto getPuargeById(Long id) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
+ PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
+ BeanUtils.copyProperties(purchaseLedger, purchaseLedgerDto);
+ SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
+ salesLedgerProduct.setSalesLedgerId(id);
+ salesLedgerProduct.setType(SalesLedgerType.SALES_LEDGER_TYPE_SALES_LEDGER.getCode());
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
+ purchaseLedgerDto.setProductData(salesLedgerProducts);
+ List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getType, FileNameType.PURCHASELEDGER.getValue())
+ .eq(CommonFile::getCommonId, id));
+ purchaseLedgerDto.setSalesLedgerFiles(commonFiles);
+ 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) {
@@ -339,16 +423,17 @@
}
// 璁＄畻 futureTickets锛堢洿鎺ヤ娇鐢� BigDecimal 璁＄畻锛岄伩鍏嶇簿搴︿涪澶憋級
- product.setFutureTickets(
- product.getQuantity()
- .subtract(product.getTicketsNum())
- );
+// product.setFutureTickets(
+// product.getQuantity()
+// .subtract(product.getTicketsNum())
+// );
+
// 璁＄畻 futureTicketsAmount
- product.setFutureTicketsAmount(
- product.getTaxInclusiveTotalPrice()
- .subtract(product.getTicketsAmount())
- );
+// product.setFutureTicketsAmount(
+// product.getTaxInclusiveTotalPrice()
+// .subtract(product.getTicketsAmount())
+// );
product.setType(type);
salesLedgerProductMapper.updateById(product);
});
--
Gitblit v1.9.3