| Pass |
- 22:13:11 |
+ 22:32:27 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
十月 15, 2024 22:13:10
+
鍗佹湀 15, 2024 22:32:27
Ended
-
十月 15, 2024 22:13:11
+
鍗佹湀 15, 2024 22:32:27
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java
index 8a7950f5..4d0c0d60 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java
@@ -32,9 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Slf4j
@RestController
@@ -57,6 +55,9 @@ public class ReturnSaleController {
@Autowired
private SaleService saleService;
+ @Autowired
+ private StockService stockService;
+
@Autowired
private SaleDetailService saleDetailService;
@@ -122,6 +123,14 @@ public class ReturnSaleController {
final List saleDetailList = returnDetailService.list(queryPWrapper);
final List saleDetailQueryDTOS = new ArrayList<>();
final SaleDetailDTO saleDetailDTO = new SaleDetailDTO();
+
+ // 鏌ヨ鍟嗗搧鎵鏈夌殑搴撳瓨
+ final List stockList = stockService.getProductStock(productId);
+ final Map stockMap = new HashMap<>();
+ for (Stock stock : stockList) {
+ stockMap.put(stock.getAttributeList(), stock.getStockCount());
+ }
+
for (ReturnDetail returnDetail : saleDetailList) {
saleDetailDTO.setProductId(productId);
saleDetailDTO.setProductName(returnDetail.getProductName());
@@ -141,6 +150,10 @@ public class ReturnSaleController {
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO();
saleDetailQueryDTO.setAttributeList(returnDetail.getAttributeList());
saleDetailQueryDTO.setProductCount(returnDetail.getProductCount());
+
+ saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(saleDetailQueryDTO.getAttributeList(), null));
+
+
saleDetailQueryDTOS.add(saleDetailQueryDTO);
}
saleDetailDTO.setStockLogList1(saleDetailQueryDTOS);
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
index cd40ed4a..78fbdb2f 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
@@ -658,6 +658,14 @@
ORDER BY
+
+ LENGTH(product_sn),
+ CASE
+ WHEN product_sn LIKE CONCAT(#{queryParams.searchStr}, '%') THEN 1
+ WHEN product_sn LIKE CONCAT('%',#{queryParams.searchStr}) THEN 2
+ ELSE 3
+ END,
+