Merge remote-tracking branch 'origin/master'

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

@@ -281,10 +281,18 @@ public interface StudentManageDao {
     List<StudentListCourseDto> queryStudentRemianCourse(@Param("userIds") Set<Integer> userIds);
 
     /**
-     * 获取教务老师关联的学员列表
+     * 获取教务老师关联vip的学员列表
      *
      * @param groupType
      * @return
      */
-    List<BasicUserDto> queryGroupStudents(@Param("groupType") String groupType, @Param("userId") Integer userId);
+    List<BasicUserDto> queryVipGroupStudents(@Param("userId") Integer userId);
+
+    /**
+     * 获取教务老师关联网管课的学员列表
+     *
+     * @param groupType
+     * @return
+     */
+    List<BasicUserDto> queryPracticeGroupStudents(@Param("userId") Integer userId);
 }

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

@@ -1,12 +1,13 @@
 package com.ym.mec.biz.dal.dto;
 
 import java.util.List;
+import java.util.Set;
 
 public class MusicGroupPaymentCalenderAddStudentDto {
 
 	private String batchNo;
 
-	private List<Integer> userIdList;
+	private Set<Integer> userIdList;
 
 	public String getBatchNo() {
 		return batchNo;
@@ -16,11 +17,11 @@ public class MusicGroupPaymentCalenderAddStudentDto {
 		this.batchNo = batchNo;
 	}
 
-	public List<Integer> getUserIdList() {
+	public Set<Integer> getUserIdList() {
 		return userIdList;
 	}
 
-	public void setUserIdList(List<Integer> userIdList) {
+	public void setUserIdList(Set<Integer> userIdList) {
 		this.userIdList = userIdList;
 	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupSubjectGoodsGroup.java

@@ -46,6 +46,9 @@ public class MusicGroupSubjectGoodsGroup {
 	//团购减免课程费用
 	private BigDecimal remissionCourseFee;
 
+	//团购减免课程费用 1-是 0-否
+	private Integer groupRemissionCourseFee;
+
 	//租赁押金
 	private BigDecimal depositFee;
 
@@ -205,4 +208,11 @@ public class MusicGroupSubjectGoodsGroup {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public Integer getGroupRemissionCourseFee() {
+		return groupRemissionCourseFee;
+	}
+
+	public void setGroupRemissionCourseFee(Integer groupRemissionCourseFee) {
+		this.groupRemissionCourseFee = groupRemissionCourseFee;
+	}
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Set;
 
 import com.ym.mec.biz.dal.dto.FeeStudentDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
@@ -49,14 +50,14 @@ public interface MusicGroupPaymentCalenderDetailService extends BaseService<Long
      * @param musicGroupPaymentCalenderId
      * @param userIdList
      */
-    void batchAdd(Long musicGroupPaymentCalenderId, List<Integer> userIdList);
+    void batchAdd(Long musicGroupPaymentCalenderId, Set<Integer> userIdList);
 
     /**
      * 乐团缴费记录新增学员
      * @param batchNo
      * @param userIdList
      */
-    void batchAdd(String batchNo, List<Integer> userIdList);
+    void batchAdd(String batchNo, Set<Integer> userIdList);
 
     /**
      * 获取fee表学员列表

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import java.util.List;
+import java.util.Set;
 
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto;
@@ -171,5 +172,5 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @param musicGroup:
 	 * @return com.ym.mec.biz.dal.entity.MusicGroupStudentFee
 	 */
-	void pushWaitRenewMessage(Long calenderId, MusicGroup musicGroup);
+	void pushWaitRenewMessage(Long calenderId, MusicGroup musicGroup, Set<Integer> studentIds);
 }

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

@@ -278,7 +278,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void batchAdd(Long musicGroupPaymentCalenderId, List<Integer> userIdList) {
+	public void batchAdd(Long musicGroupPaymentCalenderId, Set<Integer> userIdList) {
 		
 		MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderService.get(musicGroupPaymentCalenderId);
 		if(musicGroupPaymentCalender == null){
@@ -373,13 +373,13 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		}
 		//给学员推送缴费通知
 		if(musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.OPEN){
-			musicGroupPaymentCalenderService.pushWaitRenewMessage(musicGroupPaymentCalenderId,musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId()));
+			musicGroupPaymentCalenderService.pushWaitRenewMessage(musicGroupPaymentCalenderId,musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId()),userIdList);
 		}
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void batchAdd(String batchNo, List<Integer> userIdList) {
+	public void batchAdd(String batchNo, Set<Integer> userIdList) {
 		
 		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.findByBatchNo(batchNo);
 		
@@ -483,7 +483,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenderList) {
 			if (musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.OPEN) {
 				musicGroupPaymentCalenderService.pushWaitRenewMessage(musicGroupPaymentCalenderId,
-						musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId()));
+						musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId()),userIdList);
 			}
 		}
 	}

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

@@ -419,7 +419,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				}else if(musicGroupPaymentCalenderDto.getMergeClassFlag()){
 					//缴费项目添加学员
 					int[] ints = Arrays.stream(musicGroupPaymentCalenderDto.getStudentIds().split(",")).mapToInt(Integer::parseInt).toArray();
-					List<Integer> list2 = Arrays.stream(ints).boxed().collect(Collectors.toList());
+					Set<Integer> list2 = Arrays.stream(ints).boxed().collect(Collectors.toSet());
 					musicGroupPaymentCalenderDetailService.batchAdd(musicGroupPaymentCalender.getId(),list2);
 				}
 			}
@@ -965,7 +965,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		for (MusicGroupPaymentCalender calender : musicGroupPaymentCalenders) {
 			//缴费项目添加学员
 			int[] ints = Arrays.stream(calender.getStudentIds().split(",")).mapToInt(Integer::parseInt).toArray();
-			List<Integer> list2 = Arrays.stream(ints).boxed().collect(Collectors.toList());
+			Set<Integer> list2 = Arrays.stream(ints).boxed().collect(Collectors.toSet());
 			musicGroupPaymentCalenderDetailService.batchAdd(calender.getId(),list2);
 		}
 		//每种课程类型单独排课
@@ -1103,8 +1103,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	}
 
 	//推送待续费通知
