From ead65cd9b15cd574f4e37c3376c7447efea53935 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 09 九月 2024 20:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/resources/mapper/flower/FlowerMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 3ebf9f8..64eb0c7 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.mzl.flower.mapper.flower.FlowerMapper">
+ <delete id="deleteBatchPhysics">
+ DELETE FROM t_flower
+ WHERE id IN
+ <foreach collection="list" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
<select id="selectFlowerList" resultType="com.mzl.flower.dto.response.flower.FlowerListDTO">
SELECT f.*, s.name supplierName, st.name supplierType, fc.name categoryStr
@@ -234,6 +241,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 +286,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 +335,7 @@
</choose>
</when>
<otherwise>
- order by c.create_time desc
+ order by c.update_time desc
</otherwise>
</choose>
</select>
@@ -373,10 +388,37 @@
</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>
+ <select id="getDeletdFlowByIds" resultType="com.mzl.flower.entity.flower.Flower">
+ select * from t_flower
+ WHERE id IN
+ <foreach collection="list" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </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>
+ <update id="updateBatchTypeRank">
+ <foreach collection="list" item="item" separator=";">
+ UPDATE t_flower
+ SET type_rank = #{item.typeRank}
+ WHERE id = #{item.id}
+ </foreach>
+ </update>
+
+ <update id="restoreFlowerBatch">
+ update t_flower set deleted = 0
+ WHERE id IN
+ <foreach collection="list" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3