From 45ae5798c04b25d94a19c990d87d80951eda014f Mon Sep 17 00:00:00 2001 From: qiaohui <924337501@qq.com> Date: Tue, 15 Oct 2024 22:49:03 +0800 Subject: [PATCH] =?UTF-8?q?app/return/get=20=E5=A2=9E=E5=8A=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E8=BF=94=E5=9B=9E=20app/product/getShareList?= =?UTF-8?q?=20=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=EF=BC=8C=E8=B6=8A=E7=B2=BE=E5=87=86=E7=9A=84=E8=B6=8A=E9=9D=A0?= =?UTF-8?q?=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hiver-admin/test-output/test-report.html | 18 +++++++++--------- .../mall/controller/ReturnSaleController.java | 19 ++++++++++++++++--- .../main/resources/mapper/ProductMapper.xml | 8 ++++++++ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 4eaae2fe..9caa2161 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -5,7 +5,7 @@ -Hiver测试报告 +Hiver娴嬭瘯鎶ュ憡 @@ -35,7 +35,7 @@ Hiver
  • -十月 15, 2024 22:13:10 +鍗佹湀 15, 2024 22:32:27
    • @@ -84,7 +84,7 @@

    passTest

    -

    22:13:11 下午 / 0.016 secs

    +

    22:32:27 涓嬪崍 / 0.012 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -10.15.2024 22:13:11 -10.15.2024 22:13:11 -0.016 secs +10.15.2024 22:32:27 +10.15.2024 22:32:27 +0.012 secs
    @@ -104,7 +104,7 @@ 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, +