Commit 0ed909ac by huluobin

update

parent 56af9cba
...@@ -788,38 +788,38 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -788,38 +788,38 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
} }
}); });
/*2、校验提交的预约时间是否可约*/ // /*2、校验提交的预约时间是否可约*/
IdleTimeQuery query = new IdleTimeQuery(); // IdleTimeQuery query = new IdleTimeQuery();
//店铺id // //店铺id
query.setDepartmentId(scheduleManage.getDepartmentId()); // query.setDepartmentId(scheduleManage.getDepartmentId());
//预约日期 // //预约日期
query.setScheduleDate(new SimpleDateFormat("yyyy-MM-dd").format(scheduleManage.getArriveTime())); // query.setScheduleDate(new SimpleDateFormat("yyyy-MM-dd").format(scheduleManage.getArriveTime()));
query.setListScheduleServer(scheduleManage.getListScheduleServer() // query.setListScheduleServer(scheduleManage.getListScheduleServer()
.stream() // .stream()
.map(scheduleServeCommand -> { // .map(scheduleServeCommand -> {
ScheduleServeQuery scheduleServe = new ScheduleServeQuery(); // ScheduleServeQuery scheduleServe = new ScheduleServeQuery();
//时长 // //时长
scheduleServe.setLengthTimeForEndTime(scheduleServeCommand.getLengthTime()); // scheduleServe.setLengthTimeForEndTime(scheduleServeCommand.getLengthTime());
//款式id // //款式id
scheduleServe.setProduceId(scheduleServeCommand.getProduceId()); // scheduleServe.setProduceId(scheduleServeCommand.getProduceId());
//服务id // //服务id
scheduleServe.setServeId(scheduleServeCommand.getServeId()); // scheduleServe.setServeId(scheduleServeCommand.getServeId());
return scheduleServe; // return scheduleServe;
}) // })
.collect(Collectors.toList())); // .collect(Collectors.toList()));
//是否显示详情 // //是否显示详情
query.setShowNodeDetail(true); // query.setShowNodeDetail(true);
//查询时间节点 // //查询时间节点
query.setDateTimeList(Lists.newArrayList(scheduleManage.getArriveTime().getTime())); // query.setDateTimeList(Lists.newArrayList(scheduleManage.getArriveTime().getTime()));
// // //
query.setId(scheduleManage.getId()); // query.setId(scheduleManage.getId());
//查询方案树 // //查询方案树
List<IdleTimeDTO> idleTimeDTOList = this.queryIdleTime(query); // List<IdleTimeDTO> idleTimeDTOList = this.queryIdleTime(query);
//如果时间节点不可用返回false // //如果时间节点不可用返回false
IdleTimeDTO idleTimeDTO = idleTimeDTOList.stream().findAny().orElseThrow(NullPointerException::new); // IdleTimeDTO idleTimeDTO = idleTimeDTOList.stream().findAny().orElseThrow(NullPointerException::new);
if (!idleTimeDTO.isStatus()) { // if (!idleTimeDTO.isStatus()) {
throw new RRException("预约时间不可用"); // throw new RRException("预约时间不可用");
} // }
// /*3、如果是指定美甲师、判断美甲师是否仍然可用*/ // /*3、如果是指定美甲师、判断美甲师是否仍然可用*/
// //构造路径 // //构造路径
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment