提交 e6fb205f authored 作者: hzh's avatar hzh

酒店模块功能实现

上级 2a72fa0f
...@@ -4,10 +4,15 @@ package org.dromara.server.controller.hotel; ...@@ -4,10 +4,15 @@ package org.dromara.server.controller.hotel;
import io.seata.spring.annotation.GlobalTransactional; import io.seata.spring.annotation.GlobalTransactional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.ys.common.PageInfo; import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.model.res.hotel.*; import org.dromara.common.ys.model.res.hotel.*;
import org.dromara.common.ys.service.IHotelService; import org.dromara.common.ys.service.IHotelService;
import org.dromara.server.base.BaseController; import org.dromara.server.base.BaseController;
import org.dromara.server.domain.bo.OrderHotelBo;
import org.dromara.server.domain.vo.OrderHotelVo;
import org.dromara.server.service.IOrderHotelService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -28,6 +33,7 @@ public class HotelController extends BaseController { ...@@ -28,6 +33,7 @@ public class HotelController extends BaseController {
private final IHotelService hotelService; private final IHotelService hotelService;
private final IOrderHotelService orderHotelService;
/** /**
* 酒店详情 * 酒店详情
...@@ -62,7 +68,9 @@ public class HotelController extends BaseController { ...@@ -62,7 +68,9 @@ public class HotelController extends BaseController {
@GlobalTransactional(timeoutMills = 600000) @GlobalTransactional(timeoutMills = 600000)
@PostMapping("/order/book") @PostMapping("/order/book")
public R<HotelOrderBookModel> orderBook(@RequestBody org.dromara.common.ys.model.req.hotel.HotelOrderBookModel model) { public R<HotelOrderBookModel> orderBook(@RequestBody org.dromara.common.ys.model.req.hotel.HotelOrderBookModel model) {
return R.ok(hotelService.orderBook(getUserId(), model)); HotelOrderBookModel book = hotelService.orderBook(getUserId(), model);
orderHotelService.batchSaveOrder(getUserId(), List.of(book.getOrderId()));
return R.ok(book);
} }
/** /**
...@@ -71,7 +79,9 @@ public class HotelController extends BaseController { ...@@ -71,7 +79,9 @@ public class HotelController extends BaseController {
@GlobalTransactional(timeoutMills = 600000) @GlobalTransactional(timeoutMills = 600000)
@PostMapping("/order/cancel") @PostMapping("/order/cancel")
public R<CancelOrderModel> orderCancel(@RequestBody org.dromara.common.ys.model.req.hotel.CancelOrderModel model) { public R<CancelOrderModel> orderCancel(@RequestBody org.dromara.common.ys.model.req.hotel.CancelOrderModel model) {
return R.ok(hotelService.orderCancel(getUserId(), model)); CancelOrderModel cancel = hotelService.orderCancel(getUserId(), model);
orderHotelService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(cancel);
} }
/** /**
...@@ -80,7 +90,9 @@ public class HotelController extends BaseController { ...@@ -80,7 +90,9 @@ public class HotelController extends BaseController {
@GlobalTransactional(timeoutMills = 600000) @GlobalTransactional(timeoutMills = 600000)
@PostMapping("/order/pay") @PostMapping("/order/pay")
public R<Boolean> orderPay(@RequestBody org.dromara.common.ys.model.req.hotel.PayOrderModel model) { public R<Boolean> orderPay(@RequestBody org.dromara.common.ys.model.req.hotel.PayOrderModel model) {
return R.ok(hotelService.orderPay(getUserId(), model)); boolean result = hotelService.orderPay(getUserId(), model);
orderHotelService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(result);
} }
/** /**
...@@ -102,6 +114,16 @@ public class HotelController extends BaseController { ...@@ -102,6 +114,16 @@ public class HotelController extends BaseController {
return R.ok(hotelService.orderList(getUserId(), model)); return R.ok(hotelService.orderList(getUserId(), model));
} }
/**
* 订单列表
*/
@GetMapping("/order/local/list")
public R<TableDataInfo<OrderHotelVo>> orderLocalList(OrderHotelBo bo, PageQuery pageQuery) {
bo.setPersonCode(getUserId());
return R.ok(orderHotelService.queryPageList(bo, pageQuery));
}
/** /**
* 订单详情 * 订单详情
*/ */
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论