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

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

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

@@ -300,6 +300,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 .add(repairActualAmount)
                 .add(activityActualAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
 
+        }
         PaymentCalenderStatusEnum status = PaymentCalenderStatusEnum.DRAFT;
         /*if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
             status = AUDITING;
@@ -321,7 +322,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 status = actualTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
             }
         }*/
-
         Date date = new Date();
 
         musicGroupPaymentCalender.setIsShowSalePrice(musicGroupPaymentBaseCalender.getIsShowSalePrice());
@@ -337,10 +337,11 @@ 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);
@@ -350,7 +351,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
             }
         }*/
-
         // 设置批次号
         String batchNo = idGeneratorService.generatorId() + "";
         musicGroupPaymentCalender.setBatchNo(batchNo);
@@ -404,13 +404,25 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
         // 如果是报名，需要修改乐团状态
         if (musicGroupPaymentBaseCalender.getPaymentType() == MUSIC_APPLY) {
+            }
         	// 记录操作日志
             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},
@@ -429,7 +441,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 }, executor);
                 executor.shutdown();
             }
-        }
+        }*/
         ModelMap map = new ModelMap(1);
         map.put("musicGroupPaymentCalenderBatchNo", batchNo);
         return BaseController.succeed(map);