zouxuan 3 vuotta sitten
vanhempi
commit
e2bc8c7591

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

@@ -2402,8 +2402,10 @@ public class ExportServiceImpl implements ExportService {
                     anyMatch(e -> StringUtils.equals(e.getIncomeItem(), "CLOUD_TEACHER") && e.getIncome().compareTo(BigDecimal.ZERO) > 0)) {
                 BigDecimal income = detailList.stream().filter(e -> StringUtils.equals(e.getIncomeItem(), "CLOUD_TEACHER") && e.getIncome().compareTo(BigDecimal.ZERO) > 0)
                         .map(e -> e.getIncome()).reduce(BigDecimal.ZERO, BigDecimal::add);
-                basicOrder.setCloudTeacherFee(income);
-                return;
+                if(income.compareTo(basicOrder.getServiceAmount()) == 0){
+                    basicOrder.setCloudTeacherFee(income);
+                    return;
+                }
             }
         }
         List<StudentPaymentOrderDetail> details = detailList.stream().filter(e -> e.getIncome().compareTo(BigDecimal.ZERO) == 0).collect(Collectors.toList());