From 747b1968b2d9ad3d4279485d13dfe24d0968fd99 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 30 Apr 2025 10:22:46 +0800
Subject: [PATCH] fix(votesActivity): 修复支付方式显示逻辑错误
---
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