From b5f919e8cc4301b71ff6b12de93f7aefc823ca6d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 21 十月 2025 09:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 203 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 167 insertions(+), 36 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 f007f6e..8fc333d 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -1,8 +1,13 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
@@ -10,6 +15,7 @@
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;
@@ -23,6 +29,7 @@
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;
@@ -70,6 +77,9 @@
private final ProductRecordMapper productRecordMapper;
@Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
+
+ @Autowired
private PaymentRegistrationMapper paymentRegistrationMapper;
@Value("${file.upload-dir}")
@@ -86,20 +96,21 @@
}
List<TicketRegistration> ticketRegistrationList = ticketRegistrationMapper.selectList(queryWrapper);
// 璁＄畻宸蹭粯娆鹃噾棰�
- if(CollectionUtils.isNotEmpty(ticketRegistrationList)){
+ if (CollectionUtils.isNotEmpty(ticketRegistrationList)) {
List<Long> ids = ticketRegistrationList.stream().map(TicketRegistration::getId).collect(Collectors.toList());
List<PaymentRegistrationDto> paymentRegistrationDtoList = paymentRegistrationMapper.countPaymentTotalByTicketRegId(ids);
for (TicketRegistration registration : ticketRegistrationList) {
+ BigDecimal paymentAmountTotal = BigDecimal.ZERO;
for (PaymentRegistrationDto paymentRegistrationDto : paymentRegistrationDtoList) {
- if(registration.getId().equals(paymentRegistrationDto.getTicketRegistrationId())){
- BigDecimal paymentAmountTotal = paymentRegistrationDto.getPaymentAmountTotal();
- BigDecimal invoiceAmount = registration.getInvoiceAmount();
- registration.setPaymentAmountTotal(paymentAmountTotal);
- BigDecimal subtractAmount = invoiceAmount.subtract(paymentAmountTotal);
- registration.setUnPaymentAmountTotal(subtractAmount);
+ if (registration.getId().equals(paymentRegistrationDto.getTicketRegistrationId())) {
+ paymentAmountTotal = paymentRegistrationDto.getPaymentAmountTotal();
break;
}
}
+ BigDecimal invoiceAmount = registration.getInvoiceAmount();
+ BigDecimal subtractAmount = invoiceAmount.subtract(paymentAmountTotal);
+ registration.setPaymentAmountTotal(paymentAmountTotal);
+ registration.setUnPaymentAmountTotal(subtractAmount);
}
}
@@ -116,13 +127,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.getIssueDate());
ticketRegistration.setContractAmount(purchaseLedger.getContractAmount());
ticketRegistration.setSalesLedgerId(purchaseLedger.getSalesLedgerId());
+ ticketRegistration.setEnterDate(ticketRegistrationDto.getEnterDate());
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productData = ticketRegistrationDto.getProductData();
@@ -135,16 +150,25 @@
// 6. 澧炲姞閲囪喘鍙拌处浜у搧寮�绁ㄨ褰�
List<SalesLedgerProduct> salesLedgerProducts = ticketRegistrationDto.getProductData();
- if (CollectionUtils.isNotEmpty(salesLedgerProducts)){
+ 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锛岃妫�鏌�");
+ }
}
}
// 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
@@ -162,7 +186,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;
}
@@ -188,21 +212,25 @@
// 鏋勫缓姝ｅ紡鏂囦欢鍚嶏紙鍖呭惈涓氬姟ID鍜屾椂闂存埑锛岄伩鍏嶅啿绐侊級
String originalFilename = tempFile.getOriginalName();
String fileExtension = FilenameUtils.getExtension(originalFilename);
+ String baseName = FilenameUtils.getBaseName(originalFilename);
String formalFilename = businessId + "_" +
System.currentTimeMillis() + "_" +
- UUID.randomUUID().toString().substring(0, 8) +
+ UUID.randomUUID().toString().substring(0, 8) +baseName+
(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
- );
+// Files.move(
+// Paths.get(tempFile.getTempPath()),
+// formalFilePath,
+// StandardCopyOption.REPLACE_EXISTING,
+// StandardCopyOption.ATOMIC_MOVE
+// );
+ // 鍘熷瓙绉诲姩澶辫触锛屼娇鐢ㄥ鍒�+鍒犻櫎
+ Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);
+ Files.deleteIfExists(Paths.get(tempFile.getTempPath()));
log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
// 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛�
@@ -211,7 +239,7 @@
fileRecord.setName(originalFilename);
fileRecord.setUrl(formalFilePath.toString());
fileRecord.setCreateTime(LocalDateTime.now());
- fileRecord.setType(tempFile.getType());
+ fileRecord.setType(4);
commonFileMapper.insert(fileRecord);
log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
@@ -226,7 +254,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
@@ -254,8 +318,8 @@
@Override
public List getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
LambdaQueryWrapper<TicketRegistration> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.select(TicketRegistration::getId,TicketRegistration::getInvoiceNumber,TicketRegistration::getInvoiceAmount)
- .eq(TicketRegistration::getPurchaseLedgerId,ticketRegistrationDto.getId());
+ queryWrapper.select(TicketRegistration::getId, TicketRegistration::getInvoiceNumber, TicketRegistration::getInvoiceAmount)
+ .eq(TicketRegistration::getPurchaseLedgerId, ticketRegistrationDto.getId());
List<Map<String, Object>> result = ticketRegistrationMapper.selectMaps(queryWrapper);
// 灏嗕笅鍒掔嚎鍛藉悕杞崲涓洪┘宄板懡鍚�
return result.stream().map(map -> map.entrySet().stream()
@@ -263,6 +327,72 @@
entry -> underlineToCamel(entry.getKey()),
Map.Entry::getValue))
).collect(Collectors.toList());
+ }
+
+ @Override
+ public IPage<TicketRegistration> selectTicketRegistrationListPage(Page page, TicketRegistration ticketRegistration) {
+ LambdaQueryWrapper<TicketRegistration> queryWrapper = new LambdaQueryWrapper<>();
+ 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")));
+ }
+ IPage<TicketRegistration> ticketRegistrationIPage = ticketRegistrationMapper.selectPage(page, queryWrapper);
+ // 璁＄畻宸蹭粯娆鹃噾棰�
+ if (CollectionUtils.isNotEmpty(ticketRegistrationIPage.getRecords())) {
+ List<Long> ids = ticketRegistrationIPage.getRecords().stream().map(TicketRegistration::getId).collect(Collectors.toList());
+ List<PaymentRegistrationDto> paymentRegistrationDtoList = paymentRegistrationMapper.countPaymentTotalByTicketRegId(ids);
+ for (TicketRegistration registration : ticketRegistrationIPage.getRecords()) {
+ BigDecimal paymentAmountTotal = BigDecimal.ZERO;
+ for (PaymentRegistrationDto paymentRegistrationDto : paymentRegistrationDtoList) {
+ if (registration.getId().equals(paymentRegistrationDto.getTicketRegistrationId())) {
+ paymentAmountTotal = paymentRegistrationDto.getPaymentAmountTotal();
+ break;
+ }
+ }
+ BigDecimal invoiceAmount = registration.getInvoiceAmount();
+ BigDecimal subtractAmount = invoiceAmount.subtract(paymentAmountTotal);
+ registration.setPaymentAmountTotal(paymentAmountTotal);
+ registration.setUnPaymentAmountTotal(subtractAmount);
+ }
+ }
+ if (!ObjectUtils.isEmpty(ticketRegistration.getStatus())) {
+
+ if (ticketRegistration.getStatus()) {
+ ticketRegistrationIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getUnPaymentAmountTotal()));
+ ticketRegistrationIPage.setTotal(ticketRegistrationIPage.getRecords().size());
+ }
+ }
+ 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.getValue());
+ 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) {
@@ -297,16 +427,17 @@
}
// 璁＄畻 futureTickets锛堢洿鎺ヤ娇鐢� BigDecimal 璁＄畻锛岄伩鍏嶇簿搴︿涪澶憋級
- product.setFutureTickets(
- product.getQuantity()
- .subtract(BigDecimal.valueOf(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