update

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

@@ -1560,6 +1560,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                             scheduleServe.setProduceId(scheduleServeCommand.getProduceId());
                             //服务id
                             scheduleServe.setServeId(scheduleServeCommand.getServeId());
+                            scheduleServe.setMainServeId((scheduleServeCommand.getMainServeId()));
                             return scheduleServe;
                         })
                         .collect(Collectors.toList()));
@@ -1575,6 +1576,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 IdleTimeDTO idleTimeDTO = idleTimeDTOList.stream().findAny().orElseThrow(NullPointerException::new);
                 if (!idleTimeDTO.isStatus()) {
                     throw new RRException("预约时间已过期");
+                } else {
+                    this.validTechnician(scheduleManage.getListScheduleServer().stream().filter(scheduleServe -> scheduleServe.getMainServeId() == null).collect(Collectors.toCollection(LinkedList::new)), idleTimeDTO.getTreeProgram().getChildList());
                 }
 
             } catch (RRException e) {
@@ -1596,6 +1599,22 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         }
     }
 
+    void validTechnician(Queue<ScheduleServe> scheduleServeList, List<TreeProgram> childList) {
+        if (ListUtil.isNotEmpty(scheduleServeList)) {
+            ScheduleServe scheduleServe = scheduleServeList.poll();
+            TreeProgram findChild = childList.stream()
+                    .filter(treeProgram -> treeProgram.getStoreTechnicianDTO().getTechnicianId().equals(scheduleServe.getTechnicianId()) &&
+                            treeProgram.getScheduleServeQuery().getServeId().equals(scheduleServe.getServeId()))
+                    .findAny()
+                    .orElseThrow(() -> new RRException("预约时间已过期"));
+            if (ListUtil.isNotEmpty(scheduleServeList)) {
+                this.validTechnician(scheduleServeList, findChild.getChildList());
+            }
+        }
+
+    }
+
+
     private String getScheduleNo(Integer debarmentId) {
 
         //调用店铺服务根据id查询店铺