-	public void pushWaitRenewMessage(Long calenderId,MusicGroup musicGroup){
-		Set<Integer> studentIds = musicGroupPaymentCalenderDetailDao.queryNoPaymentStudentIds(calenderId);
+	public void pushWaitRenewMessage(Long calenderId,MusicGroup musicGroup,Set<Integer> studentIds){
+		if(studentIds == null){
+			studentIds = musicGroupPaymentCalenderDetailDao.queryNoPaymentStudentIds(calenderId);
+		}
 		if (studentIds.size() > 0) {
 			String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 			String memo = "4?" + baseUrl + "/#/musicGroupRenew?calenderId="+calenderId+"&id=" + musicGroup.getId();
@@ -1157,7 +1159,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				mgpc.setStatus(PaymentCalenderStatusEnum.OPEN);
 				updateMusicGroupPaymentCalenderList.add(mgpc);
 				//推送待续费通知
-				pushWaitRenewMessage(mgpc.getId(),musicGroup);
+				pushWaitRenewMessage(mgpc.getId(),musicGroup,null);
 			}
 		}
 		if (updateMusicGroupPaymentCalenderList.size() > 0) {

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

@@ -694,6 +694,10 @@ public class StudentManageServiceImpl implements StudentManageService {
         if(sysUser == null || sysUser.getId() == null){
             throw new BizException("用户信息获取失败");
         }
-        return studentManageDao.queryGroupStudents(groupType,sysUser.getId());
+        if("VIP".equals(groupType)){
+            return studentManageDao.queryVipGroupStudents(sysUser.getId());
+        }else {
+            return studentManageDao.queryPracticeGroupStudents(sysUser.getId());
+        }
     }
 }

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

@@ -561,7 +561,7 @@
             mg.id_ music_group_id_,
             mg.name_ music_group_name_,
             s.id_ school_id_,
-            CASE WHEN cg.type_ IN ("HIGH_ONLINE","MUSIC_NETWORK") THEN '网络教室' ELSE s.name_ END school_name_
+            CASE WHEN cg.type_ IN ('HIGH_ONLINE','MUSIC_NETWORK') THEN '网络教室' ELSE s.name_ END school_name_
         FROM
             course_schedule_teacher_salary csts
             LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_

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

@@ -17,6 +17,7 @@
         <result column="price_" property="price"/>
         <result column="deposit_fee_" property="depositFee"/>
         <result column="remission_course_fee_" property="remissionCourseFee"/>
+        <result column="group_remission_course_fee_" property="groupRemissionCourseFee"/>
         <result column="kit_group_purchase_type_json_" property="kitGroupPurchaseTypeJson"/>
         <result column="course_purchase_type_json_" property="coursePurchaseTypeJson"/>
     </resultMap>
@@ -45,10 +46,10 @@
 
     <insert id="batchInsert" parameterType="java.util.List">
         INSERT INTO music_group_subject_goods_group
-        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_) VALUES
+        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,group_remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_) VALUES
         <foreach collection="lists" item="item" index="index" separator=",">
             (#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.kitGroupPurchaseTypeJson},#{item.coursePurchaseTypeJson})
+            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.groupRemissionCourseFee},#{item.kitGroupPurchaseTypeJson},#{item.coursePurchaseTypeJson})
         </foreach>
     </insert>
 

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

