From 6e4d62beb7d449cd89bb785592d62932f95df391 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 30 八月 2024 10:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/flower/FlowerService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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..77dbb9c 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);
+ }
+
/**
* 花农（供应商）提交商品
*
@@ -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);
--
Gitblit v1.9.3