From 59da87cc7b9db21b01c8c2c0831619aff73d0f84 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 17:54:27 +0800
Subject: [PATCH] fix(mall): 修复活动订单删除功能

---
 src/main/resources/mapper/modules/HappyActivityOptionMapper.xml |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index 767b05a..1df7660 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -57,7 +57,7 @@
 
 
     <update id="updateHappyActivitySurplusCnt" >
-        update happy_activity set surplus_cnt = likes_cnt + #{cnt} where id = #{id}
+        update happy_activity set surplus_cnt = surplus_cnt + #{cnt} where id = #{id}
     </update>
 
     <select id="getVoteOptionInPage" resultType="cc.mrbird.febs.mall.vo.ApiActivityOptionListVo">
@@ -136,4 +136,45 @@
         order by a.likes_cnt desc
     </select>
 
+    <select id="selectActivityCommentPage" resultType="cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo">
+        select
+        a.*,
+        b.name name,
+        b.avatar avatar
+        from happy_activity_comment a
+        left join mall_member b on b.id = a.member_id
+        <where>
+            <if test="record != null">
+                <if test="record.activityId != null and record.activityId != ''">
+                    and a.activity_id = #{record.activityId}
+                </if>
+                <if test="record.commentType != null and record.commentType != '' and record.commentType == 1">
+                    and a.star <![CDATA[ > ]]> 4
+                </if>
+                <if test="record.commentType != null and record.commentType != '' and record.commentType == 2">
+                    and (a.star <![CDATA[ >= ]]> 3 and a.star <![CDATA[ <= ]]> 4)
+                </if>
+                <if test="record.commentType != null and record.commentType != '' and record.commentType == 3">
+                    and (a.star <![CDATA[ < ]]> 3 )
+                </if>
+            </if>
+        </where>
+        group by a.id
+        order by a.created_time desc
+    </select>
+
+
+
+    <select id="getCommentListInPage" resultType="cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo">
+        select
+               a.*,
+                b.name memberName,
+                c.order_no orderNo
+        from happy_activity_comment a
+        left join mall_member b on a.member_id = b.id
+        left join happy_activity_order c on a.order_id = c.id
+        where a.activity_id = #{record.activityId}
+        order by a.created_time desc
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1