From 8fd8e2f7c84446ab6bf84fe252053b85d9b20d30 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 10:45:44 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑,统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构,减少冗余的条件判断和数据转换操作

---
 src/main/resources/mapper/modules/ClothesSocialMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/ClothesSocialMapper.xml b/src/main/resources/mapper/modules/ClothesSocialMapper.xml
index 9ae3cd6..d847b4f 100644
--- a/src/main/resources/mapper/modules/ClothesSocialMapper.xml
+++ b/src/main/resources/mapper/modules/ClothesSocialMapper.xml
@@ -4,19 +4,22 @@
 
     <select id="selectSocialListInPage" resultType="cc.mrbird.febs.mall.vo.clothes.AdminClothesSocialListVo">
         select
+        c.name as categoryName,
         b.name as name,
         a.id as id,
+        a.name as socialTitle,
         a.name as socialTitle,
         a.del_flag as delFlag,
         a.hot_state as hotState,
         a.comment_state as commentState,
                a.like_cnt as likeCnt,
                 a.collect_cnt as collectCnt,
-               (select count(id) from clothes_social_follow where source_type = 1 and a.id = source_id and type = 1 group by member_id) as likeCntReal,
-               (select count(id) from clothes_social_follow where source_type = 1 and a.id = source_id and type = 2 group by member_id) as collectCntReal,
+               (select COUNT(DISTINCT(member_id)) from clothes_social_follow where source_type = 1 and a.id = source_id and type = 1 ) as likeCntReal,
+               (select COUNT(DISTINCT(member_id)) from clothes_social_follow where source_type = 1 and a.id = source_id and type = 2 ) as collectCntReal,
         a.state as socialState
         from clothes_social a
         left join mall_member b on a.member_id = b.id
+        left join clothes_social_category c on a.category_id = c.id
         <where>
             <if test="record != null">
                 <if test="record.name != null and record.name != ''">
@@ -25,6 +28,9 @@
                 <if test="record.state != null">
                     and a.state = #{record.status}
                 </if>
+                <if test="record.categoryId != null">
+                    and c.id = #{record.categoryId}
+                </if>
                 <if test="record.startTime != null and record.startTime != ''">
                     and a.created_time &gt;= #{record.startTime}
                 </if>

--
Gitblit v1.9.1