Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusRoomBookingOrdersService.java

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -437,7 +437,7 @@ public class HotelController extends WebConfig {
         } else {
             busRoomBookingOrders.getOrderInfo().setCustomerType(1);
         }
-        busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders, isTeam);
+        busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders, isTeam,false);
 
         //创建业务消息信息
         LambdaQueryWrapper<SysUser> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusHotelController.java

@@ -277,6 +277,9 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 		 editHotel.setSfzName(busHotel.getSfzName());
 		 editHotel.setIdCard(busHotel.getIdCard());
 
+		 editHotel.setEwmLogo(busHotel.getEwmLogo());
+		 editHotel.setImgs(busHotel.getImgs());
+
 		 editHotel.setUpdateBy(JwtUtil.getUserNameByToken(request));
 		 editHotel.setUpdateTime(new Date());
 		 busHotelService.editHotelInfo(editHotel);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomBookingOrdersController.java

@@ -96,7 +96,7 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	public Result<String> add(@RequestBody BookingOrderSaveDto busRoomBookingOrders) {
 		Boolean isTeam = busRoomBookingOrders.getOrderInfo().getBookingOrdersType().equals(2);
 		busRoomBookingOrders.getOrderInfo().setBookingOrdersType(1);
-		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders,isTeam));
+		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders,isTeam,false));
 	}
 	 /**
 	  *   添加批次订单
@@ -259,7 +259,7 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	 @ApiOperation(value="酒店预定订单-预约房间入住", notes="酒店预定订单-预约房间入住")
 	 @RequestMapping(value = "booking-to-live",method = RequestMethod.POST)
 	 public  Result<String> bookingRoomToLive(String bookingRoomId, @RequestBody List<BusLivingCustomer> customers,String hotelId) {
-		 return  Result.OK("入住成功",service.bookingToLive(bookingRoomId, customers,hotelId,true));
+		 return  Result.OK("入住成功",service.bookingToLive(bookingRoomId, customers,hotelId,true,null));
 	 }
 
 	 /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/dto/BookingLayoutRoomsDto.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.modules.business.entity.BusLivingCustomer;
+import org.jeecg.modules.business.entity.BusRoomBookingOrders;
 
 import java.util.List;
 
@@ -20,6 +21,8 @@ public class BookingLayoutRoomsDto {
     private List<BusLivingCustomer> livingCustomers;
     @ApiModelProperty(value = "费用信息.暂时不需要")
     private List<String> orderFees;
+    @ApiModelProperty(value = "单个房间的入住订单信息")
+    private BusRoomBookingOrders roomOrderInfo;
 
 
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusRoomBookingOrdersService.java

@@ -27,7 +27,7 @@ import java.util.Map;
  */
 public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrders> {
 
-    String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam);
+    String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving);
 
     BookingOrderEditVo getBookingInfoById(String orderId, String bookingNo);
 
@@ -42,8 +42,12 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     String batchOrderSave(BatchOrderSavaDto item);
 
     Boolean setBatchOrderStatus(BusBookingBatch batchOrder);
+<<<<<<< HEAD
 
     String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers, String hotelId, Boolean bookingLiving);
