From 53bbf8f0a18c9d546bc875c0041c92e2efeaabbe Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 08 九月 2024 16:29:05 +0800
Subject: [PATCH] fix：合伙人端：平台加价-分类加价orderby分类ID，商品加价创建时间
---
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