Merge branch 'order_dowlaod_2021_03_26'

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

@@ -475,13 +475,13 @@ public class ExportServiceImpl implements ExportService {
                     order.setTheoryCourseFee(BigDecimal.ZERO);
                     order.setDegreeFee(BigDecimal.ZERO);
                     order.setRepairFee(order.getMaintenanceProductFee());
-                    order.setLeaseFee(BigDecimal.ZERO);
                     continue;
                 } else if (order.getSaleAmount().compareTo(BigDecimal.ZERO) == 0 && order.getServiceAmount().compareTo(BigDecimal.ZERO) > 0) {
                     order.setRepairFee(order.getRepairFee().add(order.getMaintenanceFee()));
                     order.setMusicalFee(BigDecimal.ZERO);
                     order.setTeachingFee(BigDecimal.ZERO);
                     order.setOtherFee(BigDecimal.ZERO);
+                    order.setLeaseFee(BigDecimal.ZERO);
                     continue;
                 }
                 BigDecimal musicGroupCourseFee = BigDecimal.ZERO;