|
@@ -3581,12 +3581,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
StudentPaymentCalenderDto calenderDto = new StudentPaymentCalenderDto();
|
|
StudentPaymentCalenderDto calenderDto = new StudentPaymentCalenderDto();
|
|
calenderDto.setClassGroupId(studentCLassMap.get(studentId));
|
|
calenderDto.setClassGroupId(studentCLassMap.get(studentId));
|
|
//如果剩余课程余额小于等于0
|
|
//如果剩余课程余额小于等于0
|
|
- if(bigDecimal.longValue() <= 0l){
|
|
|
|
|
|
+ if(bigDecimal.doubleValue() <= 0d){
|
|
calenderDto.setCourseCurrentPrice(totalPrice);
|
|
calenderDto.setCourseCurrentPrice(totalPrice);
|
|
calenderDto.setCourseOriginalPrice(totalPrice);
|
|
calenderDto.setCourseOriginalPrice(totalPrice);
|
|
}else {
|
|
}else {
|
|
//如果剩余课程余额大于等于总价值,那么补交0元
|
|
//如果剩余课程余额大于等于总价值,那么补交0元
|
|
- if(bigDecimal.longValue() >= totalPrice.longValue()){
|
|
|
|
|
|
+ if(bigDecimal.doubleValue() >= totalPrice.doubleValue()){
|
|
calenderDto.setCourseCurrentPrice(BigDecimal.ZERO);
|
|
calenderDto.setCourseCurrentPrice(BigDecimal.ZERO);
|
|
calenderDto.setCourseOriginalPrice(BigDecimal.ZERO);
|
|
calenderDto.setCourseOriginalPrice(BigDecimal.ZERO);
|
|
}else {
|
|
}else {
|
|
@@ -3594,7 +3594,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
calenderDto.setCourseOriginalPrice(totalPrice.subtract(bigDecimal));
|
|
calenderDto.setCourseOriginalPrice(totalPrice.subtract(bigDecimal));
|
|
}
|
|
}
|
|
//剩余课程余额减去主班对应课程类型总的课程价值,负数就是需要补交的金额
|
|
//剩余课程余额减去主班对应课程类型总的课程价值,负数就是需要补交的金额
|
|
- bigDecimal = bigDecimal.subtract(totalPrice);
|
|
|
|
|
|
+// bigDecimal = bigDecimal.subtract(totalPrice);
|
|
|
|
+ surplusCourseFeeMap.put(studentId,bigDecimal.subtract(totalPrice));
|
|
}
|
|
}
|
|
calenderDto.setCourseTime(courseTime);
|
|
calenderDto.setCourseTime(courseTime);
|
|
calenderDto.setCourseType(s);
|
|
calenderDto.setCourseType(s);
|