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
9d5bbad5
Commit
9d5bbad5
authored
Apr 20, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
97133da7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
16 deletions
+14
-16
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+14
-16
No files found.
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
9d5bbad5
...
...
@@ -46,8 +46,6 @@ import com.gogirl.infrastructure.service.push.TechnicianPushService;
import
com.gogirl.infrastructure.util.MapDistanceUtils
;
import
com.gogirl.infrastructure.util.SessionUtils
;
import
com.gogirl.shared.order.*
;
import
com.gogirl.shared.order.IdleTimeDTO
;
import
com.gogirl.shared.order.ScheduleManagePageQuery
;
import
com.google.common.collect.Lists
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -820,20 +818,20 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
/*3、如果是指定美甲师、判断美甲师是否仍然可用*/
//构造路径
//
List<TreeProgram> treeProgramList = new ArrayList<>();
//
TreeProgram treeProgram = new TreeProgram();
//
List<ScheduleServe> scheduleServeList = scheduleManage.getListScheduleServer()
//
.stream()
//
.filter(scheduleServe -> scheduleServe.getServeId() == null)
//
.collect(Collectors.toList());
//
//
//方案树
//
TreeProgram targetTree = idleTimeDTO.getTreeProgram();
//
//
boolean isPath = treeProgram.isSubTree(targetTree);
//
if (!isPath) {
//
throw new RRException("请重新选择美甲师");
//
}
List
<
TreeProgram
>
treeProgramList
=
new
ArrayList
<>();
TreeProgram
treeProgram
=
new
TreeProgram
();
List
<
ScheduleServe
>
scheduleServeList
=
scheduleManage
.
getListScheduleServer
()
.
stream
()
.
filter
(
scheduleServe
->
scheduleServe
.
getServeId
()
==
null
)
.
collect
(
Collectors
.
toList
());
//方案树
TreeProgram
targetTree
=
idleTimeDTO
.
getTreeProgram
();
boolean
isPath
=
treeProgram
.
isSubTree
(
targetTree
);
if
(!
isPath
)
{
throw
new
RRException
(
"请重新选择美甲师"
);
}
}
}
...
...
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