zouxuan 5 năm trước cách đây
mục cha
commit
dd03f9b42d

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleRewardsRulesDao.java

@@ -52,12 +52,12 @@ public interface CourseScheduleRewardsRulesDao extends BaseDAO<Integer, CourseSc
 	 * @param rewardsIds
 	 * @return
 	 */
-	List<Map<Integer, String>> findTeacherNames(List<Integer> rewardsIds);
+	List<Map<Integer, String>> findTeacherNames(@Param("rewardsIds") List<Integer> rewardsIds);
 
 	/**
 	 * 获取vip课程类型名称列表
 	 * @param rewardsIds
 	 * @return
 	 */
-	List<Map<Integer, String>> findVipCategoryNames(List<Integer> rewardsIds);
+	List<Map<Integer, String>> findVipCategoryNames(@Param("rewardsIds") List<Integer> rewardsIds);
 }

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -194,5 +194,5 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<Teacher> findTeacherByOrganId(String organId);
+    List<Teacher> findTeacherByOrganId(@Param("organId")String organId);
 }

+ 4 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -892,7 +892,10 @@
     </select>
     
     <select id="queryVipGroupTeachereClassTimesByMonth" resultType="map" parameterType="map">
-        SELECT vp.organ_id_ organ_id_,cs.actual_teacher_id_ teacher_id_,count(cs.id_) times,t.is_support_course_schedule_rewards_rules_ FROM course_schedule cs left join vip_group vp on cs.music_group_id_ = vp.id_ left join teacher t on cs.actual_teacher_id_ = t.id_ where cs.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and date_format(#{monthDate} , '%Y%m' ) = date_format(cs.class_date_, '%Y%m' ) group by vp.organ_id_,cs.actual_teacher_id_
+        SELECT vp.organ_id_ organ_id_,cs.actual_teacher_id_ teacher_id_,COUNT(cs.id_) times,t.is_support_course_schedule_rewards_rules_
+        FROM course_schedule cs LEFT JOIN vip_group vp ON cs.music_group_id_ = vp.id_ LEFT JOIN teacher t ON cs.actual_teacher_id_ = t.id_
+        WHERE cs.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND date_format(#{monthDate} , '%Y%m' ) = date_format(cs.class_date_, '%Y%m' )
+        GROUP BY vp.organ_id_,cs.actual_teacher_id_
     </select>
     
     <select id="queryFinishedWithNoUpdateStatus" resultMap="CourseSchedule">

+ 4 - 2
mec-student/src/main/java/com/ym/mec/student/controller/WithdrawController.java

@@ -2,6 +2,7 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.biz.service.StudentWithdrawService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,8 @@ public class WithdrawController extends BaseController {
 	@ApiOperation(value = "新增提现申请")
 	@PostMapping("/add")
 	public Object add(String bankCardNo, BigDecimal amount) throws Exception {
-		studentWithdrawService.apply(bankCardNo, amount);
-		return succeed();
+		throw new BizException("此功能暂未开放");
+//		studentWithdrawService.apply(bankCardNo, amount);
+//		return succeed();
 	}
 }