Merge remote-tracking branch 'origin/master'

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

@@ -237,4 +237,11 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	 * @param teacherId
 	 */
 	void deleteByCourseAndTeacherId(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
+
+	/**
+	 * 获取上课时间
+	 * @param courseScheduleId
+	 * @return
+	 */
+    Integer getAttendClassTime(Integer courseScheduleId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDetailDto.java

@@ -30,6 +30,16 @@ public class TeacherAttendanceDetailDto {
 
     private Date signOutTime;
 
+    private Integer attendClassTime;
+
+    public Integer getAttendClassTime() {
+        return attendClassTime;
+    }
+
+    public void setAttendClassTime(Integer attendClassTime) {
+        this.attendClassTime = attendClassTime;
+    }
+
     public String getTeacherName() {
         return teacherName;
     }

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

@@ -574,6 +574,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		result.setTeachMode(courseSchedule.getTeachMode());
 		result.setType(courseSchedule.getType());
 		result.setTeacherName(teacherDao.queryNameById(courseSchedule.getActualTeacherId()));
+		result.setAttendClassTime(teacherAttendanceDao.getAttendClassTime(courseScheduleId));
 		if(teacherAttendance != null){
 			result.setIsSignIn(Objects.isNull(teacherAttendance.getSignInStatus())?3:teacherAttendance.getSignInStatus().getCode());
 			result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());

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

@@ -527,6 +527,13 @@
         LEFT JOIN course_schedule cs ON cs.id_ = ta.course_schedule_id_
         <include refid="queryTeacherAttendanceComplaintsSql"/>
     </select>
+    <select id="getAttendClassTime" resultType="java.lang.Integer">
+        SELECT ROUND((UNIX_TIMESTAMP(CASE WHEN MIN(ta.sign_out_time_) &lt; MIN(sa.sign_out_time_) THEN MIN(ta.sign_out_time_) ELSE MIN(sa.sign_out_time_) END)-
+        UNIX_TIMESTAMP(CASE WHEN MAX(ta.sign_in_time_) > MAX(sa.sign_in_time_) THEN MAX(ta.sign_in_time_) ELSE MAX(sa.sign_in_time_) END))/60)
+        FROM teacher_attendance ta
+        LEFT JOIN student_attendance sa ON ta.course_schedule_id_ = sa.course_schedule_id_
+        WHERE ta.course_schedule_id_ = #{courseScheduleId}
+    </select>
 
     <update id="updateViPSignOutStatus" parameterType="string">
     	UPDATE teacher_attendance SET sign_out_status_ = 1,sign_out_time_= now()

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -154,7 +154,7 @@ public class StudentOrderController extends BaseController {
         String appId = "wxcf8e8b33a9477845";
         String appSecret = "1286452b9c68b13325dece7cdf892645";
         String wxMpOAuth2AccessTokenUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
-        payChannel = PayChannelEnum.ALIPAY_QR.getCode();
+        //payChannel = PayChannelEnum.ALIPAY_QR.getCode();
 //        if (!new Pay().verifySign(amount, orderNo, notifyUrl, orderSubject, orderBody,sign)) {
 //            return failed("签名验证失败");
 //        }
@@ -662,4 +662,11 @@ public class StudentOrderController extends BaseController {
         practice4Organs = practice4Organs.stream().sorted(Comparator.comparingDouble(Practice4OrganDto::getScale).reversed()).collect(Collectors.toList());
         return succeed(practice4Organs);
     }
+
+    @GetMapping("/getIngOrderByGroupType")
+    public HttpResponseResult getIngOrderByGroupType(Integer userId,String musicGroupId,GroupType groupType){
+        List<StudentPaymentOrder> userGroupOrders = studentPaymentOrderDao.findUserGroupOrders(userId, musicGroupId, groupType, DealStatusEnum.ING);
+        return succeed(userGroupOrders);
+
+    }
 }