更新

src/main/java/cn/mafangui/hotel/service/CheckInService.java

@@ -2,19 +2,20 @@ package cn.mafangui.hotel.service;
 
 import cn.mafangui.hotel.entity.CheckIn;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface CheckInService {
 
     int insert(CheckIn checkIn);
 
-    int checkIn(CheckIn checkIn);
+    HashMap checkIn(CheckIn checkIn);
 
     int delete(int checkInId);
 
     int update(CheckIn checkIn);
 
-    int checkOut(String roomNumber);
+    int checkOut(String roomNumber) throws Exception;
 
     int updateByRoomNumber(String roomNumber);
 

src/main/java/cn/mafangui/hotel/service/WorkerService.java

@@ -13,4 +13,5 @@ public interface WorkerService {
     List<Worker> findAll();
     List<Worker> selectByRole(String role);
     Worker login(String username,String password,String role);
+    Worker login(String username,String password);
 }

src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Timestamp;
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -44,17 +44,22 @@ public class CheckInServiceImpl implements CheckInService {
      */
     @Override
     @Transactional
-    public int checkIn(CheckIn checkIn) {
+    public HashMap checkIn(CheckIn checkIn) {
+        HashMap resultMap = new HashMap();
+        int code = 0;
         Order order = orderService.selectById(checkIn.getOrderId());
         RoomType rt = roomTypeService.selectById(order.getRoomTypeId());
         Room r=roomService.selectById(roomService.inRoom(order.getRoomTypeId()));
-        if (r == null) return -3;
+        if (r == null) code = -3;
         checkIn.setRoomId(r.getRoomId());
         checkIn.setRoomNumber(r.getRoomNumber());
-        if (roomTypeService.updateRest(rt.getTypeId(),-1) <= 0) return -2;
+        if (roomTypeService.updateRest(rt.getTypeId(),-1) <= 0) code = -2;
         order.setOrderStatus(OrderStatus.CHECK_IN.getCode());
-        if (orderService.update(order) <=0 ) return -1;
-        return checkInMapper.insert(checkIn);
+        if (orderService.update(order) <=0 ) code =  -1;
+        code = checkInMapper.insert(checkIn);
+        resultMap.put("code",code);
+        resultMap.put("room",r);
+        return resultMap;
     }
 
     /**
@@ -66,7 +71,7 @@ public class CheckInServiceImpl implements CheckInService {
      * @return
      */
     @Override
-    public int checkOut(String  roomNumber) {
+    public int checkOut(String  roomNumber) throws Exception{
         Room r = roomService.selectByNumber(roomNumber);
         RoomType ty = roomTypeService.selectById(r.getTypeId());
         CheckIn checkIn = checkInMapper.selectLatestByRoomNumber(roomNumber);

src/main/java/cn/mafangui/hotel/service/impl/OrderServiceImpl.java

@@ -52,6 +52,7 @@ public class OrderServiceImpl implements OrderService {
         Order order = new Order();
         order.setName(name);
         order.setPhone(phone);
+        order.setOrderStatus(OrderStatus.PAID.getCode());
         return orderMapper.selectByNameAndPhone(order);
     }
 

src/main/java/cn/mafangui/hotel/service/impl/WorkerServiceImpl.java

@@ -53,4 +53,9 @@ public class WorkerServiceImpl implements WorkerService {
     public Worker login(String username, String password,String role) {
         return workerMapper.selectByUsernameAndPassword(username,password,role);
     }
+
+    @Override
+    public Worker login(String username, String password) {
+        return workerMapper.selectByUsernamePassword(username,password);
+    }
 }