乐保分润金额bug

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

@@ -680,12 +680,14 @@ public class ExportServiceImpl implements ExportService {
                     order.setPracticeCourseFee(BigDecimal.ZERO);
                     order.setTheoryCourseFee(BigDecimal.ZERO);
                     order.setDegreeFee(BigDecimal.ZERO);
+                    order.setMaintenanceFee(BigDecimal.ZERO);
                     order.setCloudTeacherFee(BigDecimal.ZERO);
                     order.setRepairFee(order.getMaintenanceProductFee());
                     continue;
                 } else if (order.getSaleAmount().compareTo(BigDecimal.ZERO) == 0 && order.getServiceAmount().compareTo(BigDecimal.ZERO) > 0) {
                     order.setRepairFee(order.getRepairFee());
                     order.setCloudTeacherFee(order.getCloudTeacherFee());
+                    order.setMaintenanceFee(order.getMaintenanceFee());
                     order.setMusicalFee(BigDecimal.ZERO);
                     order.setTeachingFee(BigDecimal.ZERO);
                     order.setOtherFee(BigDecimal.ZERO);
@@ -714,12 +716,12 @@ public class ExportServiceImpl implements ExportService {
                     theoryCourseFee = order.getTheoryCourseFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     degreeFee = order.getDegreeFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     repairFee = order.getRepairFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
-                    maintenanceFee = order.getMaintenanceFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     maintenanceProductFee = order.getMaintenanceProductFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     leaseFee = order.getLeaseFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     musicalFee = order.getMusicalFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     teachingFee = order.getTeachingFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     otherFee = order.getOtherFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
+                    maintenanceFee = order.getMaintenanceFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                     cloudTeacherFee = order.getCloudTeacherFee().multiply(order.getRouteAmount()).divide(order.getActualAmount(), 2, BigDecimal.ROUND_DOWN);
                 }
 
@@ -759,13 +761,13 @@ public class ExportServiceImpl implements ExportService {
                     theoryCourseFee = order.getTheoryCourseFee().subtract(routeTheoryCourseFee);
                     degreeFee = order.getDegreeFee().subtract(routeDegreeFee);
                     repairFee = order.getRepairFee().subtract(routeRepairFee);
-                    maintenanceFee = order.getMaintenanceFee().subtract(routeMaintenanceFee);
                     maintenanceProductFee = order.getMaintenanceProductFee().subtract(routeMaintenanceProductFee);
                     leaseFee = order.getLeaseFee().subtract(routeLeaseFee);
                     musicalFee = order.getMusicalFee().subtract(routeMusicalFee);
                     teachingFee = order.getTeachingFee().subtract(routeTeachingFee);
                     otherFee = order.getOtherFee().subtract(routeOtherFee);
                     rechargeFee = order.getRechargeFee().subtract(routeRechargeFee);
+                    maintenanceFee = order.getMaintenanceFee().subtract(routeMaintenanceFee);
                     cloudTeacherFee = order.getCloudTeacherFee().subtract(routeCloudTeacherFee);
                 }
                 j++;
@@ -776,13 +778,13 @@ public class ExportServiceImpl implements ExportService {
                 routeTheoryCourseFee = routeTheoryCourseFee.add(theoryCourseFee);
                 routeDegreeFee = routeDegreeFee.add(degreeFee);
                 routeRepairFee = routeRepairFee.add(repairFee);
-                routeMaintenanceFee = routeMaintenanceFee.add(maintenanceFee);
                 routeMaintenanceProductFee = routeMaintenanceProductFee.add(maintenanceProductFee);
                 routeLeaseFee = routeLeaseFee.add(leaseFee);
                 routeMusicalFee = routeMusicalFee.add(musicalFee);
                 routeTeachingFee = routeTeachingFee.add(teachingFee);
                 routeOtherFee = routeOtherFee.add(otherFee);
                 routeRechargeFee = routeRechargeFee.add(rechargeFee);
+                routeMaintenanceFee = routeMaintenanceFee.add(maintenanceFee);
                 routeCloudTeacherFee = routeCloudTeacherFee.add(cloudTeacherFee);
 
                 order.setMusicGroupCourseFee(musicGroupCourseFee);
@@ -791,13 +793,13 @@ public class ExportServiceImpl implements ExportService {
                 order.setTheoryCourseFee(theoryCourseFee);
                 order.setDegreeFee(degreeFee);
                 order.setRepairFee(repairFee.add(maintenanceProductFee));
-                order.setMaintenanceFee(maintenanceFee);
                 order.setMaintenanceProductFee(maintenanceProductFee);
                 order.setLeaseFee(leaseFee);
                 order.setMusicalFee(musicalFee);
                 order.setTeachingFee(teachingFee);
                 order.setOtherFee(otherFee);
                 order.setRechargeFee(rechargeFee);
+                order.setMaintenanceFee(maintenanceFee);
                 order.setCloudTeacherFee(cloudTeacherFee);
             }
         });

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2438,10 +2438,6 @@ public class ExportController extends BaseController {
             throw new BizException("用户信息获取失败");
         }
         Employee employee = employeeDao.get(sysUser.getId());
-//        if (StringUtils.isEmpty(queryInfo.getRoutingOrganId())) {
-//            queryInfo.setRoutingOrganId(employee.getOrganIdList());
-//            queryInfo.setOldOrganId(employee.getOrganIdList());
-//        }
         if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
             queryInfo.setRoutingOrganId(employee.getOrganIdList());
             queryInfo.setOldOrganId(employee.getOrganIdList());