云教练活动

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -77,4 +78,6 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
     String queryActiveOrderPage(@Param("userId") Integer userId,
                                                  @Param("activeRemark") Integer activeRemark,
                                                  @Param("remark") String remark);
+
+    List<Integer> getStudentIds();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -794,8 +794,11 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         //清除标记
         studentDao.cleanCountFlag();
         //打标记
+        List<Integer> studentIds = new ArrayList<>();
         //获取在会员团的学员
-        List<Integer> studentIds = studentRegistrationDao.queryHasMemberGroupStudent();
+        studentIds.addAll(studentRegistrationDao.queryHasMemberGroupStudent());
+        //获取购买过云教练（非活动）的学员
+        studentIds.addAll(cloudTeacherOrderDao.getStudentIds());
         studentDao.remarkCountFlag(studentIds);
         //更新目标学员、目标金额
         SysConfig config = sysConfigDao.findByParamName("cloud_teacher_active_target");

mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

@@ -258,6 +258,9 @@
             AND cto.remark_ = #{remark}
         </if>
     </select>
+    <select id="getStudentIds" resultType="java.lang.Integer">
+        SELECT DISTINCT student_id_ FROM cloud_teacher_order WHERE active_remark_ IS NULL AND status_ != 0
+    </select>
     <sql id="queryCloudTeacherActiveDetailSql">
         <where>
             cto.status_ != 0 AND cto.active_remark_ = '202109'