乐团缴费项目改造

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

@@ -300,27 +300,27 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 .add(repairActualAmount)
                 .add(activityActualAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
 
-        PaymentCalenderStatusEnum status;
-        if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-            status = AUDITING;
-        } else {
-            //计算项目原现价
-            BigDecimal courseCurrentAmount = musicGroupPaymentCalenderCourseSettingsService.getCurrentAmount(musicGroupPaymentBaseCalender);
-            //如果课程价格是0元，那么需要审核
-            if(courseCurrentAmount.compareTo(BigDecimal.ZERO) == 0 &&
-                    musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList() != null &&
-                    musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList().size() > 0){
-                status = AUDITING;
-            }else {
-                BigDecimal memberCurrentAmount = musicGroupPaymentCalenderMemberService.getCurrentAmount(musicGroupPaymentBaseCalender);
-                BigDecimal repairCurrentAmount = musicGroupPaymentCalenderRepairService.getCurrentAmount(musicGroupPaymentBaseCalender);
-                BigDecimal activityCurrentAmount = musicGroupPaymentCalenderActivityService.getCurrentAmount(musicGroupPaymentBaseCalender);
-                BigDecimal currentTotalAmount = courseCurrentAmount.add(memberCurrentAmount)
-                        .add(repairCurrentAmount)
-                        .add(activityCurrentAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
-                status = actualTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
-            }
-        }
+//        PaymentCalenderStatusEnum status;
+//        if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
+//            status = AUDITING;
+//        } else {
+//            //计算项目原现价
+//            BigDecimal courseCurrentAmount = musicGroupPaymentCalenderCourseSettingsService.getCurrentAmount(musicGroupPaymentBaseCalender);
+//            //如果课程价格是0元，那么需要审核
+//            if(courseCurrentAmount.compareTo(BigDecimal.ZERO) == 0 &&
+//                    musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList() != null &&
+//                    musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList().size() > 0){
+//                status = AUDITING;
+//            }else {
+//                BigDecimal memberCurrentAmount = musicGroupPaymentCalenderMemberService.getCurrentAmount(musicGroupPaymentBaseCalender);
+//                BigDecimal repairCurrentAmount = musicGroupPaymentCalenderRepairService.getCurrentAmount(musicGroupPaymentBaseCalender);
+//                BigDecimal activityCurrentAmount = musicGroupPaymentCalenderActivityService.getCurrentAmount(musicGroupPaymentBaseCalender);
+//                BigDecimal currentTotalAmount = courseCurrentAmount.add(memberCurrentAmount)
+//                        .add(repairCurrentAmount)
+//                        .add(activityCurrentAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
+//                status = actualTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
+//            }
+//        }
 
         Date date = new Date();
 
@@ -336,19 +336,19 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setPaymentType(musicGroupPaymentBaseCalender.getPaymentType());
         musicGroupPaymentCalender.setCurrentTotalAmount(actualTotalAmount);
         musicGroupPaymentCalender.setOriginalTotalAmount(originalTotalAmount);
-        musicGroupPaymentCalender.setStatus(status);
+        musicGroupPaymentCalender.setStatus(AUDITING);
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
         musicGroupPaymentCalender.setPaymentItemShowState(musicGroupPaymentBaseCalender.getPaymentItemShowState());
 
-        if (musicGroupPaymentCalender.getStatus() != AUDITING) {
-            if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
-                musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
-            } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
-                musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OVER);
-            } else {
-                musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
-            }
-        }
+//        if (musicGroupPaymentCalender.getStatus() != AUDITING) {
+//            if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
+//                musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
+//            } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
+//                musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OVER);
+//            } else {
+//                musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
+//            }
+//        }
 
         // 设置批次号
         String batchNo = idGeneratorService.generatorId() + "";
@@ -403,19 +403,25 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
         // 如果是报名，需要修改乐团状态
         if (musicGroupPaymentBaseCalender.getPaymentType() == MUSIC_APPLY) {
-            if (status != AUDITING) {
-                musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
-                // 记录操作日志
-                musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（创建缴费中 -> 报名中）", sysUser.getId(), ""));
-            } else {
-                musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
-                // 记录操作日志
-                musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（创建缴费 -> 费用审核中）", sysUser.getId(), ""));
-            }
+//            if (status != AUDITING) {
+//                musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
+//                // 记录操作日志
+//                musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（创建缴费中 -> 报名中）", sysUser.getId(), ""));
+//            } else {
+//                musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
+//                // 记录操作日志
+//                musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（创建缴费 -> 费用审核中）", sysUser.getId(), ""));
+//            }
+            musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
+            // 记录操作日志
+            musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（创建缴费 -> 费用审核中）", sysUser.getId(), ""));
             musicGroup.setUpdateTime(date);
             musicGroupDao.update(musicGroup);
         }
-        if (status == AUDITING) {
+        Organization organization = organizationDao.get(musicGroup.getOrganId());
+        sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), new SysUserRoleEnum[]{ORGAN_MANAGER},
+                null, null, MessageTypeEnum.BACKSTAGE_PAYMENT_CALENDER_AUDIT, organization.getName(), musicGroup.getName());
+/*        if (status == AUDITING) {
             // 如果是审核中
             Organization organization = organizationDao.get(musicGroup.getOrganId());
             sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), new SysUserRoleEnum[]{ORGAN_MANAGER},
@@ -434,7 +440,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 }, executor);
                 executor.shutdown();
             }
-        }
+        }*/
         ModelMap map = new ModelMap(1);
         map.put("musicGroupPaymentCalenderBatchNo", batchNo);
         return BaseController.succeed(map);