Merge remote-tracking branch 'origin/system_fee' into system_fee

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

@@ -727,9 +727,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if(musicGroupRegCalender == null){
             	throw new BizException("缴费信息不存在");
             }
-            BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
-            //OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-            //BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+            BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
+			if (musicGroupRegCalender.getMemberRankSettingId() != null) {
+				cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
+			} else {
+				if (musicGroup.getCloudTeacherType() != null) {
+					OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
+					cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+				}
+			}
             
             orderAmount = orderAmount.add(cloudTeacherPrice);
             studentRegistration.setHasCloudTeacher(1);
@@ -739,12 +745,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             cloudTeacherOrder = new CloudTeacherOrder();
 
     		cloudTeacherOrder.setType(2);//月
-			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate());
+			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate() == null ? 6 : musicGroupRegCalender.getMemberValidDate());
     		
     		cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
     		cloudTeacherOrder.setStudentId(studentRegistration.getUserId());
-    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId());
-    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount());
+    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId() == null ? 1 : musicGroupRegCalender.getMemberRankSettingId());
+    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount() == null ? cloudTeacherPrice : musicGroupRegCalender.getMemberPaymentAmount());
     		cloudTeacherOrder.setStatus(0);
         }
 
@@ -950,9 +956,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if(musicGroupRegCalender == null){
             	throw new BizException("缴费信息不存在");
             }
-            BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
-            //OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-            //BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+            BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
+			if (musicGroupRegCalender.getMemberRankSettingId() != null) {
+				cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
+			} else {
+				if (musicGroup.getCloudTeacherType() != null) {
+					OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
+					cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+				}
+			}
             
             orderAmount = orderAmount.add(cloudTeacherPrice);
             studentRegistration.setHasCloudTeacher(1);
@@ -962,12 +974,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             cloudTeacherOrder = new CloudTeacherOrder();
 
     		cloudTeacherOrder.setType(2);//月
-			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate());
+			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate() == null ? 6 : musicGroupRegCalender.getMemberValidDate());
     		
     		cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
     		cloudTeacherOrder.setStudentId(studentRegistration.getUserId());
-    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId());
-    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount());
+    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId() == null ? 1 : musicGroupRegCalender.getMemberRankSettingId());
+    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount() == null ? cloudTeacherPrice : musicGroupRegCalender.getMemberPaymentAmount());
     		cloudTeacherOrder.setStatus(0);
         }
 

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

@@ -95,6 +95,10 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     @Override
     public MusicGroupSubjectGoodsAndInfoDto getSubjectGoodsAndInfo(String musicGroupId, Integer subjectId) {
         MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+        
+        if(musicGroup == null){
+        	throw new BizException("乐团信息查询失败");
+        }
 
         //课程形态
         Map<String, Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
@@ -132,14 +136,26 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         musicGroupSubjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         musicGroupSubjectGoodsAndInfo.setMusicGroup(musicGroup);
-        if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE)) {
-        	musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(musicGroupRegCalender.getMemberPaymentAmount());
-            /*OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
-            musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPlusPrice());*/
-            if(musicGroupRegCalender != null) {
-            	musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(musicGroupRegCalender.getMemberRankSettingId()));
-            }
-        }
+		if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) || musicGroup.getCloudTeacherType() != null) {
+			// 历史数据
+			if (musicGroup.getCloudTeacherType() != null) {
+				OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
+				if (musicGroup.getCloudTeacherType() == 0) {
+					musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPrice());
+				} else if (musicGroup.getCloudTeacherType() == 1) {
+					musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPlusPrice());
+				}
+			} else {
+				musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(musicGroupRegCalender.getMemberPaymentAmount());
+			}
+
+			if (musicGroupRegCalender != null && musicGroupRegCalender.getMemberRankSettingId() != null) {
+				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(musicGroupRegCalender
+						.getMemberRankSettingId()));
+			} else{
+				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(1));
+			}
+		}
         return musicGroupSubjectGoodsAndInfo;
     }
 

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

@@ -243,10 +243,10 @@
                 </foreach>
             </if>
             <if test="createStartDate!=null">
-                AND date(transaction_teacher_id_) &gt;= #{createStartDate}
+                AND date(create_time_) &gt;= #{createStartDate}
             </if>
             <if test="createEndDate!=null">
-                AND date(transaction_teacher_id_) &lt;= #{createEndDate}
+                AND date(create_time_) &lt;= #{createEndDate}
             </if>
             <if test="billStartDate!=null">
                 AND date(bill_start_date_) &gt;= #{billStartDate}