|
@@ -252,7 +252,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
if(dtoStatus != null && dtoStatus == AUDITING){
|
|
|
status = AUDITING;
|
|
|
}else {
|
|
|
- // 如果是临时加课,是否审核是根据单价判断
|
|
|
+ // 如果是临时加课,判断是否审核
|
|
|
for (MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList) {
|
|
|
OrganizationCourseUnitPriceSettings defaultUnitPrice = organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(
|
|
|
musicGroup.getOrganId(), courseSettings.getCourseType(), musicGroup.getChargeTypeId());
|
|
@@ -260,10 +260,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
throw new BizException("请先设置分部课程类型单价");
|
|
|
}
|
|
|
if (courseSettings.getCourseTotalMinuties() != 0) {
|
|
|
- if (courseSettings
|
|
|
- .getCourseCurrentPrice()
|
|
|
- .divide(new BigDecimal(courseSettings.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
|
|
|
- .compareTo(defaultUnitPrice.getUnitPrice()) != 0) {
|
|
|
+
|
|
|
+ if (defaultUnitPrice.getUnitPrice().multiply(new BigDecimal(courseSettings.getCourseTotalMinuties()))
|
|
|
+ .compareTo(courseSettings.getCourseCurrentPrice()) != 0) {
|
|
|
+
|
|
|
status = AUDITING;
|
|
|
break;
|
|
|
}
|
|
@@ -319,17 +319,17 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
tempPccs.setCourseTotalMinuties(pccs.getCourseTotalMinuties());
|
|
|
} else {
|
|
|
tempPccs.setCourseCurrentPrice(pccs.getCourseCurrentPrice().subtract(
|
|
|
- pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
- .setScale(2, BigDecimal.ROUND_DOWN)));
|
|
|
+ pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
+ .setScale(0, BigDecimal.ROUND_DOWN)));
|
|
|
tempPccs.setCourseOriginalPrice(pccs.getCourseOriginalPrice().subtract(
|
|
|
- pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
- .setScale(2, BigDecimal.ROUND_DOWN)));
|
|
|
+ pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
+ .setScale(0, BigDecimal.ROUND_DOWN)));
|
|
|
tempPccs.setCourseTotalMinuties(pccs.getCourseTotalMinuties() - pccs.getCourseTotalMinuties() / times * (times - 1));
|
|
|
}
|
|
|
} else {
|
|
|
if (!pccs.getIsStudentOptional()) {
|
|
|
- tempPccs.setCourseCurrentPrice(pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN));
|
|
|
- tempPccs.setCourseOriginalPrice(pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN));
|
|
|
+ tempPccs.setCourseCurrentPrice(pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN));
|
|
|
+ tempPccs.setCourseOriginalPrice(pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN));
|
|
|
tempPccs.setCourseTotalMinuties(pccs.getCourseTotalMinuties() / times);
|
|
|
} else {
|
|
|
continue;
|
|
@@ -563,7 +563,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
}
|
|
|
}
|
|
|
} else if (paymentType == PaymentType.ADD_COURSE || paymentType == PaymentType.ADD_STUDENT) {
|
|
|
- // 如果是临时加课,是否审核是根据单价判断
|
|
|
+ // 如果是临时加课,判断是否审核
|
|
|
for (MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList) {
|
|
|
OrganizationCourseUnitPriceSettings defaultUnitPrice = organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(
|
|
|
musicGroup.getOrganId(), courseSettings.getCourseType(), musicGroup.getChargeTypeId());
|
|
@@ -571,9 +571,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
throw new BizException("请先设置分部课程类型单价");
|
|
|
}
|
|
|
if (courseSettings.getCourseTotalMinuties() != 0) {
|
|
|
- if (courseSettings.getCourseCurrentPrice()
|
|
|
- .divide(new BigDecimal(courseSettings.getCourseTotalMinuties()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
|
|
|
- .compareTo(defaultUnitPrice.getUnitPrice()) != 0) {
|
|
|
+ if (defaultUnitPrice.getUnitPrice().multiply(new BigDecimal(courseSettings.getCourseTotalMinuties()))
|
|
|
+ .compareTo(courseSettings.getCourseCurrentPrice()) != 0) {
|
|
|
+
|
|
|
status = AUDITING;
|
|
|
break;
|
|
|
}
|
|
@@ -628,17 +628,17 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
tempPccs.setCourseTotalMinuties(pccs.getCourseTotalMinuties());
|
|
|
} else {
|
|
|
tempPccs.setCourseCurrentPrice(pccs.getCourseCurrentPrice().subtract(
|
|
|
- pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
- .setScale(2, BigDecimal.ROUND_DOWN)));
|
|
|
+ pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
+ .setScale(0, BigDecimal.ROUND_DOWN)));
|
|
|
tempPccs.setCourseOriginalPrice(pccs.getCourseOriginalPrice().subtract(
|
|
|
- pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
- .setScale(2, BigDecimal.ROUND_DOWN)));
|
|
|
+ pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(times - 1))
|
|
|
+ .setScale(0, BigDecimal.ROUND_DOWN)));
|
|
|
tempPccs.setCourseTotalMinuties(pccs.getCourseTotalMinuties() - pccs.getCourseTotalMinuties() / times * (times - 1));
|
|
|
}
|
|
|
} else {
|
|
|
if (!pccs.getIsStudentOptional()) {
|
|
|
- tempPccs.setCourseCurrentPrice(pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN));
|
|
|
- tempPccs.setCourseOriginalPrice(pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 2, BigDecimal.ROUND_DOWN));
|
|
|
+ tempPccs.setCourseCurrentPrice(pccs.getCourseCurrentPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN));
|
|
|
+ tempPccs.setCourseOriginalPrice(pccs.getCourseOriginalPrice().divide(new BigDecimal(times), 0, BigDecimal.ROUND_DOWN));
|
|
|
tempPccs.setCourseTotalMinuties(pccs.getCourseTotalMinuties() / times);
|
|
|
}
|
|
|
}
|
|
@@ -1255,9 +1255,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
if (calender == null) {
|
|
|
throw new BizException("缴费信息不存在");
|
|
|
}
|
|
|
- if(calender.getPaymentType() == MUSIC_APPLY){
|
|
|
- throw new BizException("报名的缴费记录不能删除");
|
|
|
- }
|
|
|
if (calender.getStatus() != PaymentCalenderStatusEnum.AUDITING && calender.getStatus() != PaymentCalenderStatusEnum.NO
|
|
|
&& calender.getStatus() != PaymentCalenderStatusEnum.REJECT) {
|
|
|
throw new BizException("删除失败,只有[审核中]、[拒绝]或[未开启缴费]状态才能删除");
|