From 61b4b44cf4b60334eb9c3c17d13c01342b4f34cf Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 十二月 2024 11:51:35 +0800
Subject: [PATCH] add: 供应商子账号
---
src/main/java/com/mzl/flower/service/flower/FlowerService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 9cc9169..f100b43 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -693,9 +693,10 @@
public Page<FlowerShowListDTO> myCollect(Page page, FlowerShowQueryDTO dto) {
dto.setUserId(SecurityUtils.getUserId());
if (StringUtils.isNotEmpty(dto.getColumn())) {
- if(dto.getColumn().contains("sales")
- || dto.getColumn().contains("stock")){
+ if(dto.getColumn().contains("stock")){
dto.setColumn(dto.getColumn() + " desc");
+ } else if (dto.getColumn().contains("sales")) {
+ dto.setColumn("ifnull(sales, 0) + ifnull(real_sales, 0) desc");
}
}
@@ -723,9 +724,9 @@
s.setCollection(s.getCollectCount() > 0);
s.setShopnum(s.getShopnum() == null ? 0 : s.getShopnum());
- if(s.getSales() != null && s.getRealSales() != null){
+ /*if(s.getSales() != null && s.getRealSales() != null){
s.setSales(s.getSales() + s.getRealSales());
- }
+ }*/
}
}
}
@@ -909,5 +910,11 @@
}
}
+ public Flower selectFlowerById(Long id) {
+ return flowerMapper.selectFlowerById(id);
+ }
+ public List<Flower> selectFlowersByIds(List<Long> ids) {
+ return flowerMapper.selectFlowersByIds(ids);
+ }
}
--
Gitblit v1.9.3