mapper 修改

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.order.serve.ScheduleManage;
 import com.gogirl.domain.order.serve.ScheduleServe;
+import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.dto.IdleTimeProgramQuery;
 import com.gogirl.dto.LeisureScheduleServe;
 import com.gogirl.dto.LeisureScheduleServeQuery;
@@ -12,9 +13,11 @@ import com.gogirl.shared.order.serve.command.schedule.CancelScheduleCommand;
 import com.gogirl.shared.order.serve.command.schedule.SubmitScheduleCommand;
 import com.gogirl.shared.order.serve.command.schedule.UpdateScheduleCommand;
 import com.gogirl.shared.order.serve.query.dto.IdleTimeDTO;
+import com.gogirl.shared.order.serve.query.qry.StoreTechnicianQuery;
 import com.gogirl.shared.order.serve.query.qry.schedule.ScheduleManagePageQuery;
 
 import java.text.ParseException;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -135,4 +138,11 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
      * @return
      */
     IPage<LeisureScheduleServe> queryPageLeisureScheduleServe(LeisureScheduleServeQuery query);
+
+    List<StoreTechnicianQuery> storeTechnicianQueryList(Integer scheduledId,
+                                                        Integer departmentId,
+                                                        String scheduleDate,
+                                                        List<Integer> serveIdList) throws ParseException;
+
+    StoreTechnician queryLeisureTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime);
 }

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

@@ -101,10 +101,11 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     private final PurchaseSkuMapper purchaseSkuMapper;
     private final BaseProduceMapper baseProduceMapper;
 
-    private List<StoreTechnicianQuery> storeTechnicianQueryList(Integer scheduledId,
-                                                                Integer departmentId,
-                                                                String scheduleDate,
-                                                                List<Integer> serveIdList) throws ParseException {
+    @Override
+    public List<StoreTechnicianQuery> storeTechnicianQueryList(Integer scheduledId,
+                                                               Integer departmentId,
+                                                               String scheduleDate,
+                                                               List<Integer> serveIdList) throws ParseException {
 
         //1.查询美甲师排班表
         List<StoreClassesTechnician> storeClassesTechnicianList = storeClassesTechnicianService.listClassesTechnician(scheduledId, departmentId, scheduleDate);
@@ -202,6 +203,14 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     }
 
     @Override
+    public StoreTechnician queryLeisureTechnician(Integer departmentId, Integer serveId, LocalDateTime serveStartTime, LocalDateTime serveEndTime) {
+//        this.storeTechnicianQueryList(null,departmentId)
+
+        return null;
+    }
+
+
+    @Override
     public List<IdleTimeDTO> queryIdleTime(IdleTimeProgramQuery qry) throws ParseException {
 
         IdleTimeQuery idleTimeQuery = new IdleTimeQuery();

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

@@ -239,10 +239,10 @@ public class ScheduleManageController {
     @PostMapping("/customer/queryLeisureTechnician")
     public JsonResult<StoreTechnician> queryLeisureTechnician(@RequestParam Integer departmentId,
                                                               @RequestParam Integer serveId,
-                                                              @RequestParam Integer serveDuration,
-                                                              @RequestParam LocalDateTime dateTime) {
+                                                              @RequestParam LocalDateTime serveStartTime,
+                                                              @RequestParam LocalDateTime serveEndTime) {
 
-        StoreTechnician storeTechnician = storeTechnicianService.list().stream().findAny().orElse(null);
+        StoreTechnician storeTechnician = scheduleManageService.queryLeisureTechnician(departmentId, serveId, serveStartTime, serveEndTime);
         return JsonResult.success();
     }
 

src/main/resources/application-pre.yml

@@ -35,6 +35,14 @@ spring:
     host: 127.0.0.1
     port: 6379
     database: 0
+    timeout: 5000
+    lettuce:
+      pool:
+        max-active: 100
+        max-wait: 10000
+        max-idle: 100
+        min-idle: 10
+
 
 #项目属性
 gogirl:

src/main/resources/mapper/store/StoreClassesTechnicianMapper.xml

@@ -119,6 +119,7 @@
         AND t5.STATUS != 4
         AND t5.STATUS != 5
         AND t5.STATUS != 2
+        and t4.status !=3
         WHERE t4.start_time LIKE concat(#{days},'%')
         <if test="scheduleId != null">
             and t5.id != #{scheduleId}