From c144a01a7fff4e9bd169eb9d03b6ea58bc8bafb6 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 22 十月 2024 14:40:40 +0800
Subject: [PATCH] 1.钱包

---
 src/main/resources/mapper/flower/FlowerMapper.xml |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 64eb0c7..711835b 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
@@ -326,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
@@ -421,4 +433,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