From 9c0f77a63226589b86e43ae105c0002b667b4847 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 21 五月 2025 15:55:55 +0800
Subject: [PATCH] 来票登记逻辑更改
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index af2171e..c2bef5b 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -18,7 +18,9 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
@@ -73,6 +75,8 @@
private final ProductModelMapper productModelMapper;
+ private final TicketRegistrationMapper ticketRegistrationMapper;
+
@Value("${file.upload-dir}")
private String uploadDir;
@@ -118,7 +122,7 @@
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
- handleSalesLedgerProducts(purchaseLedger.getId(), purchaseLedgerDto.getProductId(), purchaseLedgerDto.getProductModelId(), productList, purchaseLedgerDto.getType());
+ handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
}
// 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
@@ -129,19 +133,52 @@
return 1;
}
- private void handleSalesLedgerProducts(Long salesLedgerId, Long productId, Long productModelId, List<SalesLedgerProduct> products, Integer type) {
- Product pro = productMapper.selectById(productId);
- ProductModel productModel = productModelMapper.selectById(productModelId);
+ private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
+ if (products == null || products.isEmpty()) {
+ throw new BaseException("浜у搧淇℃伅涓嶅瓨鍦�");
+ }
- // 鎸塈D鍒嗙粍锛屽尯鍒嗘柊澧炲拰鏇存柊鐨勮褰�
+ // 鎻愬墠鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
+ Set<Long> productIds = products.stream()
+ .map(SalesLedgerProduct::getProductId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ Set<Long> modelIds = products.stream()
+ .map(SalesLedgerProduct::getProductModelId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ // 涓�娆℃�ф煡璇骇鍝佸拰鍨嬪彿淇℃伅
+ Map<Long, String> productMap = new HashMap<>();
+ if (!productIds.isEmpty()) {
+ List<Product> productList = productMapper.selectBatchIds(productIds);
+ productList.forEach(p -> productMap.put(p.getId(), p.getProductName()));
+ }
+
+ Map<Long, String> modelMap = new HashMap<>();
+ if (!modelIds.isEmpty()) {
+ List<ProductModel> modelList = productModelMapper.selectBatchIds(modelIds);
+ modelList.forEach(m -> modelMap.put(m.getId(), m.getModel()));
+ }
+
+ // 璁剧疆瀛楁
+ for (SalesLedgerProduct product : products) {
+ product.setSalesLedgerId(salesLedgerId);
+
+ Long productId = product.getProductId();
+ if (productId != null && productMap.containsKey(productId)) {
+ product.setProductCategory(productMap.get(productId));
+ }
+
+ Long productModelId = product.getProductModelId();
+ if (productModelId != null && modelMap.containsKey(productModelId)) {
+ product.setSpecificationModel(modelMap.get(productModelId));
+ }
+ }
+
+ // 鍒嗙粍澶勭悊
Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
- .peek(p -> {
- p.setSalesLedgerId(salesLedgerId);
- p.setProductId(productId);
- p.setProductCategory(pro.getProductName());
- p.setProductModelId(productModelId);
- p.setSpecificationModel(productModel.getModel());
- })
.collect(Collectors.partitioningBy(p -> p.getId() != null));
List<SalesLedgerProduct> updateList = partitionedProducts.get(true);
@@ -315,6 +352,10 @@
queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
.eq(SalesLedgerProduct::getType, 2);
List<SalesLedgerProduct> productList = salesLedgerProductMapper.selectList(queryWrapper);
+ productList.forEach(product -> {
+ product.setFutureTickets(product.getFutureTickets() != null ? product.getFutureTickets() : product.getQuantity().longValue());
+ product.setFutureTicketsAmount(product.getFutureTicketsAmount() != null ? product.getFutureTicketsAmount() : product.getTaxInclusiveTotalPrice());
+ });
resultDto.setProductData(productList);
return resultDto;
@@ -336,6 +377,20 @@
).collect(Collectors.toList());
}
+ @Override
+ public PurchaseLedgerDto getPurchaseNoById(Long id) {
+ PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
+ BeanUtils.copyProperties(purchaseLedger,purchaseLedgerDto);
+ TicketRegistration ticketRegistration = ticketRegistrationMapper.selectOne(new LambdaQueryWrapper<TicketRegistration>().eq(TicketRegistration::getPurchaseLedgerId, id));
+ if (ticketRegistration != null) {
+ purchaseLedgerDto.setInvoiceNumber(ticketRegistration.getInvoiceNumber());
+ purchaseLedgerDto.setInvoiceAmount(ticketRegistration.getInvoiceAmount());
+ purchaseLedgerDto.setTicketRegistrationId(ticketRegistration.getId());
+ }
+ return purchaseLedgerDto;
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
--
Gitblit v1.9.3