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
657e7a1c
Commit
657e7a1c
authored
Mar 24, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pre
parent
8ae074f9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
RRExceptionHandler.java
src/main/java/com/gogirl/RRExceptionHandler.java
+5
-1
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+7
-2
CustomerMessageServiceImpl.java
...girl/application/xcx/impl/CustomerMessageServiceImpl.java
+1
-1
No files found.
src/main/java/com/gogirl/RRExceptionHandler.java
View file @
657e7a1c
...
...
@@ -33,11 +33,15 @@ public class RRExceptionHandler {
result
.
setSuccess
(
false
);
result
.
setCode
(
e
.
getCode
());
result
.
setMessage
(
e
.
getMessage
());
if
(
e
.
getCode
()
!=
2000
)
{
if
(
e
.
getCode
()
!=
2000
&&
e
.
getCode
()
!=
2001
&&
e
.
getCode
()
!=
2005
)
{
log
.
error
(
"Params : {}"
,
getParamString
(
request
.
getParameterMap
())
+
"\n"
);
log
.
error
(
"URI : {}"
,
request
.
getRequestURI
()
+
"\n"
);
log
.
error
(
e
.
getMessage
(),
e
);
}
else
{
log
.
error
(
"Params : {}"
,
getParamString
(
request
.
getParameterMap
())
+
"\n"
);
log
.
error
(
"URI : {}"
,
request
.
getRequestURI
()
+
"\n"
);
log
.
error
(
e
.
getMessage
());
}
return
result
;
}
...
...
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
657e7a1c
...
...
@@ -666,9 +666,14 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
@Override
public
void
checkBeforeTakeOrders
(
Integer
technicianId
,
Integer
scheduleId
)
{
List
<
ScheduleServe
>
scheduleServeList
=
scheduleServeService
.
list
(
new
LambdaQueryWrapper
<
ScheduleServe
>().
eq
(
ScheduleServe:
:
getSchId
,
scheduleId
));
List
<
ScheduleServe
>
scheduleServeList
=
scheduleServeService
.
list
(
new
LambdaQueryWrapper
<
ScheduleServe
>().
eq
(
ScheduleServe:
:
getSchId
,
scheduleId
));
scheduleServeList
.
forEach
(
scheduleServe
->
{
List
<
ScheduleServe
>
conflictScheduleServeList
=
scheduleManageMapper
.
checkConflict
(
scheduleServe
.
getStartTime
(),
scheduleServe
.
getEndTime
(),
technicianId
,
scheduleId
);
List
<
ScheduleServe
>
conflictScheduleServeList
=
scheduleManageMapper
.
checkConflict
(
scheduleServe
.
getStartTime
(),
scheduleServe
.
getEndTime
(),
technicianId
,
scheduleId
);
if
(
ListUtil
.
isNotEmpty
(
conflictScheduleServeList
))
{
throw
new
RRException
(
2003
,
"冲突"
);
}
...
...
src/main/java/com/gogirl/application/xcx/impl/CustomerMessageServiceImpl.java
View file @
657e7a1c
...
...
@@ -30,7 +30,7 @@ public class CustomerMessageServiceImpl extends ServiceImpl<CustomerMessageMappe
public
Page
<
CustomerMessage
>
queryPageMessage
(
CustomerMessagePageQuery
qry
)
{
//线程变量当前当前用户id
if
(
SessionUtils
.
getCustomerToken
()
==
null
)
{
throw
new
RRException
(
200
1
,
"token失效"
);
throw
new
RRException
(
200
0
,
"token失效"
);
}
qry
.
setCustomerId
(
SessionUtils
.
getCustomerToken
().
getCustomerId
());
...
...
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