Browse Source

Merge remote-tracking branch 'origin/cloud_teacher_plus_feature' into cloud_teacher_plus_feature

Joburgess 4 years ago
parent
commit
f085f893fe

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -147,6 +147,7 @@ public class ExportServiceImpl implements ExportService {
                             row.setMaintenanceFee(repairFee);
                             break;
                         case CLOUD_TEACHER:
+                        case CLOUD_TEACHER_PLUS:
                             BigDecimal cloudTeacherFee = BigDecimal.ZERO;
                             if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
                                 cloudTeacherFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
@@ -408,6 +409,7 @@ public class ExportServiceImpl implements ExportService {
                             row.setMaintenanceFee(maintenanceFee);
                             break;
                         case CLOUD_TEACHER:
+                        case CLOUD_TEACHER_PLUS:
                             BigDecimal cloudTeacherFee = BigDecimal.ZERO;
                             if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
                                 cloudTeacherFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);