|
@@ -26,6 +26,7 @@ import com.ym.mec.common.service.IdGeneratorService;
|
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
|
import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
|
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
|
+
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -962,6 +963,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
}
|
|
|
String[] split = batchNs.split(",");
|
|
|
Date date = new Date();
|
|
|
+
|
|
|
+ List<String> musicGroupIdList = new ArrayList<String>();
|
|
|
+
|
|
|
for (String batchNo : split) {
|
|
|
List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByBatchNo(batchNo);
|
|
|
if (musicGroupPaymentCalenders == null || musicGroupPaymentCalenders.size() == 0) {
|
|
@@ -972,17 +976,22 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
musicGroupPaymentCalender.setUpdateTime(date);
|
|
|
musicGroupPaymentCalender.setAuditMemo(auditMemo);
|
|
|
}
|
|
|
-// MusicGroupPaymentCalender calender = musicGroupPaymentCalenders.get(0);
|
|
|
+ MusicGroupPaymentCalender calender = musicGroupPaymentCalenders.get(0);
|
|
|
//如果是报名,并且所有的报名都审核通过,需要修改乐团状态
|
|
|
-// if (calender.getPaymentType() == MUSIC_APPLY) {
|
|
|
-// MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
|
|
|
-// musicGroup.setStatus(MusicGroupStatusEnum.PRE_BUILD_FEE);
|
|
|
-// musicGroup.setUpdateTime(date);
|
|
|
-// musicGroupDao.update(musicGroup);
|
|
|
- //记录操作日志
|
|
|
-// musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目失败(费用审核中 -> 审核拒绝)", sysUser.getId(), ""));
|
|
|
-// }
|
|
|
+ if (calender.getPaymentType() == MUSIC_APPLY) {
|
|
|
+ if (!musicGroupIdList.contains(calender.getMusicGroupId())) {
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
|
|
|
+ musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT_FAILED);
|
|
|
+ musicGroup.setUpdateTime(date);
|
|
|
+ musicGroupDao.update(musicGroup);
|
|
|
+ // 记录操作日志
|
|
|
+ musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目失败(费用审核中 -> 审核拒绝)", sysUser.getId(), ""));
|
|
|
+
|
|
|
+ musicGroupIdList.add(calender.getMusicGroupId());
|
|
|
+ }
|
|
|
+ }
|
|
|
musicGroupPaymentCalenderDao.batchUpdate(musicGroupPaymentCalenders);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|