From 08df1a408d57de206c8dfda3182d24f8e735c579 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 10:19:38 +0800
Subject: [PATCH] fix:还原

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

diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 0c499bd..3cb549a 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -234,6 +234,10 @@
 
     <select id="myCollect" resultType="com.mzl.flower.dto.response.flower.FlowerShowListDTO">
         SELECT f.*, s.name supplierName, st.name supplierType, fc.name categoryStr
+        , (select sum(num) from t_cart ccc
+        where ccc.flower_id = f.id
+        and ccc.create_by = #{condition.userId}
+        ) shopnum
         FROM t_collect_flower c
         left join t_flower f on c.flower_id = f.id
         left join t_supplier_info s on s.id = f.supplier_id
@@ -275,6 +279,10 @@
 
     <select id="myBrowseHistory" resultType="com.mzl.flower.dto.response.flower.FlowerShowListDTO">
         SELECT f.*, s.name supplierName, st.name supplierType, fc.name categoryStr
+        , (select sum(num) from t_cart ccc
+        where ccc.flower_id = f.id
+        and ccc.create_by = #{condition.userId}
+        ) shopnum
         FROM t_browse_his c
         left join t_flower f on c.flower_id = f.id
         left join t_supplier_info s on s.id = f.supplier_id
@@ -320,7 +328,7 @@
                 </choose>
             </when>
             <otherwise>
-                order by c.create_time desc
+                order by c.update_time desc
             </otherwise>
         </choose>
     </select>
@@ -373,4 +381,15 @@
         </if>
         ORDER BY fzp.rank asc
     </select>
+    <select id="searchInvalidHistory" resultType="java.lang.Long">
+        SELECT c.id
+        FROM t_browse_his c left join t_flower f on c.flower_id = f.id
+        WHERE f.deleted = 0 and c.deleted = 0 and f.status != 'UP' and c.user_id = #{userId}
+    </select>
+
+    <update id="updateFlowerCategoryInfo">
+        update t_flower f, t_flower_category fc
+        set f.unit = fc.unit, f.color = fc.color
+        where f.category = fc.id and fc.id = #{category}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3