店员端、单个服务开单状态变更为服务中

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

@@ -664,10 +664,11 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
             Set<ScheduleServe> scheduleServeSet = scheduleManage.getListScheduleServer();
 
-            if (!scheduleServeSet.stream().map(ScheduleServe::getStatus).map(stats -> stats == 3 || stats == 2).collect(Collectors.toList()).contains(false)) {
+            if (scheduleServeSet.stream().map(ScheduleServe::getStatus).map(stats -> stats == 3 || stats == 2).collect(Collectors.toList()).contains(true)) {
                 //守约
                 scheduleManage.setStatus(8);
                 scheduleManage.setLastUpdateTime(new Date());
+
                 //预约的开单时间 为第一个预约的开单时间
                 if (scheduleManage.getOpenbillTime() == null) {
                     scheduleManage.setOpenbillTime(new Date());

src/main/java/com/gogirl/domain/order/serve/ScheduleManage.java

@@ -134,7 +134,7 @@ public class ScheduleManage implements Serializable {
     private String scheduleDate;
 
     @TableField(exist = false)
-    @ApiModelProperty("预约下服务列表去重")
+    @ApiModelProperty("去重的预约下服务列表")
     private Set<ScheduleServe> listScheduleServer = new TreeSet<>(Comparator.comparing(o -> o.getSchId() + ";" + o.getServeId()));
 
     @TableField(exist = false)

src/main/java/com/gogirl/dto/QueryLeisureTechnicianReq.java

 package com.gogirl.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
@@ -10,7 +11,11 @@ import java.time.LocalDateTime;
 public class QueryLeisureTechnicianReq {
 
     private Integer departmentId;
+
+    @ApiModelProperty("款式id")
     private Integer produceId;
+
+    @ApiModelProperty("服务id")
     private Integer serveId;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gogirl.application.order.serve.ScheduleManageService;
 import com.gogirl.application.product.mall.PurchaseSkuService;
-import com.gogirl.application.store.store.StoreTechnicianService;
 import com.gogirl.application.user.customer.CustomerBalanceService;
 import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.assembler.PurchaseSkuDTOAssembler;
@@ -241,20 +240,18 @@ public class ScheduleManageController {
     }
 
 
+    @ApiOperation("分页查询闲时服务")
     @PostMapping("/customer/queryPageLeisureScheduleServe")
     public JsonResult<IPage<LeisureScheduleServe>> queryPageLeisureScheduleServe(@RequestBody LeisureScheduleServeQuery query) {
         IPage<LeisureScheduleServe> page = scheduleManageService.queryPageLeisureScheduleServe(query);
         return JsonResult.success(page);
     }
 
-    private final StoreTechnicianService storeTechnicianService;
-
+    @Deprecated
+    @ApiOperation("查询闲时美甲师")
     @PostMapping("/customer/queryLeisureTechnician")
     public JsonResult<StoreTechnician> queryLeisureTechnician(@RequestBody QueryLeisureTechnicianReq req) throws ParseException {
-
         scheduleManageService.queryLeisureTechnician(req.getDepartmentId(), req.getServeId(), req.getStartTime(), req.getEndTime());
         return JsonResult.success();
     }
-
-
 }