|
|
@@ -197,8 +197,6 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> { |
|
|
|
return res; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void checkLocalOrder(OrderInitRequest request) throws ServiceHandleException { |
|
|
|
IssueOrderinfo order = orderInfoRepo.findNormalByVehicleId(request.getVehiclePlate() + "_" + request.getVehiclePlateColor()); |
|
|
|
if (order != null) { |
|
|
@@ -250,11 +248,13 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> { |
|
|
|
if (staff == null) { |
|
|
|
throw newBusinessException("此业务员不存在"); |
|
|
|
} |
|
|
|
if (!req.getAgentId().equals(staff.getAgencyId())){ |
|
|
|
throw newBusinessException("当前渠道与业务员所属渠道不一致"); |
|
|
|
} |
|
|
|
if (!req.getChannelId().equals(staff.getServiceHallId())){ |
|
|
|
throw newBusinessException("当前网点与业务员所属网点不一致"); |
|
|
|
if (!MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())) { |
|
|
|
if (!req.getAgentId().equals(staff.getAgencyId())){ |
|
|
|
throw newBusinessException("当前渠道与业务员所属渠道不一致"); |
|
|
|
} |
|
|
|
if (!req.getChannelId().equals(staff.getServiceHallId())){ |
|
|
|
throw newBusinessException("当前网点与业务员所属网点不一致"); |
|
|
|
} |
|
|
|
} |
|
|
|
return staff; |
|
|
|
} |