From bc9bd69850c95dacb22c7da4777a1d0470c33722 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <cuizf@fengyuntec.com> Date: 星期日, 08 九月 2024 16:23:55 +0800 Subject: [PATCH] Merge branch 'master' into master-v2 --- src/main/resources/mapper/flower/FlowerMapper.xml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml index 5a0b0c1..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> -- Gitblit v1.9.3