From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/flower/FlowerMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 711835b..7cfae74 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -198,7 +198,9 @@
order by fzp.rank asc
</when>
<otherwise>
- order by f.price asc
+ order by
+ CASE WHEN f.stock = 0 THEN 1 ELSE 0 END,
+ f.price asc
</otherwise>
</choose>
</select>
@@ -415,7 +417,7 @@
<update id="updateFlowerCategoryInfo">
update t_flower f, t_flower_category fc
- set f.unit = fc.unit, f.color = fc.color
+ set f.unit = fc.unit, f.color = fc.color,f.name=fc.name
where f.category = fc.id and fc.id = #{category}
</update>
<update id="updateBatchTypeRank">
--
Gitblit v1.9.3