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/ClothesOrderMapper.xml |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/ClothesOrderMapper.xml b/src/main/resources/mapper/modules/ClothesOrderMapper.xml
index 37a7688..40b1e40 100644
--- a/src/main/resources/mapper/modules/ClothesOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ClothesOrderMapper.xml
@@ -10,9 +10,12 @@
             a.status as status,
             b.name as typeName,
             b.image as typeImage,
+            c.express_no as expressNo,
+            c.express_com as expressCom,
             a.goods_cnt as goodsCnt
         from clothes_order a
         left join clothes_type b on a.type_id = b.id
+        left join mall_express_info c on a.id=c.order_id
         <where>
             and a.member_id = #{record.memberId}
             <if test="record != null">
@@ -21,7 +24,7 @@
                         b.name like CONCAT('%', CONCAT(#{record.query}, '%')) or
                     )
                 </if>
-                <if test="record.status != null">
+                <if test="record.status != 0">
                     and (
                         a.status  = #{record.status}
                     )
@@ -64,7 +67,7 @@
 
         <where>
             <if test="record != null">
-                <if test="record.payResult != null">
+                <if test="record.payResult != null and record.payResult != ''">
                     and a.pay_result = #{record.payResult}
                 </if>
                 <if test="record.status != null">
@@ -87,4 +90,15 @@
         order by a.created_time desc
     </select>
 
+
+
+    <select id="selectOrderStatusCnt" resultType="java.util.Map">
+        select
+            a.status,
+            count(1) cnt
+        from clothes_order a
+        where a.del_flag=0 and a.member_id=#{memberId}
+        group by a.status
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1