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

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

@@ -365,30 +365,23 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentBaseCalender.getCalenderMember();
         if (calenderMember != null) {
             calenderMember = musicGroupPaymentCalenderMemberService.initBean(calenderMember);
+            calenderMember.setActualAmount(memberActualAmount);
             calenderMember.setOriginalAmount(memberOriginalAmount);
             calenderMember.setCalenderId(calenderId);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                calenderMember.setActualAmount(BigDecimal.ZERO);
-            }
             musicGroupPaymentCalenderMemberService.insert(calenderMember);
         }
         //保存乐保缴费信息
         MusicGroupPaymentCalenderRepair musicRepair = musicGroupPaymentBaseCalender.getMusicRepair();
         if (musicRepair != null) {
             musicRepair.setOriginalAmount(repairOriginalAmount);
+            musicRepair.setActualAmount(repairActualAmount);
             musicRepair.setCalenderId(calenderId);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                musicRepair.setActualAmount(BigDecimal.ZERO);
-            }
             musicGroupPaymentCalenderRepairService.insert(musicRepair);
         }
         //保存活动缴费信息
         List<MusicGroupPaymentCalenderActivity> calenderActivityList = musicGroupPaymentBaseCalender.getCalenderActivityList();
         if (calenderActivityList != null && calenderActivityList.size() > 0) {
             musicGroupPaymentCalenderActivityService.initBean(calenderActivityList);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                calenderActivityList.forEach(e -> e.setActualAmount(BigDecimal.ZERO));
-            }
             musicGroupPaymentCalenderActivityService.batchInsert(musicGroupPaymentBaseCalender, calenderId);
         }
         //保存课程费用列表

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

@@ -1664,7 +1664,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup.getTenantId() == null) {
             throw new BizException("乐团机构信息异常，请联系管理员");
         }
-        if (musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT || musicGroup.getStatus() != MusicGroupStatusEnum.FEE_AUDIT) {
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT && musicGroup.getStatus() != MusicGroupStatusEnum.FEE_AUDIT) {
             throw new BizException("当前乐团状态不支持此操作");
         }
         
@@ -1684,6 +1684,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //修改乐团报名缴费项目状态
             List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(musicGroupId, statusList, null);
             
+            if(musicGroupPaymentCalenderList == null || musicGroupPaymentCalenderList.size() == 0){
+            	throw new BizException("没有审核中的缴费项目");
+            }
+            
             musicGroupPaymentCalenderList.forEach(t -> {
                 if (t.getPayUserType() == SCHOOL) {
                     if (t.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) > 0) {

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

@@ -533,7 +533,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChangeDao.insert(subjectChange);
         //差价小于0退到余额
         if (amountMargin.compareTo(BigDecimal.ZERO) <= 0) {
-//            sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
+            /*sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
             if (amountMargin.compareTo(BigDecimal.ZERO) < 0) {
                 SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
                 sysUserCashAccountLog.setUserId(subjectChange.getStudentId());
@@ -544,7 +544,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.SUBJECT_CHANGE);
                 sysUserCashAccountLog.setComment("声部更换退还");
                 sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
-            }
+            }*/
             studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
         }