Commit 96716f27 by huluobin

update

parent 7fe1550d
...@@ -1239,6 +1239,12 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -1239,6 +1239,12 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
scheduleServeCommand.setTechnicianIds(mainScheduleServeCommand.getTechnicianIds()); scheduleServeCommand.setTechnicianIds(mainScheduleServeCommand.getTechnicianIds());
scheduleServeCommand.setStartTime(mainScheduleServeCommand.getStartTime()); scheduleServeCommand.setStartTime(mainScheduleServeCommand.getStartTime());
scheduleServeCommand.setEndTime(mainScheduleServeCommand.getEndTime()); scheduleServeCommand.setEndTime(mainScheduleServeCommand.getEndTime());
//如果主服务应开单 并且更新 同步主服务的开始时间
ScheduleServe mainScheduleServe = scheduleServeMapper.selectById(mainScheduleServeCommand.getId());
if (mainScheduleServe != null && mainScheduleServe.getActualStartTime() != null) {
scheduleServeCommand.setActualStartTime(mainScheduleServe.getActualStartTime());
}
}); });
ScheduleManage scheduleManage = scheduleManageMapper.selectById(cmd.getId()); ScheduleManage scheduleManage = scheduleManageMapper.selectById(cmd.getId());
...@@ -1303,6 +1309,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -1303,6 +1309,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
LeisureDiscountConfig leisureDiscountConfig = leisureDiscountConfigMapper.selectById(scheduleServe.getLeisureDiscountConfigId()); LeisureDiscountConfig leisureDiscountConfig = leisureDiscountConfigMapper.selectById(scheduleServe.getLeisureDiscountConfigId());
scheduleServe.setDiscountRate(leisureDiscountConfig.getDiscountRate()); scheduleServe.setDiscountRate(leisureDiscountConfig.getDiscountRate());
} }
if (scheduleServeCommand.getActualStartTime() != null) {
scheduleServe.setActualStartTime(scheduleServeCommand.getActualStartTime());
}
//查询服务 //查询服务
BaseServe baseServe = baseServeMapper.selectById(scheduleServe.getServeId()); BaseServe baseServe = baseServeMapper.selectById(scheduleServe.getServeId());
//查询服务类型 //查询服务类型
......
...@@ -94,4 +94,7 @@ public class ScheduleServeCommand implements Serializable { ...@@ -94,4 +94,7 @@ public class ScheduleServeCommand implements Serializable {
@ApiModelProperty("自带款式Id") @ApiModelProperty("自带款式Id")
private Integer ownProduceId; private Integer ownProduceId;
@ApiModelProperty("服务实际开始时间")
private Date actualStartTime;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment