Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SiEn
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hewei
SiEn
Commits
71d7f4c0
Commit
71d7f4c0
authored
Oct 10, 2020
by
giaogiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消行程接口
parent
71f04231
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
0 deletions
+30
-0
api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java
+11
-0
common/src/main/java/com/jumeirah/common/service/StrokeService.java
+4
-0
common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
+15
-0
No files found.
api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java
View file @
71d7f4c0
...
@@ -130,6 +130,17 @@ public class StrokeController extends BaseController {
...
@@ -130,6 +130,17 @@ public class StrokeController extends BaseController {
}
}
/**
/**
* 取消行程
*/
@PostMapping
(
"/cancel/{id}"
)
@OperationLog
(
name
=
"取消行程"
,
type
=
OperationLogType
.
UPDATE
)
@ApiOperation
(
value
=
"取消行程"
,
response
=
ApiResult
.
class
)
public
ApiResult
<
Boolean
>
cancel
(
@PathVariable
(
"id"
)
Long
id
)
throws
Exception
{
boolean
flag
=
strokeService
.
cancelStroke
(
id
);
return
ApiResult
.
result
(
flag
);
}
/**
* 获取行程表详情
* 获取行程表详情
*/
*/
@GetMapping
(
"/info/{id}"
)
@GetMapping
(
"/info/{id}"
)
...
...
common/src/main/java/com/jumeirah/common/service/StrokeService.java
View file @
71d7f4c0
...
@@ -42,6 +42,10 @@ public interface StrokeService extends BaseService<Stroke> {
...
@@ -42,6 +42,10 @@ public interface StrokeService extends BaseService<Stroke> {
*/
*/
boolean
deleteStroke
(
Long
id
)
throws
Exception
;
boolean
deleteStroke
(
Long
id
)
throws
Exception
;
boolean
cancelStroke
(
Long
id
)
throws
Exception
;
/**
/**
* 根据ID获取查询对象
* 根据ID获取查询对象
*
*
...
...
common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
View file @
71d7f4c0
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.jumeirah.common.entity.Stroke
;
import
com.jumeirah.common.entity.Stroke
;
import
com.jumeirah.common.enums.StrokeStatusEnum
;
import
com.jumeirah.common.mapper.StrokeMapper
;
import
com.jumeirah.common.mapper.StrokeMapper
;
import
com.jumeirah.common.param.StrokePageParam
;
import
com.jumeirah.common.param.StrokePageParam
;
import
com.jumeirah.common.service.StrokeService
;
import
com.jumeirah.common.service.StrokeService
;
...
@@ -58,6 +59,20 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
...
@@ -58,6 +59,20 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
}
}
@Override
@Override
public
boolean
cancelStroke
(
Long
id
)
throws
Exception
{
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
Stroke
byId
=
super
.
getById
(
id
);
// 判断该记录是否属于此用户
if
(!
byId
.
getUserId
().
equals
(
jwtToken
.
getUserId
()))
{
return
false
;
}
Stroke
stroke
=
new
Stroke
();
stroke
.
setId
(
id
);
stroke
.
setStatus
(
StrokeStatusEnum
.
CANCEL
.
getCode
());
return
super
.
updateById
(
stroke
);
}
@Override
public
StrokeDetailVo
getStrokeById
(
Long
id
)
throws
Exception
{
public
StrokeDetailVo
getStrokeById
(
Long
id
)
throws
Exception
{
return
strokeMapper
.
getStrokeById
(
id
);
return
strokeMapper
.
getStrokeById
(
id
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment