Merge branch '3.8' into 3.9

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

@@ -66,7 +66,7 @@ public class PayServiceImpl implements PayService {
             throw new RRException("订单状态异常");
         }
 
-        this.checkCustomerBalance(currentCustomerId, orderId);
+//        this.checkCustomerBalance(currentCustomerId, orderId);
 
 
         /*1、扣除余额*/

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

@@ -123,7 +123,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         }
 
         List<StoreTechnicianPeriod> storeTechnicianPeriodList = new ArrayList<>();
-
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         //一天开始的时间
@@ -648,6 +647,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         technicianPushService.scheduledMsg(scheduleManage.getId());
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateSchedule(SubmitScheduleCommand cmd) {
 
@@ -1026,11 +1026,15 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServeCommand.setStartTime(mainScheduleServeCommand.getStartTime());
                     scheduleServeCommand.setEndTime(mainScheduleServeCommand.getEndTime());
 
-                    //如果主服务应开单 并且更新 同步主服务的开始时间
+                    //如果主服务已经开单 并且更新 同步主服务的开始时间
                     ScheduleServe mainScheduleServe = scheduleServeMapper.selectById(mainScheduleServeCommand.getId());
                     if (mainScheduleServe != null && mainScheduleServe.getActualStartTime() != null) {
                         scheduleServeCommand.setActualStartTime(mainScheduleServe.getActualStartTime());
                     }
+                    //如果主服务已经结单 不能再添加辅助服务
+                    if (mainScheduleServe != null && mainScheduleServe.getStatus() == 3) {
+                        throw new RRException("不能再为已完成的服务添加辅助服务")
+                    }
                 });
 
         ScheduleManage scheduleManage = scheduleManageMapper.selectById(cmd.getId());