update

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

@@ -893,6 +893,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         technicianPushService.scheduledMsg(scheduleManage.getId());
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateSchedule(SubmitScheduleCommand cmd) {
 
@@ -921,14 +922,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         insertScheduleServeList.forEach(scheduleServeMapper::insert);
         updateScheduleServeList.forEach(scheduleServeMapper::updateById);
-//        //数据库死锁
-//        scheduleServeList.forEach(scheduleServe -> {
-//            if (scheduleServe.getId() != null) {
-//                scheduleServeMapper.updateById(scheduleServe);
-//            } else {
-//                scheduleServeMapper.insert(scheduleServe);
-//            }
-//        });
+
         List<Integer> removeIds = oldScheduleServeIds.stream().filter(id -> !scheduleServeList.stream().map(ScheduleServe::getId).collect(Collectors.toList()).contains(id)).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(removeIds)) {
             scheduleServeMapper.deleteBatchIds(removeIds);
@@ -1228,11 +1222,15 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServeCommand.setStartTime(mainScheduleServeCommand.getStartTime());
                     scheduleServeCommand.setEndTime(mainScheduleServeCommand.getEndTime());
 
-                    //如果主服务应开单 并且更新 同步主服务的开始时间
+                    //如果主服务已经开单 并且更新 同步主服务的开始时间
                     ScheduleServe mainScheduleServe = scheduleServeMapper.selectById(mainScheduleServeCommand.getId());
                     if (mainScheduleServe != null && mainScheduleServe.getActualStartTime() != null) {
                         scheduleServeCommand.setActualStartTime(mainScheduleServe.getActualStartTime());
                     }
+                    //如果主服务已经结单 不能再添加辅助服务
+                    if (mainScheduleServe != null && mainScheduleServe.getStatus() == 3) {
+                        throw new RRException("不能再为已完成的服务添加辅助服务")
+                    }
                 });
 
         ScheduleManage scheduleManage = scheduleManageMapper.selectById(cmd.getId());