From 72cf5cdaef3be1e81da7f59d6ed61fe368f44816 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 08 一月 2025 14:48:46 +0800
Subject: [PATCH] add:物流发货针对散户更改微信发货方式，保存物流单号，未发送之前可更改
---
src/main/resources/mapper/flower/FlowerMapper.xml | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 64eb0c7..7cfae74 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -45,6 +45,12 @@
<if test="condition.recommend != null and !condition.recommend">
AND (f.recommend = 0 or f.recommend is null)
</if>
+ <if test="condition.isLimited != null and condition.isLimited">
+ AND f.limited > 0
+ </if>
+ <if test="condition.isLimited != null and !condition.isLimited">
+ AND (f.limited = 0 or f.limited is null)
+ </if>
<if test="condition.statusList != null and condition.statusList.size > 0">
and f.status in
<foreach collection="condition.statusList" item="item" open="(" separator="," close=")">
@@ -174,8 +180,11 @@
<choose>
<when test="condition.column != null and condition.column != '' and (condition.recommend == null or condition.zoneId != null)">
<choose>
- <when test="'f.sales'.equals(condition.column) or 'f.stock'.equals(condition.column)">
- order by ${condition.column} desc
+ <when test="'f.sales'.equals(condition.column)">
+ order by ifnull(f.sales, 0) + ifnull(f.real_sales, 0) desc
+ </when>
+ <when test="'f.stock'.equals(condition.column)">
+ order by f.stock desc
</when>
<otherwise>
order by ${condition.column}, f.price
@@ -189,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>
@@ -326,8 +337,11 @@
<choose>
<when test="condition.column != null and condition.column != ''">
<choose>
- <when test="'f.sales'.equals(condition.column) or 'f.stock'.equals(condition.column)">
- order by ${condition.column} desc
+ <when test="'f.sales'.equals(condition.column)">
+ order by ifnull(f.sales, 0) + ifnull(f.real_sales, 0) desc
+ </when>
+ <when test="'f.stock'.equals(condition.column)">
+ order by f.stock desc
</when>
<otherwise>
order by ${condition.column} asc
@@ -403,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">
@@ -421,4 +435,7 @@
#{id}
</foreach>
</update>
+ <update id="updateTypeRankNull">
+ update t_flower set type_rank=null where category=#{category} and level=#{level}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3