Merge branch 'master' into 3.7

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -1239,6 +1239,12 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServeCommand.setTechnicianIds(mainScheduleServeCommand.getTechnicianIds());
                     scheduleServeCommand.setStartTime(mainScheduleServeCommand.getStartTime());
                     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());
@@ -1303,6 +1309,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         LeisureDiscountConfig leisureDiscountConfig = leisureDiscountConfigMapper.selectById(scheduleServe.getLeisureDiscountConfigId());
                         scheduleServe.setDiscountRate(leisureDiscountConfig.getDiscountRate());
                     }
+                    if (scheduleServeCommand.getActualStartTime() != null) {
+                        scheduleServe.setActualStartTime(scheduleServeCommand.getActualStartTime());
+                    }
                     //查询服务
                     BaseServe baseServe = baseServeMapper.selectById(scheduleServe.getServeId());
                     //查询服务类型
@@ -1320,6 +1329,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
                     scheduleServe.setServeNumber(1);
 
+
                     scheduleServe.setIsOwnProduce(baseServe.getIsOwnProduce());
 
                     //如果是预约款式

src/main/java/com/gogirl/shared/order/ScheduleServeCommand.java

@@ -94,4 +94,7 @@ public class ScheduleServeCommand implements Serializable {
 
     @ApiModelProperty("自带款式Id")
     private Integer ownProduceId;
+
+    @ApiModelProperty("服务实际开始时间")
+    private Date actualStartTime;
 }