fix

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

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

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

@@ -93,10 +93,10 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	@ApiOperation(value="酒店预定订单-添加", notes="酒店预定订单-添加")
 	//@RequiresPermissions("business:bus_room_booking_orders:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody BookingOrderSaveDto busRoomBookingOrders) {
+	public Result<String> add(@RequestBody BookingOrderSaveDto busRoomBookingOrders,String hotelId) {
 		Boolean isTeam = busRoomBookingOrders.getOrderInfo().getBookingOrdersType().equals(2);
 		busRoomBookingOrders.getOrderInfo().setBookingOrdersType(1);
-		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders,isTeam,false));
+		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders,isTeam,false,hotelId));
 	}
 	 /**
 	  *   添加批次订单
@@ -487,6 +487,12 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 		 return Result.OK(service.ruZhuHistoryList(page, hotelId, phone));
 	 }
 
+	 @ApiOperation(value="根据手机号查询入住历史列表", notes="根据手机号查询入住历史列表")
+	 @RequestMapping(value = "/del-bus-data",method = RequestMethod.GET)
+	 public  Result<String> delBusData(String hotelId) {
+	 	return Result.OK(service.delBusData(hotelId));
+	 }
+
 
 
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomBookingOrders.java

@@ -194,6 +194,11 @@ public class BusRoomBookingOrders implements Serializable {
     @ApiModelProperty(value = "第三方用戶ID")
     private String thirdLoginUserId;
 
+    /**酒店id*/
+    @Excel(name = "酒店id", width = 15)
+    @ApiModelProperty(value = "酒店id")
+    private String hotelId;
+
     @TableField(exist = false)
     private Boolean isTeam;
 

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,Boolean isLiving);
+    String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving,String hotelId);
 
     BookingOrderEditVo getBookingInfoById(String orderId, String bookingNo);
 
@@ -81,4 +81,5 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
      * @return
      */
      Page<HashMap<String, Object>> ruZhuHistoryList(Page<HashMap<String, Object>> page, String hotelId, String phone);
+     String delBusData(String hotelId);
 }

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

@@ -18,6 +18,14 @@ import org.jeecg.modules.business.mapper.BusRoomBookingOrdersMapper;
 import org.jeecg.modules.business.service.*;
 import org.jeecg.modules.business.util.MxTools;
 import org.jeecg.modules.business.vo.*;
+import org.jeecg.modules.fw.entity.FwRoomClean;
+import org.jeecg.modules.fw.entity.FwRoomLock;
+import org.jeecg.modules.fw.entity.FwRoomRepair;
+import org.jeecg.modules.fw.service.IFwRoomCleanService;
+import org.jeecg.modules.fw.service.IFwRoomLockService;
+import org.jeecg.modules.fw.service.IFwRoomRepairService;
+import org.jeecg.modules.pos.service.IPosJialiaoConfigDetailService;
+import org.jeecg.modules.pos.service.IPosMealSectionService;
 import org.jeecg.modules.rooms.Enum.RoomStatusEnum;
 import org.jeecg.modules.rooms.Vo.BookingRealtimeVo;
 import org.jeecg.modules.rooms.Vo.FloorBuildingRoomVo;
@@ -109,9 +117,18 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Resource
     private IBusMarketAgreementUnitService marketAgreementUnitService;
+
+    @Resource
+    private IFwRoomCleanService fwRoomCleanService;
+
+    @Resource
+    private IFwRoomLockService fwRoomLockService;
+
+    @Resource
+    private IFwRoomRepairService fwRoomRepairService;
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving) {
+    public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving,String hotelId) {
         isTeam = isTeam != null && isTeam;
         LoginUser user = TokenUtils.getAuthUser();
         item.getOrderInfo().setCreateTime(new Date());
@@ -203,7 +220,8 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
             if(item.getRoomIds() == null || item.getRoomIds().size() == 0)
                 throw new JeecgBootException("请选择预定房间");
-
+            if(hotelId == null || hotelId.isEmpty()) throw  new JeecgBootException("参数错误，酒店id");
+            item.getOrderInfo().setHotelId(hotelId);
             save(item.getOrderInfo());
             String bookingId = item.getOrderInfo().getId();
             // todo 判定是否有安排冲突的房间
@@ -986,7 +1004,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,true);
+        String bookingOrderNo = bookingOrderSave(livingData,isTeam,true,hotelId);
         if(bookingOrderNo != null && !bookingOrderNo.isEmpty()){
             BookingOrderEditVo bookingOrderVo =  getBookingInfoById(null,bookingOrderNo);
             // 散客取roomIds
@@ -2302,4 +2320,27 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         return page.setRecords(this.baseMapper.ruZhuHistoryList(page, hotelId, phone));
     }
 
+    @Override
+    public String delBusData(String hotelId) {
+        List<CesRooms> hotelRooms = roomsService.list(Wrappers.<CesRooms>query().eq("hotel_id",hotelId));
+        hotelRooms.forEach(s->{
+            s.setRoomStatus(RoomStatusEnum.EMPTY_CLEAR.getKey());
+        });
+        roomsService.updateBatchById(hotelRooms);
+        List<BusRoomBookingOrders> bookingOrders = list(Wrappers.<BusRoomBookingOrders>query().eq("hotel_id",hotelId));
+        remove(Wrappers.<BusRoomBookingOrders>query().eq("hotel_id",hotelId));
+        String delRes = "";
+        if(bookingOrders.size() > 0) {
+            List<String> bookingOrderIds = bookingOrders.stream().map(s->s.getId()).collect(Collectors.toList());
+            bookingRoomsService.remove(Wrappers.<BusBookingRooms>query().in("booking_orders_id",bookingOrderIds));
+            dayPriceService.remove(Wrappers.<BusBookingLayoutDayPrice>query().in("booking_order_id",bookingOrderIds));
+            roomsLivingOrderService.remove(Wrappers.<BusRoomsLivingOrder>query().in("booking_order_id",bookingOrderIds));
+            feeService.remove(Wrappers.<BusOrderFee>query().eq("hotel_id",hotelId));
+            fwRoomCleanService.remove(Wrappers.<FwRoomClean>query().eq("hotel_id",hotelId));
+            fwRoomLockService.remove(Wrappers.<FwRoomLock>query().eq("hotel_id",hotelId));
+            fwRoomRepairService.remove(Wrappers.<FwRoomRepair>query().eq("hotel_id",hotelId));
+        }
+        return "";
+    }
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.entity;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -188,6 +189,17 @@ public class SysUser implements Serializable {
      * 是否租户管理员
      */
     private Integer isAdmin;
+
+    /**
+     * 折扣权限
+     */
+    private Integer discountType;
+
+    /**
+     * 最低折扣
+     */
+    private BigDecimal discountValue;
+
     /**
      * 登录首页地址
      */
@@ -195,4 +207,5 @@ public class SysUser implements Serializable {
     private String homePath;
 
 
+
 }