From 6e9730ebbbff634d27c2c49ec328156c8905b508 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 13:52:14 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑，统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构，减少冗余的条件判断和数据转换操作
---
src/main/resources/mapper/modules/HappyActivityOptionMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index aae47f6..05101e2 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -177,4 +177,56 @@
order by a.created_time desc
</select>
+ <select id="activityOrderCheckList" resultType="cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo">
+ select
+ a.id,
+ a.code,
+ a.name,
+ a.phone,
+ a.address,
+ a.state,
+ CASE
+ WHEN a.state = 1 THEN a.UPDATED_TIME
+ ELSE NULL
+ END AS updatedTime,
+ b.name checkName,
+ b.phone checkPhone,
+ b.real_name checkRealName
+ from happy_activity_order_item a
+ left join mall_member b on b.id = a.transfer_item_id
+ <where>
+
+ and a.code is not null
+ <if test="record != null">
+ <if test="record.name != null and record.name != ''">
+ and (b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ or b.real_name like CONCAT('%', CONCAT(#{record.name}, '%')))
+ </if>
+ <if test="record.code != null and record.code != ''">
+ and a.code = #{record.code}
+ </if>
+ <if test="record.state != null">
+ and a.state=#{record.state}
+ </if>
+ <if test="record.activityId != null">
+ and a.activity_id=#{record.activityId}
+ </if>
+ </if>
+ </where>
+ order by a.created_time desc
+ </select>
+
+ <select id="getOrderCheckListForExport" resultType="cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo">
+ select
+ a.*,
+ b.name checkName,
+ b.phone checkPhone,
+ b.real_name checkRealName
+ from happy_activity_order_item a
+ left join mall_member b on b.id = a.transfer_item_id
+ where a.code is not null
+ and a.activity_id=#{activityId}
+ order by a.created_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1