|
@@ -290,12 +290,14 @@ public class VisitorMainService extends SuperService {
|
|
|
if (ObjectUtils.isEmpty(visitorMain)) {
|
|
if (ObjectUtils.isEmpty(visitorMain)) {
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
+ // 待来访 状态改为 已到访
|
|
|
if (visitorMain.getState() == VisitorState.WaitVisit) {
|
|
if (visitorMain.getState() == VisitorState.WaitVisit) {
|
|
|
visitorMain.setState(VisitorState.Visit);
|
|
visitorMain.setState(VisitorState.Visit);
|
|
|
visitorMain.setFirstVisitTime(System.currentTimeMillis());
|
|
visitorMain.setFirstVisitTime(System.currentTimeMillis());
|
|
|
- visitorMainDao.save(visitorMain);
|
|
|
|
|
- return visitorMain;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ visitorMain.setLastVisitTime(System.currentTimeMillis());
|
|
|
|
|
+ visitorMainDao.save(visitorMain);
|
|
|
|
|
+ return visitorMain;
|
|
|
}
|
|
}
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
@@ -327,14 +329,17 @@ public class VisitorMainService extends SuperService {
|
|
|
*/
|
|
*/
|
|
|
public ResultContent checkExpireInfo(VisitorMain visitorMain) {
|
|
public ResultContent checkExpireInfo(VisitorMain visitorMain) {
|
|
|
if (ObjectUtils.isNotEmpty(visitorMain)) {
|
|
if (ObjectUtils.isNotEmpty(visitorMain)) {
|
|
|
|
|
+ // 已审核 已过期
|
|
|
if (visitorMain.getReViewSuccess() != null && visitorMain.getReViewSuccess() && visitorMain.getEndTime() <= System.currentTimeMillis()) {
|
|
if (visitorMain.getReViewSuccess() != null && visitorMain.getReViewSuccess() && visitorMain.getEndTime() <= System.currentTimeMillis()) {
|
|
|
// 取消人脸
|
|
// 取消人脸
|
|
|
- com.github.microservice.auth.client.content.ResultContent resultContent = userFaceService.delete(
|
|
|
|
|
- visitorMain.getTempUserId(), visitorMain.getFaceFileId());
|
|
|
|
|
|
|
+ com.github.microservice.auth.client.content.ResultContent resultContent = userFaceService.delete(visitorMain.getTempUserId(), visitorMain.getFaceFileId());
|
|
|
if (resultContent.isSuccess()) {
|
|
if (resultContent.isSuccess()) {
|
|
|
visitorMain.setIsCancel(Boolean.TRUE);
|
|
visitorMain.setIsCancel(Boolean.TRUE);
|
|
|
visitorMain.setIsClearFace(Boolean.TRUE);
|
|
visitorMain.setIsClearFace(Boolean.TRUE);
|
|
|
-
|
|
|
|
|
|
|
+ // 如果未使用,,则把状态改为 已失效
|
|
|
|
|
+ if (visitorMain.getState() == VisitorState.WaitVisit) {
|
|
|
|
|
+ visitorMain.setState(VisitorState.Cancel);
|
|
|
|
|
+ }
|
|
|
visitorMainDao.save(visitorMain);
|
|
visitorMainDao.save(visitorMain);
|
|
|
return ResultContent.buildSuccess();
|
|
return ResultContent.buildSuccess();
|
|
|
} else {
|
|
} else {
|