|
@@ -1763,6 +1763,13 @@ public class ExportServiceImpl implements ExportService {
|
|
}
|
|
}
|
|
row.setDegreeFee(degreeFee);
|
|
row.setDegreeFee(degreeFee);
|
|
break;
|
|
break;
|
|
|
|
+ case PRACTICE:
|
|
|
|
+ BigDecimal practiceCourseFee = BigDecimal.ZERO;
|
|
|
|
+ if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
+ practiceCourseFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
|
|
|
|
+ }
|
|
|
|
+ row.setPracticeCourseFee(practiceCourseFee);
|
|
|
|
+ break;
|
|
case VIP:
|
|
case VIP:
|
|
BigDecimal vipCourseFee = BigDecimal.ZERO;
|
|
BigDecimal vipCourseFee = BigDecimal.ZERO;
|
|
if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
@@ -2107,6 +2114,13 @@ public class ExportServiceImpl implements ExportService {
|
|
}
|
|
}
|
|
row.setDegreeFee(degreeFee);
|
|
row.setDegreeFee(degreeFee);
|
|
break;
|
|
break;
|
|
|
|
+ case PRACTICE:
|
|
|
|
+ BigDecimal practiceCourseFee = BigDecimal.ZERO;
|
|
|
|
+ if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
+ practiceCourseFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
|
|
|
|
+ }
|
|
|
|
+ row.setPracticeCourseFee(practiceCourseFee);
|
|
|
|
+ break;
|
|
case VIP:
|
|
case VIP:
|
|
BigDecimal vipCourseFee = BigDecimal.ZERO;
|
|
BigDecimal vipCourseFee = BigDecimal.ZERO;
|
|
if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
|