nightFragrance-massage/src/main/resources/mapper/point/PointActivityMapper.xml

@@ -65,11 +65,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             COUNT(*)
         FROM
-            point_activity
+            point_activity pa
+        INNER JOIN point_activity_task pat ON pa.id = pat.activity_id
         WHERE
-            STATUS IN ( 1, 4 )
-        AND ( city_code = '0' OR city_code = #{cityCode} )
-        AND (start_time IS NULL OR start_time <= NOW()) AND ( end_time IS NULL OR end_time >= NOW())
+            pa.status = 1
+        AND pa.activity_type != 0
+        AND ( pa.city_code = '0' OR pa.city_code = #{cityCode} )
+        AND (pa.start_time IS NULL OR pa.start_time <= NOW())
+        AND ( pa.end_time IS NULL OR pa.end_time >= NOW())
+        AND pat.status = 0
+        AND pat.is_deleted = 0
     </select>
 
     <select id="selectTaskWithProgress" resultType="com.ylx.point.domain.vo.UserPointActivityVo">

nightFragrance-massage/src/main/resources/mapper/point/PointUserActivityTaskCompletionMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCompletedTaskCount" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM point_user_activity_task_completion WHERE open_id = #{openId} AND completed_count > 0
+        SELECT COUNT(*) FROM point_user_activity_task_completion WHERE open_id = #{openId} AND completed_count > 0 AND task_type != 2
     </select>
 
     <select id="selectCompletionsByOpenIdAndTaskIds"