update

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

@@ -249,12 +249,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         }*/
 
         // 不是进行中，只能创建一次缴费
-        /*if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {
             List<MusicGroupPaymentCalender> list = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
             if (list.size() > 0) {
                 throw new BizException("创建失败，已经存在缴费信息");
             }
-        }*/
+        }
         //进行中加学员拓展信息
         CalenderAddStudent calenderAddStudent = musicGroupPaymentBaseCalender.getCalenderAddStudent();
         MusicGroupPaymentCalender musicGroupPaymentCalender = new MusicGroupPaymentCalender();

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import static com.ym.mec.biz.dal.entity.ApprovalStatus.PROCESSING;
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.SCHOOL;
 import static com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED;
 import static com.ym.mec.biz.dal.enums.DealStatusEnum.ING;
 import static com.ym.mec.biz.dal.enums.DealStatusEnum.SUCCESS;
@@ -806,7 +807,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             }
         }
-        musicGroup.setStatus(MusicGroupStatusEnum.PRE_BUILD_FEE);
+        musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
         musicGroup.setUpdateTime(new Date());
         musicGroupDao.update(musicGroup);
 
@@ -816,7 +817,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         //记录操作日志
-        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目失败（预报名 -> 准备创建缴费）", sysUser.getId(), ""));
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "预报名完成（预报名 -> 报名中）", sysUser.getId(), ""));
 
         return true;
     }
@@ -1546,14 +1547,26 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
+        Date date = new Date();
+        
         MusicGroup musicGroup = saveLog(musicGroupId, MusicGroupStatusEnum.DRAFT);
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "提交审核（草稿 -> 审核中）", sysUser.getId(), ""));
         musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
+        musicGroup.setUpdateTime(date);
         musicGroupDao.update(musicGroup);
         
+        List<PaymentCalenderStatusEnum> statusList = new ArrayList<MusicGroupPaymentCalender.PaymentCalenderStatusEnum>();
+        statusList.add(PaymentCalenderStatusEnum.DRAFT);
         //修改乐团报名缴费项目状态
-        //musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId)
+        List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(musicGroupId, statusList, null);
+        
+        musicGroupPaymentCalenderList.forEach(t -> {
+        	t.setStatus(PaymentCalenderStatusEnum.AUDITING);
+        	t.setUpdateTime(date);
+        });
+        
+        musicGroupPaymentCalenderDao.batchUpdate(musicGroupPaymentCalenderList);
         
         sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), new SysUserRoleEnum[]{ORGAN_MANAGER},
                 null, null, MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, sysUser.getRealName(), musicGroup.getName());
@@ -1566,20 +1579,28 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
+        Date date = new Date();
+        
         MusicGroup musicGroup = saveLog(musicGroupId, MusicGroupStatusEnum.AUDIT);
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "乐团审核失败（审核中 -> 审核失败）", sysUser.getId(), memo));
         musicGroup.setMemo(memo);
         musicGroup.setStatus(MusicGroupStatusEnum.AUDIT_FAILED);
+        musicGroup.setUpdateTime(date);
         musicGroupDao.update(musicGroup);
-        //修改缴费项目状态
-        List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
-        if (musicGroupPaymentCalenders != null && musicGroupPaymentCalenders.size() > 0) {
-            musicGroupPaymentCalenders.forEach(e -> {
-                e.setStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum.REJECT);
-            });
-            musicGroupPaymentCalenderDao.batchUpdate(musicGroupPaymentCalenders);
-        }
+        
+        List<PaymentCalenderStatusEnum> statusList = new ArrayList<MusicGroupPaymentCalender.PaymentCalenderStatusEnum>();
+        statusList.add(PaymentCalenderStatusEnum.AUDITING);
+        //修改乐团报名缴费项目状态
+        List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(musicGroupId, statusList, null);
+        
+        musicGroupPaymentCalenderList.forEach(t -> {
+        	t.setStatus(PaymentCalenderStatusEnum.REJECT);
+        	t.setUpdateTime(date);
+        	t.setMemo(memo);
+        });
+        
+        musicGroupPaymentCalenderDao.batchUpdate(musicGroupPaymentCalenderList);
     }
 
     @Override
@@ -1593,10 +1614,38 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup.getTenantId() == null) {
             throw new BizException("乐团机构信息异常，请联系管理员");
         }
+        
+        Date date = new Date();
+        
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "审核通过（审核中 -> 预报名）", sysUser.getId(), ""));
         musicGroup.setStatus(MusicGroupStatusEnum.PRE_APPLY);
+        musicGroup.setUpdateTime(date);
         musicGroupDao.update(musicGroup);
+        
+        List<PaymentCalenderStatusEnum> statusList = new ArrayList<MusicGroupPaymentCalender.PaymentCalenderStatusEnum>();
+        statusList.add(PaymentCalenderStatusEnum.AUDITING);
+        //修改乐团报名缴费项目状态
+        List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(musicGroupId, statusList, null);
+        
+        musicGroupPaymentCalenderList.forEach(t -> {
+            if (t.getPayUserType() == SCHOOL) {
+                if (t.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    t.setStatus(PaymentCalenderStatusEnum.OPEN);
+                } else {
+                    t.setStatus(PaymentCalenderStatusEnum.PAID);
+                }
+            } else if (date.after(t.getStartPaymentDate())) {
+                t.setStatus(PaymentCalenderStatusEnum.OPEN);
+            } else if (date.after(t.getDeadlinePaymentDate())) {
+                t.setStatus(PaymentCalenderStatusEnum.OVER);
+            } else {
+                t.setStatus(PaymentCalenderStatusEnum.NO);
+            }
+        	t.setUpdateTime(date);
+        });
+        
+        musicGroupPaymentCalenderDao.batchUpdate(musicGroupPaymentCalenderList);
 
         // 创建群
         imGroupService.create(musicGroupId, null, "乐团预报名", null,