Merge branch 'master' into branch

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

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

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

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

@@ -12,7 +12,7 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
     List<ScheduleServe> selectConflictType(@Param("scheduledUser") Integer scheduledUser,
                                            @Param("days") Date days,
                                            @Param("schTypeId") Integer schTypeId,
-                                           @Param("serveId") Integer serveId);
+                                           @Param("scheduleId") Integer scheduleId);
 
     /**
      * 更新服务状态需要更新的预约服务列表
@@ -22,4 +22,6 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
      * @return
      */
     List<ScheduleServe> selectUpdateStatusList(@Param("schId") Integer schId, @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="serveId!=null">
-            and t1.serve_id != #{serveId}
+        <if test="scheduleId!=null">
+            and t2.id != #{scheduleId}
         </if>
     </select>
     <select id="selectUpdateStatusList" resultType="com.gogirl.domain.order.serve.ScheduleServe">