Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
travel-cloud
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
cloud
travel-cloud
Commits
e6fb205f
提交
e6fb205f
authored
11月 21, 2024
作者:
hzh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
酒店模块功能实现
上级
2a72fa0f
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
25 行增加
和
3 行删除
+25
-3
HotelController.java
.../org/dromara/server/controller/hotel/HotelController.java
+25
-3
没有找到文件。
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java
浏览文件 @
e6fb205f
...
@@ -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
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论