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

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

@@ -1441,10 +1441,24 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if(calenders.size() == 0){
 			throw new BizException("缴费批次不存在");
 		}
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		Date date = new Date();
 		calenders.forEach(e->{
+			if(e.getPaymentType() == ADD_STUDENT || e.getPaymentType() == SPAN_GROUP_CLASS_ADJUST){
+				throw new BizException("{} 的缴费项目不允许撤回",e.getStatus().getDesc());
+			}
 			if(e.getStatus() != AUDITING){
 				throw new BizException("{} 的缴费状态不允许撤回",e.getStatus().getDesc());
 			}
+			if(e.getPaymentType() == MUSIC_APPLY){
+				//如果是报名，并且所有的报名都审核通过，需要修改乐团状态
+				MusicGroup musicGroup = musicGroupDao.get(e.getMusicGroupId());
+				musicGroup.setStatus(MusicGroupStatusEnum.PRE_BUILD_FEE);
+				musicGroup.setUpdateTime(date);
+				musicGroupDao.update(musicGroup);
+				//记录操作日志
+				musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目撤回（费用审核中 -> 撤回）", sysUser.getId(), ""));
+			}
 			e.setStatus(DRAFT);
 		});
 		musicGroupPaymentCalenderDao.batchUpdate(calenders);
@@ -1523,8 +1537,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			throw new BizException("缴费信息不存在");
 		}
 		if (calender.getStatus() != PaymentCalenderStatusEnum.AUDITING && calender.getStatus() != PaymentCalenderStatusEnum.NO
-				&& calender.getStatus() != PaymentCalenderStatusEnum.REJECT) {
-			throw new BizException("删除失败,只有[审核中]、[拒绝]或[未开启缴费]状态才能删除");
+				&& calender.getStatus() != PaymentCalenderStatusEnum.REJECT && calender.getStatus() != DRAFT) {
+			throw new BizException("删除失败,{} 的缴费项目不允许删除");
 		}
 		MusicGroupStudentClassAdjust byBatchNo = musicGroupStudentClassAdjustDao.findByBatchNo(calender.getBatchNo());
 		if(byBatchNo != null){
@@ -1598,7 +1612,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 		//更新学生的缴费记录状态
 		calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
-		calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
+		calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
 		calenderDetail.setPayTime(date);
 		calenderDetail.setUpdateTime(date);
 		musicGroupPaymentCalenderDetailDao.update(calenderDetail);

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

@@ -2301,7 +2301,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         String orderNo = idGeneratorService.generatorId("payment") + "";
 
-        BigDecimal amount = calenderDetail.getExpectAmount();
+        BigDecimal amount = calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount());
 
         Date date = new Date();
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();

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

@@ -315,7 +315,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
 
                 for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
-                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
+                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
                     calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
                     calenderDetail.setPayTime(nowDate);
                     calenderDetail.setUpdateTime(nowDate);

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

@@ -1056,30 +1056,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         return classGroupStuList;
     }
 
-    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public void updateCalender(Long calenderDetailId, Integer userId) {
-        Date date = new Date();
-        MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.get(calenderDetailId);
-        MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderDetail.getMusicGroupPaymentCalenderId());
-        MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId, calender.getMusicGroupId());
-        if (calender.getIsGiveMusicNetwork()) {
-            //赠送网管课
-            musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
-        }
-        //更新学生的缴费记录状态
-        calenderDetail.setPaymentStatus(PAID_COMPLETED);
-        calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
-        calenderDetail.setPayTime(date);
-        calenderDetail.setUpdateTime(date);
-        musicGroupPaymentCalenderDetailDao.update(calenderDetail);
-
-        //更新实际缴费人数
-        Integer actualNum = calender.getActualNum() == null ? 0 : calender.getActualNum();
-        calender.setActualNum(actualNum + 1);
-        calender.setUpdateTime(date);
-        musicGroupPaymentCalenderDao.update(calender);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) throws Exception {

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

@@ -84,7 +84,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
                 model.put("calenderCourseSettings", musicGroupPaymentStudentCourseDetailDao.findByCalenderAndUserId(calenderId,userId));
             }
             model.put("musicGroup",musicGroupDao.get(musicGroupId));
-            model.put("amount", calenderDetail.getExpectAmount());
+            model.put("amount", calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
             model.put("balance",studentRegistration.getBalance());
             model.put("calender",calender);
             model.put("memberPrivilegesItemList", memberRankPrivilegesService.queryByMemberRankId(calender.getMemberRankSettingId()));