Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 d138c7498b463b223c63e4639074d9349bb8a341

Merge branch 'master' into master-v2

 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