From d94c5dbf112a8baf166229fb2fd160e4b48daee9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 15 Mar 2022 18:01:06 +0800
Subject: [PATCH] add mobile showFreedBed

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java  |    1 
 zq-erp/src/main/java/com/matrix/system/app/dto/FreeBedDto.java                |   43 +++++++++++++++++++++
 zq-erp/src/main/resources/config/application.properties                       |    2 
 zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java |   20 ++++++++++
 zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java     |   11 +++++
 5 files changed, 76 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 6b1d335..c7eee3b 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -165,6 +165,7 @@
         sysProjServices.setVipId(serviceOrderDto.getVipId());
         sysProjServices.setYyTime(serviceOrderDto.getYyTime());
         sysProjServices.setRemark(serviceOrderDto.getRemark());
+        sysProjServices.setBedId(serviceOrderDto.getBedId());
 
         List<SysBeauticianState> sysBeauticianStates = new ArrayList<>();
         serviceOrderDto.getProjItems().forEach(item ->{
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java b/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
index c4a5942..81cc329 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
@@ -4,6 +4,7 @@
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.tools.DateUtil;
 import com.matrix.core.tools.WebUtil;
+import com.matrix.system.app.dto.FreeBedDto;
 import com.matrix.system.app.vo.StoreListVo;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.service.SysUsersService;
@@ -11,9 +12,12 @@
 import com.matrix.system.hive.action.BaseController;
 import com.matrix.system.hive.action.OccupancyController;
 import com.matrix.system.hive.bean.SysBeauticianState;
+import com.matrix.system.hive.bean.SysBedInfo;
+import com.matrix.system.hive.bean.SysProjServices;
 import com.matrix.system.hive.bean.SysWorkBeatuistaff;
 import com.matrix.system.hive.dao.SysBeauticianStateDao;
 import com.matrix.system.hive.plugin.util.CollectionUtils;
+import com.matrix.system.hive.service.SysBedInfoService;
 import com.matrix.system.hive.service.SysWorkBeatuistaffService;
 import com.matrix.system.hive.service.SysWorktimeService;
 import io.swagger.annotations.Api;
@@ -43,6 +47,9 @@
     @Resource
     private OccupancyController occupancyController;
 
+    @Autowired
+    private SysBedInfoService bedInfoService;
+
     /**
      * 获取员工预约情况
      */
@@ -57,4 +64,17 @@
         return occupancyController.getCwzyList(timeStr,sysUsers.getShopId());
     }
 
+    @ApiOperation(value = "获取床位信息", notes = "获取床位信息")
+    @PostMapping(value = "/showFreedBed")
+    public AjaxResult showFreedBed(@RequestBody FreeBedDto freeBedDto) {
+        SysProjServices sysProjServices = new SysProjServices();
+        sysProjServices.setStartTime(freeBedDto.getStartTime());
+        sysProjServices.setTotalTime(freeBedDto.getTotalTime());
+
+        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+        sysProjServices.setShopId(sysUsers.getShopId());
+        List<SysBedInfo> beds = bedInfoService.findFreeBed(sysProjServices);
+        return new AjaxResult(AjaxResult.STATUS_SUCCESS, beds, 0);
+    }
+
 }
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
index 30c0cfa..6a9b593 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
@@ -25,6 +25,9 @@
     @ApiModelProperty(value = "美疗师ID")
     private Long beautyId;
 
+    @ApiModelProperty(value = "床位ID")
+    private Long bedId;
+
     @NotNull(message = "请选择预约时间")
     @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
     @ApiModelProperty(value = "预约时间")
@@ -42,6 +45,14 @@
     @ApiModelProperty(value = "资金密码")
     private String password;
 
+    public Long getBedId() {
+        return bedId;
+    }
+
+    public void setBedId(Long bedId) {
+        this.bedId = bedId;
+    }
+
     public String getPassword() {
         return password;
     }
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/FreeBedDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/FreeBedDto.java
new file mode 100644
index 0000000..36c0cb2
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/FreeBedDto.java
@@ -0,0 +1,43 @@
+package com.matrix.system.app.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author wzy
+ * @date 2022-03-15
+ **/
+@ApiModel(value = "FreeBedDto", description = "获取床位信息接口接受参数类")
+public class FreeBedDto {
+
+    @NotNull(message = "选择预约时间")
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+    @ApiModelProperty(value = "预约开始时间")
+    private Date startTime;
+
+    @NotNull(message = "输入服务时长")
+    @ApiModelProperty(value = "服务时长")
+    private Integer totalTime;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Integer getTotalTime() {
+        return totalTime;
+    }
+
+    public void setTotalTime(Integer totalTime) {
+        this.totalTime = totalTime;
+    }
+}
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index ddb6608..6b3f12e 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -1,5 +1,5 @@
 
-spring.profiles.active=test
+spring.profiles.active=alpha
 evn=dev
 server.port=8080
 

--
Gitblit v1.9.1