修改

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

@@ -387,9 +387,9 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	  * @return
 	  */
 	 @ApiOperation(value="酒店预定订单-合并联房", notes="酒店预定订单-合并联房")
-	 @RequestMapping(value = "/union-order",method = RequestMethod.POST)
-	 public Result<Boolean> mergeOrder(String livingRoomId,String livingOrderId){
-	 	return  Result.OK(service.mergeOrder(livingRoomId,livingOrderId));
+	 @RequestMapping(value = "/merge-order",method = RequestMethod.POST)
+	 public Result<Boolean> mergeOrder(String livingRoomId,@RequestBody List<String> livingOrderIds ){
+	 	return  Result.OK(service.mergeOrder(livingRoomId,livingOrderIds));
 	 }
 
 

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

@@ -63,6 +63,6 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     IPage<RoomLivingQueryVo> getLivingPageData(Integer status,String keyw, Page<RoomLivingQueryVo> page);
     Boolean setLivingOrderFee(List<BusOrderFee> fees,String livingOrderId);
     Boolean unionOrder(String roomId,String targetRoomId, String bookingOrderId);
-    Boolean mergeOrder(String livingRoomId, String livingOrderId);
+    Boolean mergeOrder(String livingRoomId, List<String> livingOrderId);
 
 }

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

@@ -1276,7 +1276,15 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean mergeOrder(String mergeLivingOrderId, String livingOrderId) {
+    public Boolean mergeOrder(String mergeLivingOrderId, List<String> livingOrderId) {
+        livingOrderId.forEach(s->{
+            this.mergeSingle(mergeLivingOrderId,s);
+        });
+        return true;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    private Boolean mergeSingle(String mergeLivingOrderId, String livingOrderId) {
         BusRoomsLivingOrder mergeLivingOrder = roomsLivingOrderService.getById(mergeLivingOrderId);
         if(mergeLivingOrder == null) throw new JeecgBootException("合并的订单不存在");
         if(mergeLivingOrder.getSettleType().equals(SettleTypeEnum.SETTLE_LEAVE.getKey())) throw new JeecgBootException("结账退房的订单无法合并");
@@ -1286,7 +1294,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         BusRoomsLivingOrder livingOrder = roomsLivingOrderService.getById(livingOrderId);
         if(bookingRooms.getIsMain()){
             List<BusRoomsLivingOrder> relationOtherLivingOrders = roomsLivingOrderService.list(Wrappers.<BusRoomsLivingOrder>query()
-            .eq("booking_order_id", bookingRooms.getBookingOrdersId()));
+                    .eq("booking_order_id", bookingRooms.getBookingOrdersId()));
             List<String> bookingRoomIds = relationOtherLivingOrders.stream().map(s->s.getBookingRoomId()).collect(Collectors.toList());
             List<BusBookingRooms> bookingRoomsList = bookingRoomsService.list(Wrappers.<BusBookingRooms>query().in("id",bookingRoomIds));
             bookingRoomsList.forEach(s->{
@@ -1307,10 +1315,6 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             s.setBookingOrderId(mergeLivingOrder.getBookingOrderId());
         });
         roomsLivingOrderService.updateBatchById(needMergeLivingOrders);
-
-//        CesRooms mergeRoom = roomsService.getById(livingRoomId);
-//        if(mergeRoom == null) throw new JeecgBootException("房间不存在");
-
         return true;
     }