update

src/main/java/com/gogirl/application/order/serve/ScheduleManageService.java

@@ -10,6 +10,8 @@ import com.gogirl.shared.order.*;
 import com.gogirl.shared.product.LeisureScheduleServeQuery;
 import com.gogirl.shared.product.LeisureScheduleServeResp;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -142,19 +144,29 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
     IPage<LeisureScheduleServeResp> queryPageLeisureScheduleServe(LeisureScheduleServeQuery query);
 
     /**
-     * 查询美甲师信息和美甲师不可用时间段
+     * 查询店铺下的美甲师和美甲师不可用时间段
      *
-     * @param scheduledId  是否必传 否
+     * @param scheduledId  是否必传：否。为过滤条件，如果是修改的话传预约id在查询不可用时间段的时候会过滤被修改的预约。
      * @param departmentId 店铺id
-     * @param scheduleDate localData
-     * @param serveIdList  预约的服务id
-     * @return
+     * @param day          日期 形如yyyy-MM-dd
+     * @param serveIdList  预约的服务id。为过滤条件：过滤不能做服务的美甲师id
+     * @return departmentId下的美甲师和美甲师不可用时间段
      * @throws ParseException
      */
-    List<StoreTechnicianPeriod> queryStoreTechnicianPeriod(Integer scheduledId,
-                                                           Integer departmentId,
-                                                           String scheduleDate,
-                                                           List<Integer> serveIdList) throws ParseException;
+    List<StoreTechnicianPeriod> queryStoreTechnicianPeriod(@Null Integer scheduledId,
+                                                           @NotNull Integer departmentId,
+                                                           @NotNull String day,
+                                                           @Null List<Integer> serveIdList) throws ParseException;
 
-    List<StoreTechnician> queryLeisureTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime) throws ParseException;
+    /**
+     * 查询店铺下能做服务的美甲师
+     *
+     * @param departmentId   店铺id
+     * @param serveId        服务id
+     * @param serveStartTime 服务开始时间
+     * @param serveEndTime   服务结束时间
+     * @return
+     * @throws ParseException
+     */
+    List<StoreTechnician> queryAvailableTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime) throws ParseException;
 }

src/main/java/com/gogirl/application/store/store/StoreClassesTechnicianService.java

