update

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

@@ -749,7 +749,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             if (scheduleServeCommand.getMainServeId() == null) {
                 BaseServe baseServe = baseServeMapper.selectById(scheduleServeCommand.getServeId());
                 List<ScheduleServe> typeConflictScheduleServe = scheduleServeMapper.selectConflictType(
-                        scheduleManageDTO.getScheduledUser(), scheduleManageDTO.getArriveTime(), baseServe.getType());
+                        scheduleServeCommand.getId(),
+                        scheduleManageDTO.getScheduledUser(),
+                        scheduleManageDTO.getArriveTime(),
+                        baseServe.getType());
                 if (ListUtil.isNotEmpty(typeConflictScheduleServe)) {
                     throw new RRException("同类型服务一天只能预约一次");
                 }

src/main/java/com/gogirl/infrastructure/interceptor/AuthHandlerInterceptor.java

+package com.gogirl.infrastructure.interceptor;
+
+import com.gogirl.application.xcx.GogirlTokenService;
+import com.gogirl.domain.user.customer.Customer;
+import com.gogirl.domain.xcx.GogirlToken;
+import com.gogirl.infrastructure.common.exception.RRException;
+import com.gogirl.infrastructure.common.util.StringUtils;
+import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
+import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@AllArgsConstructor
+@Component
+@Slf4j
+public class AuthHandlerInterceptor implements HandlerInterceptor {
+
+    private final GogirlTokenService gogirlTokenService;
+    private final StoreManageMapper storeManageMapper;
+    private final CustomerMapper customerMapper;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+        String token = request.getHeader("token");
+
+        if (request.getRequestURI().contains("no_")) {
+            return true;
+        }
+
+        String sourceFrom = request.getHeader("sourceFrom");
+        if (sourceFrom == null) {
+            return true;
+        }
+        if (sourceFrom.equals("customer")) {
+            GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
+            if (gogirlToken == null) {
+                throw new RRException(2000, "token失效，请重新登陆");
+            } else {
+                Customer customer = customerMapper.selectById(gogirlToken.getCustomerId());
+                if (customer != null && StringUtils.isEmpty(customer.getPhone())) {
+                    throw new RRException(1001, "请授权手机号码");
+                }
+            }
+        }
+        return true;
+    }
+}

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

@@ -13,7 +13,8 @@ import java.util.List;
 
 public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
 
-    List<ScheduleServe> selectConflictType(@Param("scheduledUser") Integer scheduledUser,
+    List<ScheduleServe> selectConflictType(@Param("scheduleServeId") Integer scheduleServeId,
+                                           @Param("scheduledUser") Integer scheduledUser,
                                            @Param("days") Date days,
                                            @Param("serveTypeName") String serveTypeName);
 

src/main/java/com/gogirl/shared/order/serve/command/ordermanage/RecordOrderServeDataCommand.java

-package com.gogirl.shared.order.serve.command.ordermanage;
-
-public class RecordOrderServeDataCommand {
-}

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

@@ -13,6 +13,7 @@
           and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
           and t1.main_serve_id is null
           and t2.`status` = 1
+          and t1.id != #{scheduleServeId}
     </select>
 
 </mapper>