From ac0dd084332a6fad4ff7dc15ed4f8984d611a91f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 三月 2025 15:39:52 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 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 87eb2ef..91c61aa 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
@@ -57,6 +57,7 @@
 import com.doumee.service.business.third.EmayService;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +75,7 @@
  * @date 2023/11/30 15:33
  */
 @Service
+@Slf4j
 public class VisitsServiceImpl implements VisitsService {
 
     @Autowired
@@ -1041,6 +1043,7 @@
             problemLog.setUserId(member.getId());
             problemLog.setPhone(member.getPhone());
             problemLog.setLogId(visits.getId());
+            problemLog.setCompanyName(visits.getCompanyName());
             problemLogMapper.updateById(problemLog);
         }
     }
@@ -1566,6 +1569,28 @@
                 .eq(Retention::getType,Constants.memberType.visitor)
                 .eq(Retention::getMemberId,visits.getMemberId()));
     }
+
+    /**
+     * 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
+     * 2025骞�3鏈�25鏃�14:10:10
+     */
+    @Override
+    public void  visitsCancel(Integer visitId){
+        Visits visits = visitsMapper.selectById(visitId);
+        if(Objects.isNull(visits)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
+        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass))){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
+        }
+        visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.invalid)
+                .eq(Visits::getId,visitId));
+    }
+
+
+
+
     @Override
     public  void visitResend(Integer visitId) {
         MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
@@ -1886,6 +1911,7 @@
     }
     @Override
     public void visitNoCheckCancel(){
+        log.info("===============寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�===========start=======");
         List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
                 .eq(Visits::getIsdeleted,Constants.ZERO)
                 .eq(Visits::getStatus,Constants.VisitStatus.waitCheck)
@@ -1897,7 +1923,7 @@
                 dealAutoCancelBiz(s,date);
              }
         }
-
+        log.info("===============寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�===========end=======");
     }
 
     @Transactional
@@ -1912,12 +1938,13 @@
                 new UpdateWrapper<Approve>().lambda()
                         .set(Approve::getEditDate,date)
                         .set(Approve::getStatus,Constants.approveStatus.cancel)
+                        .set(Approve::getStatusInfo,"绯荤粺宸插彇娑�")
+                        .set(Approve::getCheckInfo,"璁块棶鏃堕棿宸茶繃锛岀郴缁熻嚜鍔ㄥ彇娑�")
                         .eq(Approve::getIsdeleted,Constants.ZERO)
-                        .eq(Approve::getStatusInfo,"宸插彇娑�")
-                        .eq(Approve::getCheckInfo,"璁块棶鏃堕棿宸茶繃锛岀郴缁熻嚜鍔ㄥ彇娑�")
                         .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
                         .eq(Approve::getObjId,s.getId())
                         .eq(Approve::getObjType,s.getType()));
+        //鏇存柊寰呭姙娑堟伅鐘舵��
         noticesJoinMapper.update(null,
                 new UpdateWrapper<Notices>().lambda()
                         .set(Notices::getEditDate,date)
@@ -1931,6 +1958,4 @@
                         .eq(Notices::getObjType,Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
         );
     }
-
-
 }

--
Gitblit v1.9.3