@@ -13,15 +13,6 @@ import java.util.List;
 
 public interface StoreClassesTechnicianService extends IService<StoreClassesTechnician> {
 
-    /**
-     * 查询美甲师排班表
-     *
-     * @param scheduledId  预约id
-     * @param departmentId 店铺id
-     * @param days         day like '2020-02-02'
-     * @return
-     */
-    List<StoreClassesTechnician> listClassesTechnician(Integer scheduledId, Integer departmentId, String days);
 
 
     /**

src/main/java/com/gogirl/application/store/store/StoreTechnicianService.java

@@ -10,7 +10,6 @@ public interface StoreTechnicianService extends IService<StoreTechnician> {
 
     List<StoreTechnician> listTechnicianForPage(StoreTechnician technicianManage);
 
-
     /**
      * 美甲师登陆
      *

src/main/java/com/gogirl/application/store/store/impl/StoreClassesTechnicianServiceImpl.java

@@ -44,10 +44,6 @@ public class StoreClassesTechnicianServiceImpl extends ServiceImpl<StoreClassesT
 
     private final GogirlTokenService gogirlTokenService;
 
-    @Override
-    public List<StoreClassesTechnician> listClassesTechnician(Integer scheduledId, Integer departmentId, String days) {
-        return storeClassesTechnicianMapper.listClassesTechnician(scheduledId, departmentId, days);
-    }
 
     @Override
     public List<StoreClassesTechnician> listClassesTechnicianDetail(Integer userId, String days) {
@@ -165,9 +161,5 @@ public class StoreClassesTechnicianServiceImpl extends ServiceImpl<StoreClassesT
 
     private final StoreTechnicianMapper storeTechnicianMapper;
 
-//    @Override
-//    public List<StoreTechnician> queryDayTechnicianClassesList(Integer departmentId, Date day) {
-//        return ;
-//    }
 
 }

src/main/java/com/gogirl/application/store/store/impl/StoreTechnicianServiceImpl.java

@@ -3,7 +3,6 @@ package com.gogirl.application.store.store.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gogirl.application.order.serve.OrderManageService;
 import com.gogirl.application.store.store.StoreTechnicianService;
 import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.application.xcx.WechatService;
@@ -37,7 +36,6 @@ public class StoreTechnicianServiceImpl extends ServiceImpl<StoreTechnicianMappe
     private final GogirlTokenService gogirlTokenService;
     private final StoreManageMapper storeManageMapper;
 
-    private final OrderManageService orderManageService;
 
     @Override
     public List<StoreTechnician> listTechnicianForPage(StoreTechnician technicianManage) {

src/main/java/com/gogirl/domain/store/store/StoreClassesTechnician.java

@@ -14,9 +14,6 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Created by yinyong on 2018/9/20.
- */
 @ApiModel("每天排班记录")
 @TableName("store_classes_technician")
 @Builder
@@ -36,18 +33,22 @@ public class StoreClassesTechnician {
     @ApiModelProperty("班次id")
     private Integer classes;
 
-    @ApiModelProperty("")
     private Integer status;
 
     /**
-     * 非数据库id
+     * 非数据库字段
      */
+
+
+    @ApiModelProperty("班次")
     @TableField(exist = false)
     private StoreClasses classesManage;
 
+    @ApiModelProperty("美甲师")
     @TableField(exist = false)
     private StoreTechnician technicianManage;
 
+    @ApiModelProperty("美甲师正在做的服务")
     @TableField(exist = false)
     private List<ScheduleServe> listScheduleServe;
 }

src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java

@@ -70,8 +70,7 @@ public class ScheduleManageController {
     @ApiOperation(value = "查询显示预约时间列表")
     @GetMapping("/customer/schedule/queryLeisureTime")
 
-    public JsonResult<List<IdleTimeDTO>> queryLeisureTime(@RequestHeader String token,
-                                                          @RequestParam Integer departmentId,
+    public JsonResult<List<IdleTimeDTO>> queryLeisureTime(@RequestParam Integer departmentId,
                                                           @RequestParam String scheduleDate) throws ParseException {
         List<IdleTimeDTO> idleTimeDTOList = scheduleManageService.queryLeisureTime(departmentId, scheduleDate);
         return JsonResult.success(idleTimeDTOList);
@@ -244,8 +243,7 @@ public class ScheduleManageController {
 
     @ApiOperation("更新预约服务状态")
     @GetMapping("/technician/schedule/updateScheduledServeStatus")
-    public JsonResult<Void> updateScheduledServeStatus(@RequestHeader String token,
-                                                       @RequestParam Integer scheduleServeId,
+    public JsonResult<Void> updateScheduledServeStatus(@RequestParam Integer scheduleServeId,
                                                        @RequestParam Integer status,
                                                        @RequestParam Integer forceLeisureConfig) {
         ScheduleServe scheduleServe = scheduleServeService.getById(scheduleServeId);
@@ -266,8 +264,7 @@ public class ScheduleManageController {
 
     @ApiOperation("当前服务是否在闲时间范围内 1-是 2-否")
     @GetMapping("/technician/schedule/getScheduledServeLeisure")
-    public JsonResult<Integer> getScheduledServeLeisure(@RequestHeader String token,
-                                                        @RequestParam Integer scheduleServeId) {
+    public JsonResult<Integer> getScheduledServeLeisure(@RequestParam Integer scheduleServeId) {
         Integer result = scheduleManageService.getScheduledServeLeisure(scheduleServeId);
         return JsonResult.success(result);
     }
@@ -284,7 +281,7 @@ public class ScheduleManageController {
     @ApiOperation("查询闲时美甲师")
     @PostMapping("/customer/queryLeisureTechnician")
     public JsonResult<StoreTechnician> queryLeisureTechnician(@RequestBody QueryLeisureTechnicianReq req) throws ParseException {
-        scheduleManageService.queryLeisureTechnician(req.getDepartmentId(), req.getServeId(), req.getStartTime(), req.getEndTime());
+        scheduleManageService.queryAvailableTechnician(req.getDepartmentId(), req.getServeId(), req.getStartTime(), req.getEndTime());
         return JsonResult.success();
     }
 }

src/main/java/com/gogirl/shared/order/StoreTechnicianPeriod.java

@@ -36,6 +36,9 @@ public class StoreTechnicianPeriod implements Serializable {
      */
     private String grade;
 
+    @JsonIgnore
+    private StoreTechnician storeTechnician;
+
     public StoreTechnicianPeriod() {
 
     }
@@ -47,6 +50,7 @@ public class StoreTechnicianPeriod implements Serializable {
         this.name = storeTechnician.getName();
         this.picturePath = storeTechnician.getPicturePath();
         this.grade = storeTechnician.getGrade();
+        this.storeTechnician = storeTechnician
     }
 
 }