update

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -994,13 +994,26 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 .stream()
                 .filter(scheduleServeCommand -> scheduleServeCommand.getMainServeId() == null)
                 .collect(Collectors.toList());
+        List<Integer> mainScheduleServeIdList = mainScheduleServeCommandList.stream().map(ScheduleServeCommand::getServeId).collect(Collectors.toList());
 
         //辅助服务
         List<ScheduleServeCommand> subScheduleServeCommandList = cmd.getScheduleServeDTOList()
                 .stream()
                 .filter(scheduleServeCommand -> scheduleServeCommand.getMainServeId() != null)
+                .filter(scheduleServeCommand -> mainScheduleServeIdList.contains(scheduleServeCommand.getMainServeId()))
                 .collect(Collectors.toList());
 
+        //辅助服务
+        List<ScheduleServeCommand> shouldBeMainServe = cmd.getScheduleServeDTOList()
+                .stream()
+                .filter(scheduleServeCommand -> scheduleServeCommand.getMainServeId() != null)
+                .filter(scheduleServeCommand -> !mainScheduleServeIdList.contains(scheduleServeCommand.getMainServeId()))
+                .collect(Collectors.toList());
+        shouldBeMainServe.forEach(scheduleServeCommand -> scheduleServeCommand.setMainServeId(null));
+
+        mainScheduleServeCommandList.addAll(shouldBeMainServe);
+
+
         //设置从服务的时间为主服务时间 因为主服务的时间已经包括的从服务的时间
         subScheduleServeCommandList.forEach(scheduleServeCommand -> {
             ScheduleServeCommand mainScheduleServeCommand = mainScheduleServeCommandList.stream()