Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

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

@@ -290,14 +290,6 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param musicGroupId
      * @return
      */
-    List<Integer> queryNormalUser(String musicGroupId);
-
-    /**
-     * 获取乐团在读人数
-     *
-     * @param musicGroupId
-     * @return
-     */
     List<Integer> queryNormalUserList(String musicGroupId);
 
     /**

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

@@ -142,7 +142,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 				studentCourseDetail.setMusicGroupSchoolTermCourseDetailId(courseDetail.getId());
 				studentCourseDetail.setMemberCourseMinutes(courseDetail.getTotalCourseTime());
 				//获取乐团所有在读学员
-				List<Integer> studentIds = studentRegistrationDao.queryNormalUser(musicGroupId);
+				List<Integer> studentIds = studentRegistrationDao.queryNormalUserList(musicGroupId);
 				if(studentIds == null || studentIds.size() == 0){
 					throw new BizException("操作失败：该乐团没有在读学员");
 				}

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

@@ -750,7 +750,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     		cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
     		cloudTeacherOrder.setStudentId(studentRegistration.getUserId());
     		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId() == null ? 1 : musicGroupRegCalender.getMemberRankSettingId());
-    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount() == null ? cloudTeacherPrice : musicGroupRegCalender.getMemberPaymentAmount());
+    		cloudTeacherOrder.setAmount(cloudTeacherPrice);
     		cloudTeacherOrder.setStatus(0);
         }
 

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

@@ -141,9 +141,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 			if (musicGroup.getCloudTeacherType() != null) {
 				OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
 				if (musicGroup.getCloudTeacherType() == 0) {
-					musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPrice());
+					musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(cloudTeacherFee.getPrice());
 				} else if (musicGroup.getCloudTeacherType() == 1) {
-					musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPlusPrice());
+					musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(cloudTeacherFee.getPlusPrice());
 				}
 			} else {
 				musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(musicGroupRegCalender.getMemberPaymentAmount());

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

@@ -488,16 +488,25 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             maintenanceOrderDetail.setIsRenew(0);
             studentPaymentOrderDetailList.add(maintenanceOrderDetail);
         }
+
+        MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
+        
         //云教练/云教练+
         if (buyCloudTeacher || buyCloudTeacherPlus) {
-            // OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-            // BigDecimal cloudTeacherPrice = buyCloudTeacher ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
-            
-            MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(studentRegistration.getMusicGroupId());
-            if(musicGroupRegCalender == null){
-            	throw new BizException("缴费信息不存在");
-            }
-            BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
+        	
+        	BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
+        	
+        	if(musicGroup.getCloudTeacherType() != null){
+        		OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
+                cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+        	}else {
+        		MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(studentRegistration.getMusicGroupId());
+                if(musicGroupRegCalender == null){
+                	throw new BizException("缴费信息不存在");
+                }
+                
+                cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
+        	}
             
             OrderDetailTypeEnum orderDetailTypeEnum = OrderDetailTypeEnum.CLOUD_TEACHER;
             StudentPaymentOrderDetail cloudTeacherOrderDetail = new StudentPaymentOrderDetail();
@@ -512,8 +521,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetailList);
 
-        MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
-
         //增加缴费学生数,0元订单不增加报名人数(没买云教练/云教练+的)
         boolean paidZeroFlag = false;
         boolean firstPaidZeroFlag = false;

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

@@ -852,12 +852,6 @@
         AND FIND_IN_SET(sr.music_group_id_, #{musicGroupIds})
         GROUP BY sr.music_group_id_
     </select>
-    <select id="queryNormalUser" resultType="integer">
-        SELECT sr.user_id_
-        FROM student_registration sr
-        WHERE sr.music_group_status_ != 'QUIT'
-        AND sr.music_group_id_ = #{musicGroupIds}
-    </select>
     <select id="queryNormalUserList" resultType="integer">
         SELECT sr.user_id_
         FROM student_registration sr