bug fix

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

@@ -41,6 +41,7 @@ import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
 import com.gogirl.infrastructure.util.MapDistance;
+import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.shared.order.serve.command.schedule.*;
 import com.gogirl.shared.order.serve.query.dto.IdleTimeDTO;
 import com.gogirl.shared.order.serve.query.qry.*;
@@ -230,6 +231,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
+        //美甲师不可用日期列表
         List<StoreTechnicianPeriod> storeTechnicianDTOList = this.queryStoreTechnicianPeriod(qry.getId(), qry.getDepartmentId(), qry.getScheduleDate(), qry.getListScheduleServer().stream().map(ScheduleServe::getServeId).collect(Collectors.toList()));
 
         idleTimeQuery.setStoreTechnicianDTOList(storeTechnicianDTOList);
@@ -331,16 +333,16 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 })
                 .collect(Collectors.toList());
 
-
-        for (IdleTimeDTO idleTimeDTO : idleTimeDTOList) {
-            List<ScheduleServeQuery> scheduleServeQueryList = idleTimeDTO.getDefaultNodeList().stream().map(TreeProgram::getScheduleServeQuery).collect(Collectors.toList());
-            for (ScheduleServeQuery scheduleServeQuery : scheduleServeQueryList) {
-                if (this.isLeisureTime(idleTimeDTO.getTime(), idleTimeDTO.getDateTime(), scheduleServeQuery.getServeId())) {
-                    //闲时打折
-                    idleTimeDTO.setIsLeisureDiscount(1);
-                }
-            }
-        }
+//
+//        for (IdleTimeDTO idleTimeDTO : idleTimeDTOList) {
+//            List<ScheduleServeQuery> scheduleServeQueryList = idleTimeDTO.getDefaultNodeList().stream().map(TreeProgram::getScheduleServeQuery).collect(Collectors.toList());
+//            for (ScheduleServeQuery scheduleServeQuery : scheduleServeQueryList) {
+//                if (this.isLeisureTime(idleTimeDTO.getTime(), idleTimeDTO.getDateTime(), scheduleServeQuery.getServeId())) {
+//                    //闲时打折
+//                    idleTimeDTO.setIsLeisureDiscount(1);
+//                }
+//            }
+//        }
         return idleTimeDTOList;
     }
 
@@ -1034,6 +1036,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             throw new RRException("入参错误");
         }
 
+        cmd.getScheduleManageDTO().setDepartmentId(SessionUtils.getTechnicianToken().getDepartmentId());
         this.setScheduleServe(cmd);
 
         ScheduleManageCommand scheduleManageCommand = cmd.getScheduleManageDTO();
@@ -1598,7 +1601,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             scheduleServeCommand.setServeNumber(1);
         });
 
-        //如果defaultNodeList 不为空 根据defaultNodeList的参数设置服务时间
+        //根据defaultNodeList的参数设置服务开始时间，服务结束时间，服务美甲师
         if (ListUtil.isNotEmpty(defaultNodeList)) {
             defaultNodeList.forEach(defaultNode -> {
                 scheduleServeCommandList
@@ -1632,7 +1635,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 .filter(scheduleServeCommand -> scheduleServeCommand.getMainServeId() != null)
                 .collect(Collectors.toList());
 
-        //设置主服务的属性到辅助服务上
+        //从服务的时间加到主服务上面
         subScheduleServeCommandList
                 .forEach(scheduleServeCommand -> {
                     ScheduleServeCommand mainScheduleServeCommand = mainScheduleServeCommandList.stream()