|
@@ -336,23 +336,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
.add(activityCurrentAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
status = actualTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
|
|
|
}
|
|
|
- if(status != AUDITING){
|
|
|
- //计算缴费项目原原价
|
|
|
- BigDecimal originalAmount = musicGroupPaymentCalenderCourseSettingsService.getOriginalAmount(musicGroupPaymentBaseCalender);
|
|
|
- if(originalAmount.compareTo(BigDecimal.ZERO) == 0 &&
|
|
|
- musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList() != null &&
|
|
|
- musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList().size() > 0){
|
|
|
- status = AUDITING;
|
|
|
- }else {
|
|
|
- BigDecimal memberAmount = musicGroupPaymentCalenderMemberService.getOriginalAmount(musicGroupPaymentBaseCalender);
|
|
|
- BigDecimal repairAmount = musicGroupPaymentCalenderRepairService.getOriginalAmount(musicGroupPaymentBaseCalender);
|
|
|
- BigDecimal activityAmount = musicGroupPaymentCalenderActivityService.getOriginalAmount(musicGroupPaymentBaseCalender);
|
|
|
- BigDecimal currentTotalAmount = originalAmount.add(memberAmount)
|
|
|
- .add(repairAmount)
|
|
|
- .add(activityAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
- status = originalTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
Date date = new Date();
|
|
|
|