|
@@ -418,9 +418,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), new SysUserRoleEnum[]{ORGAN_MANAGER},
|
|
|
null, null, MessageTypeEnum.BACKSTAGE_PAYMENT_CALENDER_AUDIT, organization.getName(), musicGroup.getName());
|
|
|
|
|
|
- if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT &&
|
|
|
- musicGroupPaymentCalender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) == 0
|
|
|
- && musicGroupPaymentCalender.getStatus() != AUDITING ){
|
|
|
+ if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT && musicGroupPaymentCalender.getStatus() != AUDITING ){
|
|
|
addStudent(musicGroupPaymentCalender, musicGroup);
|
|
|
//将0元未缴费学员缴费状态更新为已缴费
|
|
|
this.updateNoPaymentAndZeroPaymentStatus(musicGroupPaymentCalender, true);
|
|
@@ -433,7 +431,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
}, executor);
|
|
|
executor.shutdown();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
ModelMap map = new ModelMap(1);
|
|
|
map.put("musicGroupPaymentCalenderBatchNo", batchNo);
|
|
|
return BaseController.succeed(map);
|