Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
6b566d73
Commit
6b566d73
authored
Jul 01, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
美甲师修改预约重复生成订单问题
parent
77927ee7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+4
-0
OrderManageController.java
.../gogirl/interfaces/order/serve/OrderManageController.java
+12
-3
No files found.
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
6b566d73
...
@@ -899,6 +899,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -899,6 +899,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
log
.
info
(
"更新预约:{}"
,
cmd
);
log
.
info
(
"更新预约:{}"
,
cmd
);
ScheduleManage
scheduleManage
=
this
.
setScheduleServe
(
cmd
.
getScheduleManageDTO
(),
cmd
.
getDefaultNodeList
());
ScheduleManage
scheduleManage
=
this
.
setScheduleServe
(
cmd
.
getScheduleManageDTO
(),
cmd
.
getDefaultNodeList
());
if
(
scheduleManage
.
getStatus
().
equals
(
ScheduleManage
.
STATUS_KEEP_SCHEDULED
))
{
throw
new
RRException
(
"已完成预约,不能修改"
);
}
if
(
SessionUtils
.
isSourceFromCustomer
())
{
if
(
SessionUtils
.
isSourceFromCustomer
())
{
this
.
validSubmit
(
scheduleManage
);
this
.
validSubmit
(
scheduleManage
);
}
}
...
...
src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java
View file @
6b566d73
...
@@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
...
@@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.format.annotation.DateTimeFormat
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.security.InvalidParameterException
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -230,7 +231,16 @@ public class OrderManageController {
...
@@ -230,7 +231,16 @@ public class OrderManageController {
@PostMapping
(
"/technician/ordermanage/updateOrderManage"
)
@PostMapping
(
"/technician/ordermanage/updateOrderManage"
)
public
JsonResult
<
Void
>
updateOrderManage
(
@RequestHeader
String
token
,
public
JsonResult
<
Void
>
updateOrderManage
(
@RequestHeader
String
token
,
@RequestBody
OrderManage
param
)
{
@RequestBody
OrderManage
param
)
{
orderManageService
.
updateOrderManage
(
param
);
OrderIdLock
orderIdLock
=
OrderIdLock
.
getInstance
();
if
(
param
.
getId
()
==
null
)
{
throw
new
InvalidParameterException
();
}
try
{
orderIdLock
.
lock
(
param
.
getId
());
orderManageService
.
updateOrderManage
(
param
);
}
finally
{
orderIdLock
.
unlock
(
param
.
getId
());
}
return
JsonResult
.
success
();
return
JsonResult
.
success
();
}
}
...
@@ -269,4 +279,4 @@ public class OrderManageController {
...
@@ -269,4 +279,4 @@ public class OrderManageController {
// marketService.calcOrderAmount(orderId);
// marketService.calcOrderAmount(orderId);
return
JsonResult
.
success
();
return
JsonResult
.
success
();
}
}
}
}
\ No newline at end of file
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