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
f15e4cd2
Commit
f15e4cd2
authored
Apr 14, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
睫毛卸除、卸甲、延长,跳色(辅助服务)与主服务一起时,不需要单独开单,主服务开单即可。 店员端若要修改主服务的话,系统将辅助服务一并清空,美甲师选服务的时候跟用户端一样,弹出是否需要辅助服务
parent
56850520
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+7
-5
ScheduleServeMapper.java
...nfrastructure/mapper/order/serve/ScheduleServeMapper.java
+9
-0
ScheduleServeMapper.xml
src/main/resources/mapper/order/ScheduleServeMapper.xml
+6
-0
No files found.
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
f15e4cd2
...
@@ -600,12 +600,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -600,12 +600,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
@Override
@Override
public
void
updateScheduledServeStatus
(
Integer
scheduleServeId
,
Integer
status
,
Integer
forceLeisureConfig
)
{
public
void
updateScheduledServeStatus
(
Integer
scheduleServeId
,
Integer
status
,
Integer
forceLeisureConfig
)
{
ScheduleServe
scheduleServe
=
scheduleServeMapper
.
selectById
(
scheduleServeId
);
ScheduleServe
scheduleServe
=
scheduleServeMapper
.
selectById
(
scheduleServeId
);
if
(
scheduleServe
.
getMainServeId
()
!=
null
)
{
throw
new
RRException
(
"不能对辅助服务开单"
);
}
//所有需要更新的服务
//所有需要更新的服务
List
<
ScheduleServe
>
updateList
=
scheduleServeMapper
.
selectList
(
new
LambdaQueryWrapper
<
ScheduleServe
>()
List
<
ScheduleServe
>
updateList
=
scheduleServeMapper
.
selectUpdateStatusList
(
scheduleServe
.
getSchId
(),
scheduleServe
.
getServeId
());
.
eq
(
ScheduleServe:
:
getSchId
,
scheduleServe
.
getSchId
())
.
eq
(
ScheduleServe:
:
getServeId
,
scheduleServe
.
getServeId
()));
//预约
ScheduleManage
scheduleManage
=
scheduleManageMapper
.
selectById
(
scheduleServe
.
getSchId
());
ScheduleManage
scheduleManage
=
scheduleManageMapper
.
selectById
(
scheduleServe
.
getSchId
());
//更新某一个服务状态已完成
//更新某一个服务状态已完成
...
@@ -837,7 +838,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -837,7 +838,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
}
}
/**ScheduleManageServiceImpl
/**
* ScheduleManageServiceImpl
* 通过ScheduleServe构建TreeProgram
* 通过ScheduleServe构建TreeProgram
*
*
* @param scheduleServe
* @param scheduleServe
...
...
src/main/java/com/gogirl/infrastructure/mapper/order/serve/ScheduleServeMapper.java
View file @
f15e4cd2
...
@@ -13,4 +13,13 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
...
@@ -13,4 +13,13 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
@Param
(
"days"
)
Date
days
,
@Param
(
"days"
)
Date
days
,
@Param
(
"schTypeId"
)
Integer
schTypeId
,
@Param
(
"schTypeId"
)
Integer
schTypeId
,
@Param
(
"serveId"
)
Integer
serveId
);
@Param
(
"serveId"
)
Integer
serveId
);
/**
* 更新服务状态需要更新的预约服务列表
*
* @param schId
* @param serveId
* @return
*/
List
<
ScheduleServe
>
selectUpdateStatusList
(
@Param
(
"schId"
)
Integer
schId
,
@Param
(
"serveId"
)
Integer
serveId
);
}
}
src/main/resources/mapper/order/ScheduleServeMapper.xml
View file @
f15e4cd2
...
@@ -17,5 +17,11 @@
...
@@ -17,5 +17,11 @@
and t1.serve_id != #{serveId}
and t1.serve_id != #{serveId}
</if>
</if>
</select>
</select>
<select
id=
"selectUpdateStatusList"
resultType=
"com.gogirl.domain.order.serve.ScheduleServe"
>
select *
from scheduled_serve
where sch_id = #{schId}
and (serve_id = #{serveId} or main_serve_id = #{serveId})
</select>
</mapper>
</mapper>
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