预约修改

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

@@ -758,7 +758,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         scheduleManageDTO.getScheduledUser(),
                         scheduleManageDTO.getArriveTime(),
                         baseServe.getSchTypeId(),
-                        scheduleServeCommand.getId());
+                        scheduleServeCommand.getServeId());
                 if (ListUtil.isNotEmpty(typeConflictScheduleServe)) {
                     throw new RRException("同类型服务一天只能预约一次");
                 }

src/main/java/com/gogirl/infrastructure/mapper/order/serve/ScheduleServeMapper.java

@@ -12,5 +12,5 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
     List<ScheduleServe> selectConflictType(@Param("scheduledUser") Integer scheduledUser,
                                            @Param("days") Date days,
                                            @Param("schTypeId") Integer schTypeId,
-                                           @Param("scheduleServeId") Integer scheduleServeId);
+                                           @Param("serveId") Integer serveId);
 }

src/main/resources/mapper/order/ScheduleServeMapper.xml

@@ -13,8 +13,8 @@
         and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
         and t1.main_serve_id is null
         and t2.`status` = 1
-        <if test="scheduleServeId!=null">
-            and t1.id != #{scheduleServeId}
+        <if test="serveId!=null">
+            and t1.serve_id != #{serveId}
         </if>
     </select>