入住返回订单号

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

@@ -266,8 +266,8 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	  */
 	 @ApiOperation(value="酒店预定订单-入住", notes="酒店预定订单-入住")
 	 @RequestMapping(value = "living",method = RequestMethod.POST)
-	 public  Result<Boolean> living(@RequestBody BookingOrderSaveDto param) {
-		 return  Result.ok(service.customerLiving(param));
+	 public  Result<String> living(@RequestBody BookingOrderSaveDto param) {
+		 return  Result.OK("入住成功",service.customerLiving(param));
 	 }
 
 

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

@@ -10,6 +10,7 @@ import org.jeecg.modules.business.vo.BatchOrderEditVo;
 import org.jeecg.modules.business.vo.BookingOrderEditVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 酒店预定订单
@@ -36,5 +37,5 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     Boolean setBatchOrderStatus(BusBookingBatch batchOrder);
     String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers);
 
-    Boolean customerLiving(BookingOrderSaveDto livingData);
+    String customerLiving(BookingOrderSaveDto livingData);
 }

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

@@ -174,7 +174,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
             // 处理预定每天的房型价格 Start
             if(item.getLivingRoomDayPrices() != null && item.getLivingRoomDayPrices().size() > 0) {
-                if(item.getLivingRoomDayPrices().stream().anyMatch(o->o.getPrice()==null || o.getDayTime() == null || o.getRoomLayoutId() == null || o.getRoomId() == null))
+                if(item.getLivingRoomDayPrices().stream().anyMatch(o->o.getPrice()==null || o.getDayTime() == null || o.getRoomId() == null))
                     throw new JeecgBootException("参数错误，请传入价格、日期、房型");
                 // 入住之后在save
             } else {
@@ -839,7 +839,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean customerLiving(BookingOrderSaveDto livingData) {
+    public String customerLiving(BookingOrderSaveDto livingData) {
         String bookingOrderNo = bookingOrderSave(livingData);
         if(bookingOrderNo != null && !bookingOrderNo.isEmpty()){
             BookingOrderEditVo bookingOrderVo =  getBookingInfoById(null,bookingOrderNo);
@@ -860,7 +860,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                 });
             } else throw new JeecgBootException("订单类型错误");
         }
-        return true;
+        return bookingOrderNo;
     }
 
     private Map<String,String> bookingRoomToLiving(BookingOrderSaveDto livingData, List<ExtendBusBookingRoomsVo> roomIds, BookingOrderEditVo bookingOrderVo) {