From 57a283d06cba1fd3a6b78af590a97372774bbca6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 15:45:03 +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 | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 1da83a9..711835b 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
--
Gitblit v1.9.3