Merge remote-tracking branch 'origin/master'

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

@@ -55,7 +55,9 @@ public class StudentManageServiceImpl implements StudentManageService {
             Map<Integer, SysUserCashAccount> collect = byUserIds.stream()
                     .collect(Collectors.toMap(SysUserCashAccount::getUserId, sysUserCashAccount -> sysUserCashAccount));
             dataList.forEach(studentManageListDto -> {
-                studentManageListDto.setCourseBalance(collect.get(studentManageListDto.getUserId()).getCourseBalance());
+                if(collect.get(studentManageListDto.getUserId()) != null){
+                    studentManageListDto.setCourseBalance(collect.get(studentManageListDto.getUserId()).getCourseBalance());
+                }
             });
         }
         if (count == 0) {

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

@@ -513,10 +513,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderService.insert(studentPaymentOrder);
                 //生成订单明细
                 List<StudentPaymentOrderDetail> studentPaymentOrderDetails = studentAddDto.getStudentPaymentOrderDetails();
-                studentPaymentOrderDetails.forEach(e -> {
-                    e.setPaymentOrderId(studentPaymentOrder.getId());
-                });
-                studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetails);
+                if(studentPaymentOrderDetails != null && studentPaymentOrderDetails.size() > 0){
+                    studentPaymentOrderDetails.forEach(e -> {
+                        e.setPaymentOrderId(studentPaymentOrder.getId());
+                    });
+                    studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetails);
+                }
             }
             return userId;
         }

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

@@ -950,11 +950,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		studentPaymentOrder.setMusicGroupId(vipGroup.getId().toString());
 		studentPaymentOrder.setClassGroupId(classGroup.getId());
 
