From 08df1a408d57de206c8dfda3182d24f8e735c579 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 10:19:38 +0800
Subject: [PATCH] fix:还原

---
 src/main/java/com/mzl/flower/service/flower/FlowerService.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 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 934ef42..6e4038e 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -93,6 +93,11 @@
         }
     }
 
+    @Async
+    public synchronized void updateCategoryInfo(Long category){
+        flowerMapper.updateFlowerCategoryInfo(category);
+    }
+
     /**
      * 花农(供应商)提交商品
      *
@@ -504,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();
@@ -597,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);
@@ -697,4 +702,14 @@
 
         return page;
     }
+
+    public void clearInvalidHistory(String userId) {
+
+        List<Long> ids = flowerMapper.searchInvalidHistory(userId);
+        if(ids!=null && ids.size()>0){
+            browseService.deleteBatchIds(ids);
+
+        }
+
+    }
 }

--
Gitblit v1.9.3