预约款式时间计算

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

@@ -265,7 +265,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 .map(scheduleServe -> {
                     ScheduleServeQuery scheduleServeQuery = new ScheduleServeQuery();
                     BeanUtils.copyProperties(scheduleServe, scheduleServeQuery);
+                    //款式or服务时间
+                    if (scheduleServe.getProduceId() == null) {
                         scheduleServeQuery.setLengthTimeForEndTime(baseServeMapper.selectById(scheduleServe.getServeId()).getServiceDuration());
+                    } else {
+                        scheduleServeQuery.setLengthTimeForEndTime(baseProduceMapper.selectById(scheduleServe.getProduceId()).getServiceDuration());
+                    }
+
                     BaseServe baseServe = baseServeMapper.selectById(scheduleServe.getServeId());
                     log.debug("-------,{}", baseServe.toString());
                     scheduleServeQuery.setServePicturePath(baseServe.getPicturePath());
@@ -276,24 +282,23 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
 
         //预约服务
-        List<ScheduleServeQuery> scheduleServeDTOList = idleTimeQuery.getScheduleServeQueryList();
+        List<ScheduleServeQuery> scheduleServeQueryList = idleTimeQuery.getScheduleServeQueryList();
 
         //预约子服务
-        List<ScheduleServeQuery> subServeDTOList = scheduleServeDTOList.stream()
+        List<ScheduleServeQuery> subScheduleServeQueryLinkedList = scheduleServeQueryList.stream()
                 .filter(scheduleServe -> scheduleServe.getMainServeId() != null)
                 .collect(Collectors.toList());
 
         //预约主服务
-        Queue<ScheduleServeQuery> mainServeDTOList = scheduleServeDTOList.stream()
+        Queue<ScheduleServeQuery> mainScheduleServeQueryLinkedList = scheduleServeQueryList.stream()
                 .filter(scheduleServe -> scheduleServe.getMainServeId() == null)
                 .collect(Collectors.toCollection(LinkedList::new));
 
         //添加子服务的时间到主服务
-        mainServeDTOList.forEach(scheduleServeDTO -> {
-            subServeDTOList.forEach(subServeDTO -> {
-                if (subServeDTO.getMainServeId().equals(scheduleServeDTO.getServeId())) {
-                    scheduleServeDTO.setLengthTimeForEndTime(
-                            scheduleServeDTO.getLengthTimeForEndTime() + subServeDTO.getLengthTimeForEndTime()
+        mainScheduleServeQueryLinkedList.forEach(mainScheduleServeQuery -> {
+            subScheduleServeQueryLinkedList.forEach(subScheduleServeQuery -> {
+                if (subScheduleServeQuery.getMainServeId().equals(mainScheduleServeQuery.getServeId())) {
+                    mainScheduleServeQuery.setLengthTimeForEndTime(mainScheduleServeQuery.getLengthTimeForEndTime() + subScheduleServeQuery.getLengthTimeForEndTime()
                     );
                 }
             });
@@ -310,7 +315,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         AtomicLong time = new AtomicLong(System.currentTimeMillis());
 
                         //每个主服务由不同的美甲师做，setter主服务的时间period
-                        mainServeDTOList.forEach(mainServeDTO -> {
+                        mainScheduleServeQueryLinkedList.forEach(mainServeDTO -> {
                             Period period = new Period();
                             period.setStartTime(dateTime);
                             period.setLength(mainServeDTO.getLengthTimeForEndTime().longValue() * 60000);
@@ -319,7 +324,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         });
 
                         //主服务深度克隆
-                        List<ScheduleServeQuery> cloneMainServeDTOList = mainServeDTOList.stream().map(CloneUtil::deepClone).collect(Collectors.toList());
+                        List<ScheduleServeQuery> cloneMainServeDTOList = mainScheduleServeQueryLinkedList.stream().map(CloneUtil::deepClone).collect(Collectors.toList());
 
                         //美甲师深度克隆
                         List<StoreTechnicianPeriod> cloneStoreTechnicianDTOList = idleTimeQuery.getStoreTechnicianDTOList().stream().map(CloneUtil::deepClone).collect(Collectors.toList());

src/main/java/com/gogirl/shared/order/serve/query/qry/IdleTimeQuery.java

@@ -15,7 +15,10 @@ public class IdleTimeQuery {
     List<Long> dateTimeList;
     private Integer id;
     private Integer DepartmentId;
+
+    @ApiModelProperty("预约时间")
     private String scheduleDate;
+
     @ApiModelProperty("预约")
     private List<ScheduleServeQuery> scheduleServeQueryList;