+=======
+    String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers, String hotelId,Boolean bookingLiving, BusRoomBookingOrders livingRoomOrderInfo);
+>>>>>>> 602bdfd9e14a7ea3459d7b94202cf0e77c926517
 
     String customerLiving(BookingOrderSaveDto livingData, Boolean isTeam, String hotelId);
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -106,7 +106,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam) {
+    public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving) {
         isTeam = isTeam != null && isTeam;
         LoginUser user = TokenUtils.getAuthUser();
         item.getOrderInfo().setCreateTime(new Date());
@@ -185,7 +185,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         if(item.getOrderInfo().getBookingOrdersType().equals(BookingOrdersType.NORMAL.getKey())) {
             if(item.getOrderInfo().getArrivalTime() == null || item.getOrderInfo().getDueOutTime() == null)
                 throw new JeecgBootException("预抵时间和预离时间不能为空");
-            if(item.getOrderInfo().getArrivalTime().getTime() < new Date().getTime())
+            if(item.getOrderInfo().getArrivalTime().getTime() < new Date().getTime() && !isLiving)
                 throw new JeecgBootException("预抵时间不能小于当前时间");
             if(item.getOrderInfo().getArrivalTime().getTime() >= item.getOrderInfo().getDueOutTime().getTime())
                 throw new JeecgBootException("预抵时间不能大于或者等于预离时间");
@@ -872,7 +872,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers, String hotelId, Boolean bookingLiving) {
+    public String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers, String hotelId, Boolean bookingLiving, BusRoomBookingOrders livingRoomOrderInfo) {
         BusBookingRooms bkRoom = bookingRoomsService.getById(bookingRoomId);
         if(bkRoom == null) throw  new JeecgBootException("关联房间不存在");
         BusRoomBookingOrders bookingOrders = getById(bkRoom.getBookingOrdersId());
@@ -883,7 +883,12 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         BusRoomsLivingOrder livingOrder = null;
         if(bkRoom.getBookingType().equals(BookingOrdersType.NORMAL.getKey())) {
             //todo other
-            livingOrder = copyBookingToAcceptOrder(bookingOrders);
+            if(livingRoomOrderInfo != null) {
+                livingRoomOrderInfo.setId(bookingOrders.getId());
+                // 设置为当前时间
+                livingRoomOrderInfo.setArrivalTime(new Date());
+            }
+            livingOrder = copyBookingToAcceptOrder(livingRoomOrderInfo);
             livingOrder.setBookingRoomId(bookingRoomId);
         } else if(bkRoom.getBookingType().equals(BookingOrdersType.TEAM.getKey())) {
             BusBookingBatch batch = bookingBatchService.getById(bkRoom.getBookingBatchId());
@@ -974,7 +979,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String customerLiving(BookingOrderSaveDto livingData, Boolean isTeam, String hotelId) {
-        String bookingOrderNo = bookingOrderSave(livingData,isTeam);
+        String bookingOrderNo = bookingOrderSave(livingData,isTeam,true);
         if(bookingOrderNo != null && !bookingOrderNo.isEmpty()){
             BookingOrderEditVo bookingOrderVo =  getBookingInfoById(null,bookingOrderNo);
             // 散客取roomIds
@@ -1476,7 +1481,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         livingCustomer.setId(null);
         livingCustomer.setLivingOrderId(null);
         customers.add(livingCustomer);
-        String livingOrderId = bookingToLive(bookingRooms.getId(), customers,hotelId,null);
+        String livingOrderId = bookingToLive(bookingRooms.getId(), customers,hotelId,null,null);
 
         return true;
     }
@@ -1998,10 +2003,10 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         roomIds.forEach(bkRoom-> {
             if(livingData.getRoomIds().stream().filter(s->s.getRoomId().equals(bkRoom.getRoomId())).count() == 0)
                 throw new JeecgBootException("房间信息未找到");
-
-            List<BusLivingCustomer> customers = livingData.getRoomIds().stream().filter(s->s.getRoomId().equals(bkRoom.getRoomId())).findFirst().get().getLivingCustomers();
+            BookingLayoutRoomsDto bkRoomItem = livingData.getRoomIds().stream().filter(s->s.getRoomId().equals(bkRoom.getRoomId())).findFirst().get();
+            List<BusLivingCustomer> customers = bkRoomItem.getLivingCustomers();
             if(customers == null || customers.size() == 0) throw new JeecgBootException("请添加客户信息");
-            String livingOrderId = bookingToLive(bkRoom.getId(), customers,hotelId,null);
+            String livingOrderId = bookingToLive(bkRoom.getId(), customers,hotelId,null, bkRoomItem.getRoomOrderInfo());
             // 费用关联到主房
             if(livingData.getOrderFees()!=null && livingData.getOrderFees().size() > 0 ) {
                 List<BusOrderFee> findRoomFees = livingData.getOrderFees().stream().filter(t->t.getRoomId().equals(bkRoom.getRoomId())).collect(Collectors.toList());