@@ -813,24 +813,25 @@
 		GROUP BY cssp.`user_id_`
     </select>
 
-    <select id="queryGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+    <select id="queryVipGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
         SELECT su.id_,su.username_,su.phone_,su.avatar_ head_url_,su.gender_ FROM
-        <if test="groupType = 'PRACTICE'">
-            practice_group pg
-        </if>
-        <if test="groupType = 'VIP'">
-            vip_group pg
-        </if>
+        vip_group vg
+        LEFT JOIN class_group_student_mapper cgsm ON vg.id_ = cgsm.music_group_id_
+        LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
+        WHERE cgsm.group_type_ = 'VIP' AND cgsm.status_ != 'QUIT'
+        AND vg.educational_teacher_id_ = #{userId}
+        AND vg.group_status_ IN (0,1,2,5)
+        GROUP BY cgsm.user_id_
+    </select>
+
+    <select id="queryPracticeGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.id_,su.username_,su.phone_,su.avatar_ head_url_,su.gender_ FROM
+        practice_group pg
         LEFT JOIN class_group_student_mapper cgsm ON pg.id_ = cgsm.music_group_id_
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
-        WHERE cgsm.group_type_ = #{groupType} AND cgsm.status_ != 'QUIT'
+        WHERE cgsm.group_type_ = 'PRACTICE' AND cgsm.status_ != 'QUIT'
         AND pg.educational_teacher_id_ = #{userId}
-        <if test="groupType = 'PRACTICE'">
-            AND pg.group_status_ NOT IN ('FINISH','CANCEL')
-        </if>
-        <if test="groupType = 'VIP'">
-            AND pg.group_status_ IN (0,1,2,5)
-        </if>
+        AND pg.group_status_ NOT IN ('FINISH','CANCEL')
         GROUP BY cgsm.user_id_
     </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/education/EduStudentStudentController.java

@@ -40,7 +40,7 @@ public class EduStudentStudentController extends BaseController {
     }
 
     @ApiOperation(value = "教务老师关联的学员列表")
-    @PostMapping("studentManage/queryGroupStudents")
+    @GetMapping("studentManage/queryGroupStudents")
     public Object queryGroupStudents(String groupType){
         return succeed(studentManageService.queryGroupStudents(groupType));
     }