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

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,10 @@ public class MemberRankPrivilegesServiceImpl extends BaseServiceImpl<Integer, Me
 	public List<MemberPrivilegesItem> queryByMemberRankId(Integer memberRankId) {
 		List<Integer> memberPrivilegesIdList = memberRankPrivilegesDao.findByRankSettingId(memberRankId).stream().map(e -> e.getMemberPrivilegesId())
 				.collect(Collectors.toList());
+		
+		if (memberPrivilegesIdList == null || memberPrivilegesIdList.size() == 0) {
+			return new ArrayList<MemberPrivilegesItem>();
+		}
 
 		List<MemberPrivilegesItem> memberPrivilegesItemList = memberPrivilegesItemDao.findById(memberPrivilegesIdList);
 

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

@@ -619,6 +619,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 		//会员原价
 		BigDecimal memberPaymentAmount = BigDecimal.ZERO;
+		BigDecimal originalMemberPaymentAmount = BigDecimal.ZERO;
 		if (payUserType == SCHOOL) {
 			status = AUDITING;
 		} else {
@@ -708,12 +709,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				switch (musicGroupPaymentCalenderDto.getMemberValidDate()){
 					case 1 :
 						memberPaymentAmount = memberFee.getCurrentMonthFee().setScale(0, BigDecimal.ROUND_HALF_UP);
+						originalMemberPaymentAmount = memberFee.getOriginalMonthFee().setScale(0, BigDecimal.ROUND_HALF_UP);
 						break;
 					case 6 :
 						memberPaymentAmount = memberFee.getCurrentHalfYearFee().setScale(0, BigDecimal.ROUND_HALF_UP);
+						originalMemberPaymentAmount = memberFee.getOriginalHalfYearFee().setScale(0, BigDecimal.ROUND_HALF_UP);
 						break;
 					case 12 :
 						memberPaymentAmount = memberFee.getCurrentYearFee().setScale(0, BigDecimal.ROUND_HALF_UP);
+						originalMemberPaymentAmount = memberFee.getOriginalYearFee().setScale(0, BigDecimal.ROUND_HALF_UP);
 						break;
 					default:
 						throw new BizException("请选择正确的会员有效期");
@@ -742,7 +746,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			MusicGroupPaymentCalender musicGroupPaymentCalender = new MusicGroupPaymentCalender();
 			musicGroupPaymentCalender.setAttribute1(musicGroupPaymentCalenderDto.getAttribute1());
 			musicGroupPaymentCalender.setAttribute2(musicGroupPaymentCalenderDto.getAttribute2());
-			musicGroupPaymentCalender.setOriginalMemberPaymentAmount(memberPaymentAmount);
+			musicGroupPaymentCalender.setOriginalMemberPaymentAmount(originalMemberPaymentAmount);
 			musicGroupPaymentCalender.setDeadlinePaymentDate(musicGroupPaymentDateRange.getDeadlinePaymentDate());
 			musicGroupPaymentCalender.setIsGiveMusicNetwork(musicGroupPaymentCalenderDto.getIsGiveMusicNetwork());
 			musicGroupPaymentCalender.setMemo(musicGroupPaymentCalenderDto.getMemo());

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -129,6 +129,7 @@ public class StudentManageController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		Student student = studentService.get(user.getId());
+		student.setId(user.getId());
 		student.setUsername(user.getUsername());
 		student.setPhone(user.getPhone());
 		student.setCurrentClass(user.getCurrentClass());