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
17581c57
Commit
17581c57
authored
Apr 22, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
f535c970
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+2
-1
ScheduleServeMapper.java
...nfrastructure/mapper/order/serve/ScheduleServeMapper.java
+1
-1
ScheduleServeMapper.xml
src/main/resources/mapper/order/ScheduleServeMapper.xml
+2
-2
No files found.
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
17581c57
...
...
@@ -774,7 +774,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
scheduleManage
.
getScheduledUser
(),
scheduleManage
.
getArriveTime
(),
baseServe
.
getSchTypeId
(),
scheduleServe
.
getServeId
());
scheduleManage
.
getId
());
if
(
ListUtil
.
isNotEmpty
(
typeConflictScheduleServe
))
{
throw
new
RRException
(
"同类型服务一天只能预约一次"
);
}
...
...
src/main/java/com/gogirl/infrastructure/mapper/order/serve/ScheduleServeMapper.java
View file @
17581c57
...
...
@@ -12,5 +12,5 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
List
<
ScheduleServe
>
selectConflictType
(
@Param
(
"scheduledUser"
)
Integer
scheduledUser
,
@Param
(
"days"
)
Date
days
,
@Param
(
"schTypeId"
)
Integer
schTypeId
,
@Param
(
"s
erveId"
)
Integer
serv
eId
);
@Param
(
"s
cheduleId"
)
Integer
schedul
eId
);
}
src/main/resources/mapper/order/ScheduleServeMapper.xml
View file @
17581c57
...
...
@@ -13,8 +13,8 @@
and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
and t1.main_serve_id is null
and t2.`status` = 1
<if
test=
"s
erv
eId!=null"
>
and t
1.serve_id != #{serv
eId}
<if
test=
"s
chedul
eId!=null"
>
and t
2.id != #{schedul
eId}
</if>
</select>
...
...
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