财务导出

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

@@ -2602,22 +2602,26 @@ public class ExportServiceImpl implements ExportService {
         }
     }
     public void setSaleFee(StudentPaymentOrderExportDto basicOrder,StudentPaymentOrderDetail orderDetail){
-        BigDecimal price = orderDetail.getPrice().subtract(orderDetail.getIncome());
-        switch (orderDetail.getType()) {
-            case OTHER:
-                basicOrder.setOtherFee(basicOrder.getOtherFee().add(price));
-                break;
-            case MUSICAL:
-                if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
-                    basicOrder.setLeaseFee(basicOrder.getLeaseFee().add(price));
-                } else {
-                    basicOrder.setMusicalFee(basicOrder.getMusicalFee().add(price));
-                }
-                break;
-            case TEACHING:
-            case ACCESSORIES:
-                basicOrder.setTeachingFee(basicOrder.getTeachingFee().add(price));
-                break;
+        if(orderDetail.getIncome().compareTo(BigDecimal.ZERO) > 0){
+            basicOrder.setCloudTeacherFee(basicOrder.getCloudTeacherFee().add(orderDetail.getIncome()));
+        }else {
+            BigDecimal price = orderDetail.getPrice().subtract(orderDetail.getIncome());
+            switch (orderDetail.getType()) {
+                case OTHER:
+                    basicOrder.setOtherFee(basicOrder.getOtherFee().add(price));
+                    break;
+                case MUSICAL:
+                    if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
+                        basicOrder.setLeaseFee(basicOrder.getLeaseFee().add(price));
+                    } else {
+                        basicOrder.setMusicalFee(basicOrder.getMusicalFee().add(price));
+                    }
+                    break;
+                case TEACHING:
+                case ACCESSORIES:
+                    basicOrder.setTeachingFee(basicOrder.getTeachingFee().add(price));
+                    break;
+            }
         }
     }