-		try {
-			contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+//		try {
+//			contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
 
 		//生成回调地址
 		Map<String,Object> payMap = payService.getPayMap(
@@ -1035,11 +1035,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroup.setOrganIdList(organIdsString);
 		vipGroupDao.update(vipGroup);
 
-		try {
-			contractService.transferVipGroupCoursesContract(userId,vipGroupId);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+//		try {
+//			contractService.transferVipGroupCoursesContract(userId,vipGroupId);
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
 	}
 
 	@Transactional(rollbackFor = Exception.class)

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

@@ -372,9 +372,9 @@
         SELECT
         cg.*
         FROM
-        vip_group_class_group_mapper vcgm
-        LEFT JOIN class_group cg ON vcgm.class_group_id_ = cg.id_
-        WHERE vcgm.vip_group_id_=#{vipGroupId}
+        class_group cg
+        WHERE cg.music_group_id_=#{vipGroupId}
+        AND cg.group_type_='VIP'
         <if test="delFlag!=null">
             AND cg.del_flag_ = #{delFlag}
         </if>

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

@@ -121,10 +121,9 @@
 		SELECT
 			su.organ_id_
 		FROM
-			demo_group_class_group_mapper dgcgm
-			LEFT JOIN class_group_student_mapper cgsm ON dgcgm.class_group_id_=cgsm.class_group_id_
+			class_group_student_mapper cgsm
 			LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
-		WHERE dgcgm.demo_group_id_=#{demoGroupId}
+		WHERE cgsm.music_group_id_=#{demoGroupId} AND cgsm.group_type_='DEMO'
 	</select>
     <select id="getOrganIdByUserId" resultType="java.lang.Integer">
 		select organ_id_ from sys_user where id_=#{userId}
@@ -164,9 +163,8 @@
 		SELECT
 			count(cgsm.user_id_)
 		FROM
-			demo_group_class_group_mapper dgcgm
-			LEFT JOIN class_group_student_mapper cgsm ON dgcgm.class_group_id_=cgsm.class_group_id_
-		WHERE dgcgm.demo_group_id_=#{demoGroupId}
+			class_group_student_mapper cgsm
+		WHERE cgsm.music_group_id_=#{demoGroupId} AND cgsm.group_type_='DEMO'
 	</select>
 
     <sql id="demoGroupQueryCondition">
@@ -227,10 +225,10 @@
     </select>
     <select id="findClassGroupIDByDemoGroupId" resultType="java.lang.Integer">
 		SELECT
-			class_group_id_
+			id_
 		FROM
-			demo_group_class_group_mapper
-		WHERE demo_group_id_=#{demoGroupId}
+			class_group
+		WHERE music_group_id_=#{demoGroupId} AND group_type_='DEMO'
 	</select>
     <select id="findDemoGroupByTeacherId" resultMap="DemoGroup">
 		SELECT * FROM demo_group WHERE user_id_=#{teacherId}

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

@@ -324,7 +324,7 @@
             count(*)
         FROM
             vip_group vg
-        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_ AND cg.group_type_ = 'VIP'
+        LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = 'VIP'
         <include refid="studentVipGroupQueryCondition"/>
     </select>
     <select id="getVipGroupBaseInfo" resultMap="vipGroupManageDetailDto">
@@ -416,7 +416,7 @@
         FROM
             vip_group vg
             LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = 'VIP'
-            LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+            LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
 	        LEFT JOIN school s ON vg.teacher_school_id_=s.id_
             LEFT JOIN teacher t ON vg.user_id_=t.id_
           LEFT JOIN sys_user su ON vg.user_id_=su.id_
@@ -428,9 +428,8 @@
             cs.teach_mode_ as 'key',
             COUNT(cs.id_) as 'value'
         FROM
-            vip_group_class_group_mapper vgcgm
-            LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
-            WHERE cs.status_="NOT_START" AND cs.type_="VIP" AND vgcgm.vip_group_id_=#{vipGroupId}
+            course_schedule cs
+            WHERE cs.status_="NOT_START" AND cs.type_="VIP" AND cs.music_group_id_=#{vipGroupId} AND cs.group_type_='VIP'
             GROUP BY cs.teach_mode_
     </select>
 
@@ -483,10 +482,9 @@
         SELECT
         count(*)
         FROM
-        vip_group_class_group_mapper vgcgm
-        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
-        LEFT JOIN class_group_student_mapper cgsm ON vgcgm.class_group_id_=cgsm.class_group_id_
-        WHERE vgcgm.vip_group_id_=#{vipGroupId}
+        class_group cg
+        LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
+        WHERE cg.music_group_id_=#{vipGroupId} AND cg.group_type_='VIP'
     </select>
 
     <resultMap id="teachingRecord" type="com.ym.mec.biz.dal.dto.VipGroupCourseSchduleRecordDto">
@@ -501,7 +499,7 @@
 
     <sql id="teachingRecordQueryCondition">
         <where>
-            vgcgm.vip_group_id_=#{vipGroupId}
+            cs.music_group_id_=#{vipGroupId} AND cs.group_type_='VIP'
             <if test="startTime!=null and endTime!=null">
                 AND (cs.class_date_ BETWEEN #{startTime} AND #{endTime})
             </if>
@@ -523,8 +521,7 @@
             cs.student_num_,
             csts.actual_salary_ IS NOT NULL is_salary_
         FROM
-            vip_group_class_group_mapper vgcgm
-            LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+            course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
         <include refid="teachingRecordQueryCondition"/>
         ORDER BY start_class_time_
@@ -534,8 +531,7 @@
         SELECT
         COUNT(*)
         FROM
-        vip_group_class_group_mapper vgcgm
-        LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+        course_schedule cs
         <include refid="teachingRecordQueryCondition"/>
     </select>
 
@@ -544,27 +540,28 @@
             cg.total_class_times_ totalClassTimes,
             cg.current_class_times_ currentClassTimes
         FROM
-            vip_group_class_group_mapper vgcgm
-            LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
-        WHERE vgcgm.vip_group_id_=#{vipGroupId}
+            class_group cg
+        WHERE cg.music_group_id_=#{vipGroupId}
     </select>
     <select id="countIsSalaryNum" resultType="int">
         SELECT
             COUNT(*)
         FROM
-            vip_group_class_group_mapper vgcgm
-            LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+            course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
-        WHERE vgcgm.vip_group_id_=#{vipGroupId} AND csts.settlement_time_ IS NOT NULL
+        WHERE cs.music_group_id_=#{vipGroupId}
+        AND cs.group_type_='VIP'
+        AND csts.settlement_time_ IS NOT NULL
     </select>
     <select id="countComplaintsNum" resultType="java.lang.Integer">
         SELECT
             COUNT(*)
         FROM
-            vip_group_class_group_mapper vgcgm
-            LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+            course_schedule cs
             LEFT JOIN course_schedule_complaints csc ON cs.id_=csc.course_schedule_id_
-        WHERE vgcgm.vip_group_id_=#{vipGroupId} AND csc.course_schedule_id_ IS NOT NULL
+        WHERE cs.music_group_id_=#{vipGroupId}
+        AND cs.group_type_='VIP'
+        AND csc.course_schedule_id_ IS NOT NULL
 
     </select>
     <select id="getVipGroupSalaryInfo" resultType="com.ym.mec.biz.dal.dto.VipGroupSalaryBaseInfo">
@@ -645,18 +642,18 @@
 
     <select id="countVipGroupOverCourse" resultType="java.util.Map">
         SELECT
-            vgcgm.vip_group_id_,
-            COUNT(cs.Id_)
+            cs.music_group_id_ AS 'key',
+            COUNT(cs.Id_) AS 'value'
         FROM
-            vip_group_class_group_mapper vgcgm
-            LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+            course_schedule cs
             WHERE cs.status_='OVER'
             AND DATE_FORMAT(cs.class_date_,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d')
-            AND vgcgm.vip_group_id_ IN
+            AND cs.group_type_='VIP'
+            AND cs.music_group_id_ IN
             <foreach collection="list" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
-        GROUP BY vgcgm.vip_group_id_
+        GROUP BY cs.music_group_id_
     </select>
 
     <select id="findByCourseSchedule" resultMap="VipGroup">