From 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 15 一月 2026 17:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
index 7c1d837..d5c67b9 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
@@ -101,9 +101,19 @@
return AjaxResult.success("淇敼鎴愬姛");
}
- @Override
- public ProductRecordDto getProductRecordById(Long id) {
- ProductRecordDto productRecordDto = productRecordMapper.getProductRecordById(id);
- return productRecordDto;
+ @Override
+ public ProductRecordDto getProductRecordById(ProductRecordDto productRecordDto) {
+ List<ProductRecordDto> productRecordDtoList = productRecordMapper.getProductRecordById(productRecordDto);
+ if(productRecordDtoList != null && productRecordDtoList.size() > 0){
+ ProductRecordDto productRecordDto1 = productRecordDtoList.get(productRecordDtoList.size() - 1);
+ // 杩囨护鍑轰笌浼犲叆鐨� productRecordDto 涓婚敭鐩稿悓鐨勮褰�
+ ProductRecordDto productRecordDto2 = productRecordDtoList.stream().filter(item ->
+ item.getId().equals(productRecordDto.getId()))
+ .findFirst().orElse(null);
+ productRecordDto2.setFutureTickets(productRecordDto1.getFutureTickets());
+ productRecordDto2.setFutureTicketsAmount(productRecordDto1.getFutureTicketsAmount());
+ return productRecordDto2;
+ }
+ return null;
}
}
--
Gitblit v1.9.3