Merge branch 'zx_activity_buy' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -118,15 +118,6 @@ public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
      */
     int queryStudentPersonalAttendancesCount(Map<String,Object> params);
 
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/9/18
-     * 统计正常签到的学生数量
-     */
-    @Select("SELECT COUNT(*) FROM student_attendance WHERE class_group_id_=#{classGroupID} AND status_=\"NORMAL\"")
-    int countNormalAttendanceStudentNums(Long classGroupID);
-
     /**
      * @Author: Joburgess
      * @Date: 2019/10/16

mec-biz/src/main/java/com/ym/mec/biz/service/CloudTeacherOrderService.java

@@ -41,7 +41,7 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
     */
     void activationMember(Date now, CloudTeacherOrder cloudTeacherOrder);
 
-    Date calcCloudTeacherOrderTime(CloudTeacherOrder cloudTeacherOrder, Date startTime, Date endTime);
+    Date calcCloudTeacherOrderTime(CloudTeacherOrder cloudTeacherOrder, Date startTime);
 
     /**
      * 获取乐团云教练订单

mec-biz/src/main/java/com/ym/mec/biz/service/StudentAttendanceService.java

@@ -109,20 +109,6 @@ public interface StudentAttendanceService extends BaseService<Long, StudentAtten
 	void repairStudentAttendance(Integer month);
 
 	/**
-	 * 获取签到数据
-	 * @param courseId
-	 * @param userId
-	 */
-	StudentAttendance findByStatusAndCourseScheduleId(Long courseId, Integer userId);
-
-	/**
-	 * 清除当前学生签退信息
-	 * @param courseId
-	 * @param userId
-	 */
-	void cleanCourseStudentSignOut(Long courseId, Integer userId);
-
-	/**
 	 * 学员考勤导出列表
 	 * @author zouxuan
 	 * @param queryInfo

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

@@ -298,8 +298,12 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void activationMember(Date now,CloudTeacherOrder cloudTeacherOrder){
+        Student student = studentService.get(cloudTeacherOrder.getStudentId());
+        if(student.getMembershipEndTime() != null && student.getMembershipEndTime().compareTo(now) > 0){
+            now = student.getMembershipEndTime();
+        }
         Date startTime = DateUtil.trunc(now);
-        Date endTime = this.calcCloudTeacherOrderTime(cloudTeacherOrder, startTime, now);
+        Date endTime = this.calcCloudTeacherOrderTime(cloudTeacherOrder, startTime);
         cloudTeacherOrder.setStartTime(startTime);
         cloudTeacherOrder.setEndTime(DateUtil.addDays(endTime,1));
         cloudTeacherOrder.setStatus(2);
@@ -311,7 +315,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         studentService.updateMemberRank(cloudTeacherOrder.getStudentId(), cloudTeacherOrder.getType(), cloudTeacherOrder.getTime(), 1);
     }
 
-    public Date calcCloudTeacherOrderTime(CloudTeacherOrder cloudTeacherOrder, Date startTime, Date endTime) {
+    public Date calcCloudTeacherOrderTime(CloudTeacherOrder cloudTeacherOrder, Date startTime) {
+        Date endTime = startTime;
         if (cloudTeacherOrder.getType() == DAY) { // 日
             endTime = DateUtil.addDays(startTime, cloudTeacherOrder.getTime());
         } else if (cloudTeacherOrder.getType() == MONTH) { // 月

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

@@ -778,15 +778,6 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
         }
     }
 
-    @Override
-    public StudentAttendance findByStatusAndCourseScheduleId(Long courseId, Integer userId) {
-        return studentAttendanceDao.findByStatusAndCourseScheduleId(userId, courseId.intValue());
-    }
-
-    @Override
-    public void cleanCourseStudentSignOut(Long courseId, Integer userId) {
-        studentAttendanceDao.cleanCourseStudentSignOut(courseId, userId);
-    }
 
     @Override
     public PageInfo<ExportStudentAttendanceDto> exportStudentAttendancesQueryPage(ExportStudentAttendanceQueryInfo queryInfo) {