From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交：订单最小金额配置
---
src/main/resources/mapper/flower/FlowerMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 1da83a9..e90238f 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -180,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
@@ -332,8 +335,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
@@ -409,7 +415,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