From 221c873ee48ed5f44680578d32b0bbf19fd9e4c1 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期六, 18 十月 2025 15:23:59 +0800
Subject: [PATCH] 钥匙柜

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |   28 ++++++----------------------
 1 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index f4b8bb7..4ad2587 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -239,7 +239,7 @@
         //妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
         ProblemLog problemLog = isValidProblemLog(visits,source);
         //鑾峰彇鐢宠鐨勬捣搴疯闂棬绂佺粍淇℃伅
-        getHkDeviceRoles(visits,isERP);
+//        getHkDeviceRoles(visits,isERP);
         //妫�楠屾嫓璁夸汉鏄惁鍚堟硶
         Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
         if(StringUtils.isNotBlank(visits.getIdcardNo()) && Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())
@@ -258,24 +258,6 @@
         //鍒濆鍖栬瀹俊鎭�
         initVisitInfo(visits,date);
 
-//        if(StringUtils.isNotBlank(visits.getFaceImg())&&(Constants.equalsInteger(visits.getType(),Constants.ZERO)|| Constants.equalsInteger(visits.getType(),Constants.TWO))){
-//            //浜鸿劯璇勫垎
-//            FacePictureCheckRequest param = new FacePictureCheckRequest();
-//            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
-//                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
-//            param.setFacePicUrl(prefixUrl + visits.getFaceImg());
-//            BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
-//            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
-//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
-//            }
-//            FacePictureCheckResponse facePictureCheckResponse = response.getData();
-//            if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
-//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
-//            }
-//            if(!facePictureCheckResponse.getCheckResult()){
-//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
-//            }
-//        }
         visits.setSendTimeOutNotice(Constants.ZERO);
         visitsMapper.insert(visits);
 
@@ -1902,6 +1884,7 @@
 
                     List<String> memberIds  = inoutRecordList.stream().filter(i->
                                     Objects.isNull(i.getCarCode())
+                                            && Constants.equalsInteger(i.getMemberType(),Constants.ONE)
                                             && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
                                             && Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                             )
@@ -1917,6 +1900,8 @@
 
 
                 visitVO.setName(days);
+                weekVisitList.add(visitVO);
+
                 InterestedListVO carVO = new InterestedListVO();
                 carVO.setNum(Constants.ZERO);
                 carVO.setName(days);
@@ -1928,7 +1913,7 @@
                     List<String> carCodeList  = inoutRecordList.stream().filter(i->
                                     Objects.nonNull(i.getCarCode())
                                             && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
-                                            && Objects.isNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
+                                            &&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                             )
                             .map(i->i.getCarCode())
                             .collect(Collectors.toList());
@@ -1937,9 +1922,8 @@
                     }
                 }
                 if(Objects.isNull(carVO.getNum())){
-                    visitVO.setNum(Constants.ZERO);
+                    carVO.setNum(Constants.ZERO);
                 }
-                weekVisitList.add(visitVO);
                 weekCarList.add(carVO);
             }
             pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );

--
Gitblit v1.9.3