From 4167298accee956c10ed1b5e3d6ce909cad38edd Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 02 四月 2024 16:37:26 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index e340737..cd7243c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
@@ -58,6 +59,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
@@ -111,7 +113,6 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void createFKForErp(ErpVisitDTO erpVisitDTO){
- try {
if (Objects.isNull(erpVisitDTO)
|| StringUtils.isBlank(erpVisitDTO.getName())
|| StringUtils.isBlank(erpVisitDTO.getPhone())
@@ -164,11 +165,6 @@
visits.setWithUserList(visitsList);
}
this.createFk(visits,true);
- }catch (BusinessException e){
- throw e;
- }finally {
- saveInterfaceLog(erpVisitDTO,"/visitBiz/resource/createVisit",null,Constants.ZERO);
- }
}
@Transactional(propagation = Propagation.NOT_SUPPORTED)
@@ -589,6 +585,15 @@
if(visits.getEndtime().getTime() <= visits.getStarttime().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂达紒");//
}
+ if(visits.getSourceType().equals(Constants.ZERO)){
+ String code = systemDictDataBiz.queryByCode(Constants.VISIT_CONFIG,Constants.VALIDATE_VISIT).getCode();
+ if(StringUtils.isNotBlank(code)&&!StringUtils.equals(code,"0")){
+ Integer betweenDays = Math.toIntExact(cn.hutool.core.date.DateUtil.between(visits.getEndtime(), visits.getStarttime(), DateUnit.DAY));
+ if(Integer.compare(betweenDays,Integer.valueOf(code))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害鎬诲ぉ鏁颁笉鑳借秴杩嘯"+code+"澶锛�");
+ }
+ }
+ }
}
private void isValidWithVisitParam(Visits visits, List<Member> addList, List<Member> updateList) {
if( StringUtils.isBlank( visits.getName())
@@ -853,6 +858,8 @@
if (visitsMapper.selectCount(new QueryWrapper<Visits>().lambda()
.notIn(Visits::getStatus,Constants.VisitStatus.cancel,Constants.VisitStatus.noPass,Constants.VisitStatus.xfFail,Constants.VisitStatus.signout,Constants.VisitStatus.invalid)
.eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno))
+ .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())
+ .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)))
.and(ms -> ms.apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' ")
.or().apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
)) > Constants.ZERO) {
@@ -1262,5 +1269,25 @@
.eq(Retention::getType,Constants.memberType.visitor)
.eq(Retention::getMemberId,visits.getMemberId()));
}
+ @Override
+ public void visitCancel(Integer visitId){
+ Visits visits = visitsMapper.selectById(visitId);
+ if(Objects.isNull(visits)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!visits.getStatus().equals(Constants.VisitStatus.xfSuccess)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
+ }
+ VisitAppointmentOutRequest request = new VisitAppointmentOutRequest();
+ request.setOrderId(visits.getHkId());
+ //璋冪敤娴峰悍寮哄埗绛剧
+ BaseResponse response = HKService.outVisitAppiontment(request);
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout)
+ .eq(Visits::getId,visitId));
+ //浜у嚭鍦ㄥ満浜哄憳淇℃伅
+ retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+ .eq(Retention::getType,Constants.memberType.visitor)
+ .eq(Retention::getMemberId,visits.getMemberId()));
+ }
}
--
Gitblit v1.9.3