From 93cad4adb07b320dfce8bc31453bca04ba7a9e4d Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期日, 08 九月 2024 07:50:47 +0800
Subject: [PATCH] 浏览历史和收藏列表返回购物车数量

---
 src/main/java/com/mzl/flower/service/flower/FlowerService.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerService.java b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
index 6327c7f..57ab80d 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -509,7 +509,7 @@
         }
 
         BigDecimal price = getFinalPrice(pId, dto.getCategory()
-                , s.getId(), dto.getPrice(), dto.getLevel());
+                , dto.getId(), dto.getPrice(), dto.getLevel());
         dto.setPrice(price);
 
         String userId = SecurityUtils.getUserId();
@@ -602,13 +602,13 @@
 
     public Page<FlowerShowListDTO> myCollect(Page page, FlowerShowQueryDTO dto) {
         dto.setUserId(SecurityUtils.getUserId());
-        /*if (StringUtils.isNotEmpty(dto.getColumn())) {
-            List<OrderItem> orders = new ArrayList<>();
-            OrderItem i = new OrderItem();
-            i.setColumn(dto.getColumn());
-            i.setAsc(dto.isAsc());
-            page.setOrders(orders);
-        }*/
+        if (StringUtils.isNotEmpty(dto.getColumn())) {
+            if(dto.getColumn().contains("sales")
+                    || dto.getColumn().contains("stock")){
+                dto.setColumn(dto.getColumn() + " desc");
+            }
+        }
+
         dto.setParamId(paramService.getParamIdByCategoryId(dto.getCategory()));
         List<FlowerShowListDTO> flowerShowListDTOS = flowerMapper.myCollect(page, dto);
         page.setRecords(flowerShowListDTOS);

--
Gitblit v1.9.3