From e16ac98e0d1049d18c508799d64f11d942c74920 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 27 Apr 2025 14:32:57 +0800
Subject: [PATCH] refactor(votesActivity): 修改自主报名字段名称

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

diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index 699c95e..cb27b7f 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -30,7 +30,13 @@
                 </if>
             </if>
         </where>
-        order by a.order_cnt asc, a.id desc
+        <if test="record.hotState != null">
+            order by (select count(id) from happy_follow where source_id = a.id and type in (2,3)) desc,a.order_cnt asc
+        </if>
+        <if test="record.hotState == null">
+            order by a.order_cnt asc,a.id desc
+        </if>
+
     </select>
 
     <select id="getVoteRecordInPage" resultType="cc.mrbird.febs.mall.vo.ApiVoteRecordInPageVo">
@@ -49,6 +55,11 @@
         update happy_activity_option set likes_cnt = likes_cnt + 1 where id = #{id}
     </update>
 
+
+    <update id="updateHappyActivitySurplusCnt" >
+        update happy_activity set surplus_cnt = likes_cnt + #{cnt} where id = #{id}
+    </update>
+
     <select id="getVoteOptionInPage" resultType="cc.mrbird.febs.mall.vo.ApiActivityOptionListVo">
         select
             a.id as id,

--
Gitblit v1.9.1