From 38d8abee8db1034b4cc3fae8613e8328653a1080 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 18 九月 2024 16:07:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/flower/FlowerService.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 221d4be..d89cd66 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -139,10 +139,13 @@
}
try{
+ flowerMapper.updateTypeRankNull(flower.getCategory(),flower.getLevel());
+
QueryWrapper<Flower> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(Flower::getDeleted,false)
.eq(Objects.nonNull(flower.getCategory()),Flower::getCategory,flower.getCategory())
.eq(StringUtils.isNotEmpty(flower.getLevel()),Flower::getLevel,flower.getLevel())
+ .eq(Flower::getStatus,"UP")
.orderByAsc(Flower::getPrice);
final List<Flower> flowerList = flowerMapper.selectList(queryWrapper);
@@ -243,6 +246,7 @@
public Long editFlowerAdmin(FlowerUpdateAdminDTO dto){
Flower g = flowerMapper.selectById(dto.getId());
g.setSales(dto.getSales());
+ g.setLimited(dto.getLimited());
g.update(SecurityUtils.getUserId());
flowerMapper.updateById(g);
@@ -453,6 +457,9 @@
//清除购物车商品
cartMapper.delete(new QueryWrapper<Cart>().eq("flower_id", id));
}
+
+ //更新排名
+ updateFlowTypeRank(null,f.getCategory(),f.getLevel());
}
public void deleteFlower(Long id){
@@ -869,5 +876,17 @@
return flowerDeleteDO;
}
+ public void setFlowersLimited(FlowerLimitedDTO dto) {
+ List<Long> ids = dto.getIds();
+ if (ids == null || ids.size() == 0) {
+ throw new ValidationException("请选择商品");
+ }
+ for (Long id : ids) {
+ Flower f = flowerMapper.selectById(id);
+ f.setLimited(dto.getLimited());
+ flowerMapper.updateById(f);
+ }
+ }
+
}
--
Gitblit v1.9.3