From 950e7b8686fdd971c31417983f89473ce19a7569 Mon Sep 17 00:00:00 2001
From: jevononlie <728254585@qq.com>
Date: Tue, 23 Apr 2024 13:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=88=86=E7=B1=BB=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E3=80=81=E5=88=B0=E7=AB=99=E3=80=81=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/yunxi/controller/RecycleOrderController.java  |  9 ++++++---
 .../yunxi/controller/RecycleStationController.java   |  3 +++
 .../yunxi/service/impl/RecycleOrderServiceImpl.java  | 12 ++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java
index c1d9d9f..37d988a 100644
--- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java
+++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java
@@ -144,13 +144,16 @@ public class RecycleOrderController {
         RecycleOrder recycleOrder = recycleOrderService.getOrderById(orderId, false);
         // 查询回收站下的所有类目信息
         String recycleStationId = recycleOrder.getRecycleStationId();
-        List<ProductRespVO> productList = recycleStationService.getStationProduct(recycleStationId);
+        List<ProductRespVO> productList = recycleStationService.getStationProductAllByStationId(recycleStationId);
         List<ProductRespVO> productTreeList = CommonUtil.getChildrenList(null, productList);
-        // 查询订单关联的一级类目信息
+
+//        // 查询订单关联的二级类目信息
         List<RecycleOrderProduct> orderProducts = recycleOrderProductService.getOrderProductsByOrderId(orderId);
         List<String> categoryIdList = orderProducts.stream().map(RecycleOrderProduct::getProductId).collect(Collectors.toList());
-        productTreeList = productTreeList.stream().filter(v -> categoryIdList.contains(v.getProductId())).collect(Collectors.toList());
+
+        productTreeList = productTreeList.stream().filter(v -> categoryIdList.contains(v.getId())).collect(Collectors.toList());
         return CommonResult.success(productTreeList);
+
     }
 
 
diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java
index 639a7b9..5a39964 100644
--- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java
+++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java
@@ -103,6 +103,9 @@ public class RecycleStationController {
     public CommonResult<List<ProductRespVO>> stationProduct(@RequestParam("stationId") String stationId) {
         List<ProductRespVO> productList = recycleStationService.getStationProductAllByStationId(stationId);
         List<ProductRespVO> productTreeList = CommonUtil.getChildrenList(null, productList);
+        for(ProductRespVO item : productTreeList) {
+            item.setProductId(item.getId());
+        }
         return CommonResult.success(productTreeList);
     }
 
diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
index d9ace03..9099413 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
@@ -288,8 +288,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             if (ObjectUtil.isEmpty(latestPriceProduct)) {
                 throw new BusinessLogicException("产品价格信息未公布，请联系商户!");
             }
-            BigDecimal recoveryPrice = Optional.ofNullable(latestPriceProduct.getRecoveryPrice()).orElse(new BigDecimal("0.00"));
-            rp.setActualRecoveryPrice(recoveryPrice);
+//            BigDecimal recoveryPrice = Optional.ofNullable(latestPriceProduct.getRecoveryPrice()).orElse(new BigDecimal("0.00"));
+//            rp.setActualRecoveryPrice(recoveryPrice);
         });
         this.recycleOrderProductService.createOrderProducts(recycleOrderProducts);
 
@@ -420,8 +420,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             if (ObjectUtil.isEmpty(latestPriceProduct)) {
                 throw new BusinessLogicException("产品价格信息未公布，请联系商户!");
             }
-            BigDecimal recoveryPrice = Optional.ofNullable(latestPriceProduct.getRecoveryPrice()).orElse(new BigDecimal("0.00"));
-            rp.setActualRecoveryPrice(recoveryPrice);
+//            BigDecimal recoveryPrice = Optional.ofNullable(latestPriceProduct.getRecoveryPrice()).orElse(new BigDecimal("0.00"));
+//            rp.setActualRecoveryPrice(recoveryPrice);
         });
         this.recycleOrderProductService.saveOrderProducts(recycleOrderProducts);
 
@@ -481,8 +481,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             if (ObjectUtil.isEmpty(latestPriceProduct)) {
                 throw new BusinessLogicException("产品价格信息未公布，请联系商户!");
             }
-            BigDecimal recoveryPrice = Optional.ofNullable(latestPriceProduct.getRecoveryPrice()).orElse(new BigDecimal("0.00"));
-            rp.setActualRecoveryPrice(recoveryPrice);
+//            BigDecimal recoveryPrice = Optional.ofNullable(latestPriceProduct.getRecoveryPrice()).orElse(new BigDecimal("0.00"));
+//            rp.setActualRecoveryPrice(recoveryPrice);
         });
 
         this.recycleOrderProductService.saveOrderProducts(recycleOrderProducts);