Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
travel-cloud
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
cloud
travel-cloud
Commits
b5a13ea1
提交
b5a13ea1
authored
11月 26, 2024
作者:
hzh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
火车票退票功能实现
上级
8e9d61af
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
25 行增加
和
5 行删除
+25
-5
TrainController.java
.../org/dromara/server/controller/train/TrainController.java
+23
-5
OrderTrainRefundBo.java
...java/org/dromara/server/domain/bo/OrderTrainRefundBo.java
+2
-0
没有找到文件。
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java
浏览文件 @
b5a13ea1
...
@@ -27,8 +27,11 @@ import org.dromara.common.ys.service.ICommonResourceService;
...
@@ -27,8 +27,11 @@ import org.dromara.common.ys.service.ICommonResourceService;
import
org.dromara.common.ys.service.ITrainService
;
import
org.dromara.common.ys.service.ITrainService
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.domain.bo.OrderTrainBo
;
import
org.dromara.server.domain.bo.OrderTrainBo
;
import
org.dromara.server.domain.bo.OrderTrainRefundBo
;
import
org.dromara.server.domain.vo.OrderTrainRefundVo
;
import
org.dromara.server.domain.vo.OrderTrainVo
;
import
org.dromara.server.domain.vo.OrderTrainVo
;
import
org.dromara.server.dubbo.RemoteOrderServiceImpl
;
import
org.dromara.server.dubbo.RemoteOrderServiceImpl
;
import
org.dromara.server.service.IOrderTrainRefundService
;
import
org.dromara.server.service.IOrderTrainService
;
import
org.dromara.server.service.IOrderTrainService
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -59,6 +62,7 @@ public class TrainController extends BaseController {
...
@@ -59,6 +62,7 @@ public class TrainController extends BaseController {
private
final
ITrainService
trainService
;
private
final
ITrainService
trainService
;
private
final
IOrderTrainService
orderTrainService
;
private
final
IOrderTrainService
orderTrainService
;
private
final
IOrderTrainRefundService
orderTrainRefundService
;
private
final
ICommonResourceService
commonResourceService
;
private
final
ICommonResourceService
commonResourceService
;
/**
/**
...
@@ -264,8 +268,8 @@ public class TrainController extends BaseController {
...
@@ -264,8 +268,8 @@ public class TrainController extends BaseController {
* 订单列表(本地)
* 订单列表(本地)
*/
*/
@GetMapping
(
"/local/orderList"
)
@GetMapping
(
"/local/orderList"
)
public
R
<
TableDataInfo
<
OrderTrainVo
>>
l
ist
(
OrderTrainBo
bo
,
PageQuery
pageQuery
)
{
public
R
<
TableDataInfo
<
OrderTrainVo
>>
l
ocalList
(
PageQuery
pageQuery
)
{
bo
.
setPersonCode
(
getUserId
());
OrderTrainBo
bo
=
new
OrderTrainBo
()
.
setPersonCode
(
getUserId
());
return
R
.
ok
(
orderTrainService
.
queryPageList
(
bo
,
pageQuery
));
return
R
.
ok
(
orderTrainService
.
queryPageList
(
bo
,
pageQuery
));
}
}
...
@@ -295,9 +299,11 @@ public class TrainController extends BaseController {
...
@@ -295,9 +299,11 @@ public class TrainController extends BaseController {
/**
/**
* 退票单申请
* 退票单申请
*/
*/
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
)
@PostMapping
(
"/orderRefund/apply"
)
@PostMapping
(
"/orderRefund/apply"
)
public
R
<
OrderRefundApplyModel
>
orderRefundApply
(
@RequestBody
org
.
dromara
.
common
.
ys
.
model
.
req
.
train
.
OrderRefundApplyModel
model
)
{
public
R
<
OrderRefundApplyModel
>
orderRefundApply
(
@RequestBody
org
.
dromara
.
common
.
ys
.
model
.
req
.
train
.
OrderRefundApplyModel
model
)
{
OrderRefundApplyModel
res
=
trainService
.
orderRefundApply
(
getUserId
(),
model
);
OrderRefundApplyModel
res
=
trainService
.
orderRefundApply
(
getUserId
(),
model
);
orderTrainRefundService
.
batchSaveOrder
(
getUserId
(),
res
.
getRefundNoList
());
return
R
.
ok
(
res
);
return
R
.
ok
(
res
);
}
}
...
@@ -312,9 +318,12 @@ public class TrainController extends BaseController {
...
@@ -312,9 +318,12 @@ public class TrainController extends BaseController {
/**
/**
* 退票单取消
* 退票单取消
*/
*/
@GetMapping
(
"/orderRefund/cancel"
)
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
)
public
R
<
Boolean
>
orderRefundCancel
(
org
.
dromara
.
common
.
ys
.
model
.
req
.
train
.
OrderRefundCancelModel
model
)
{
@PostMapping
(
"/orderRefund/cancel"
)
return
R
.
ok
(
trainService
.
orderRefundCancel
(
getUserId
(),
model
));
public
R
<
Boolean
>
orderRefundCancel
(
@RequestBody
org
.
dromara
.
common
.
ys
.
model
.
req
.
train
.
OrderRefundCancelModel
model
)
{
Boolean
result
=
trainService
.
orderRefundCancel
(
getUserId
(),
model
);
orderTrainRefundService
.
updateOrderInfo
(
List
.
of
(
model
.
getRefundNo
()));
return
R
.
ok
(
result
);
}
}
/**
/**
...
@@ -326,4 +335,13 @@ public class TrainController extends BaseController {
...
@@ -326,4 +335,13 @@ public class TrainController extends BaseController {
return
R
.
ok
(
trainService
.
orderRefundList
(
getUserId
(),
model
));
return
R
.
ok
(
trainService
.
orderRefundList
(
getUserId
(),
model
));
}
}
/**
* 退票单列表(本地)
*/
@GetMapping
(
"/local/orderRefund/list"
)
public
R
<
TableDataInfo
<
OrderTrainRefundVo
>>
list
(
PageQuery
pageQuery
)
{
OrderTrainRefundBo
bo
=
new
OrderTrainRefundBo
().
setPersonCode
(
getUserId
());
return
R
.
ok
(
orderTrainRefundService
.
queryPageList
(
bo
,
pageQuery
));
}
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderTrainRefundBo.java
浏览文件 @
b5a13ea1
...
@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank;
...
@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank;
import
jakarta.validation.constraints.NotNull
;
import
jakarta.validation.constraints.NotNull
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
org.dromara.common.core.validate.AddGroup
;
import
org.dromara.common.core.validate.AddGroup
;
import
org.dromara.common.core.validate.EditGroup
;
import
org.dromara.common.core.validate.EditGroup
;
import
org.dromara.common.mybatis.core.domain.BaseEntity
;
import
org.dromara.common.mybatis.core.domain.BaseEntity
;
...
@@ -18,6 +19,7 @@ import org.dromara.server.domain.OrderTrainRefund;
...
@@ -18,6 +19,7 @@ import org.dromara.server.domain.OrderTrainRefund;
*/
*/
@Data
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@AutoMapper
(
target
=
OrderTrainRefund
.
class
,
reverseConvertGenerate
=
false
)
@AutoMapper
(
target
=
OrderTrainRefund
.
class
,
reverseConvertGenerate
=
false
)
public
class
OrderTrainRefundBo
extends
BaseEntity
{
public
class
OrderTrainRefundBo
extends
BaseEntity
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论