Commit 657e7a1c by huluobin

pre

parent 8ae074f9
...@@ -33,11 +33,15 @@ public class RRExceptionHandler { ...@@ -33,11 +33,15 @@ public class RRExceptionHandler {
result.setSuccess(false); result.setSuccess(false);
result.setCode(e.getCode()); result.setCode(e.getCode());
result.setMessage(e.getMessage()); result.setMessage(e.getMessage());
if (e.getCode() != 2000) { if (e.getCode() != 2000 && e.getCode() != 2001 && e.getCode() != 2005) {
log.error("Params : {}", getParamString(request.getParameterMap()) + "\n"); log.error("Params : {}", getParamString(request.getParameterMap()) + "\n");
log.error("URI : {}", request.getRequestURI() + "\n"); log.error("URI : {}", request.getRequestURI() + "\n");
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} else {
log.error("Params : {}", getParamString(request.getParameterMap()) + "\n");
log.error("URI : {}", request.getRequestURI() + "\n");
log.error(e.getMessage());
} }
return result; return result;
} }
......
...@@ -666,9 +666,14 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -666,9 +666,14 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
@Override @Override
public void checkBeforeTakeOrders(Integer technicianId, Integer scheduleId) { public void checkBeforeTakeOrders(Integer technicianId, Integer scheduleId) {
List<ScheduleServe> scheduleServeList = scheduleServeService.list(new LambdaQueryWrapper<ScheduleServe>().eq(ScheduleServe::getSchId, scheduleId)); List<ScheduleServe> scheduleServeList = scheduleServeService.list(
new LambdaQueryWrapper<ScheduleServe>().eq(ScheduleServe::getSchId, scheduleId));
scheduleServeList.forEach(scheduleServe -> { scheduleServeList.forEach(scheduleServe -> {
List<ScheduleServe> conflictScheduleServeList = scheduleManageMapper.checkConflict(scheduleServe.getStartTime(), scheduleServe.getEndTime(), technicianId, scheduleId); List<ScheduleServe> conflictScheduleServeList = scheduleManageMapper.checkConflict(
scheduleServe.getStartTime(),
scheduleServe.getEndTime(),
technicianId,
scheduleId);
if (ListUtil.isNotEmpty(conflictScheduleServeList)) { if (ListUtil.isNotEmpty(conflictScheduleServeList)) {
throw new RRException(2003, "冲突"); throw new RRException(2003, "冲突");
} }
......
...@@ -30,7 +30,7 @@ public class CustomerMessageServiceImpl extends ServiceImpl<CustomerMessageMappe ...@@ -30,7 +30,7 @@ public class CustomerMessageServiceImpl extends ServiceImpl<CustomerMessageMappe
public Page<CustomerMessage> queryPageMessage(CustomerMessagePageQuery qry) { public Page<CustomerMessage> queryPageMessage(CustomerMessagePageQuery qry) {
//线程变量当前当前用户id //线程变量当前当前用户id
if (SessionUtils.getCustomerToken() == null) { if (SessionUtils.getCustomerToken() == null) {
throw new RRException(2001, "token失效"); throw new RRException(2000, "token失效");
} }
qry.setCustomerId(SessionUtils.getCustomerToken().getCustomerId()); qry.setCustomerId(SessionUtils.getCustomerToken().getCustomerId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment