From 707b4da9ac191174864c95738d4b08b506154e02 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 三月 2025 15:41:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 5 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 77 +++++++++++++++++++++++++++++++++++---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 19 +++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java | 6 ++-
8 files changed, 93 insertions(+), 19 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index a27e759..d405af2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -75,13 +75,13 @@
visitsService.updateById(visits);
return ApiResponse.success(null);
}
- @ApiOperation("鎵嬪姩绛剧")
- @GetMapping("/visitCancel")
- @CloudRequiredPermission("business:visits:cancel")
- public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.visitCancel(visitId);
- return ApiResponse.success(null);
- }
+// @ApiOperation("鎵嬪姩绛剧")
+// @GetMapping("/visitCancel")
+// @CloudRequiredPermission("business:visits:cancel")
+// public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+// visitsService.visitCancel(visitId);
+// return ApiResponse.success(null);
+// }
/**
@@ -92,9 +92,10 @@
*/
@ApiOperation("鍙栨秷棰勭害")
@GetMapping("/visitsCancel")
- @CloudRequiredPermission("business:visits:cancel")
+// @CloudRequiredPermission("business:visits:cancel")
public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.visitsCancel(visitId);
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ visitsService.visitsCancel(visitId,loginUserInfo);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
index ac66d7d..a5f60f7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
@@ -5,6 +5,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -99,9 +100,10 @@
*/
@ApiOperation("鍙栨秷棰勭害")
@GetMapping("/visitsCancel")
- @CloudRequiredPermission("business:visits:cancel")
+// @CloudRequiredPermission("business:visits:cancel")
public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.visitsCancel(visitId);
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ visitsService.visitsCancel(visitId,loginUserInfo);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 3a15004..211ee60 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -381,6 +381,7 @@
}
return null;
}
+
/**
*杞︿綅鍙栨秷棰勭害
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index 2a75659..400dc1d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -83,6 +83,11 @@
@TableField(exist = false)
private List<Platform> platformList;
+ @ApiModelProperty(value = "杞﹁締绛惧埌寰俊閫氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ private String signInNoticeUsers;
+
+ @ApiModelProperty(value = "浣滀笟鏈畬鎴愬井淇￠�氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ private String unFinishNoticeUsers;
@ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
index 5f61ed6..b07700a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
@@ -145,7 +145,7 @@
* 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
* 2025骞�3鏈�25鏃�14:10:10
*/
- void visitsCancel(Integer visitId);
+ void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo);
void resetPassword(ResetPasswordDTO resetPasswordDTO);
void visitResend(Integer visitId);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
index 91f69a6..94f76ad 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
@@ -49,7 +49,6 @@
update.setIsdeleted(Constants.ONE);
update.setId(id);
visitReasonMapper.updateById(update);
-
}
@Override
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 91c61aa..7facd5e 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
@@ -13,6 +13,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.ParkReservationDelRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
@@ -1570,22 +1571,86 @@
.eq(Retention::getMemberId,visits.getMemberId()));
}
+ @Autowired
+ private VisitParkMapper visitParkMapper;
+
+
/**
* 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
* 2025骞�3鏈�25鏃�14:10:10
*/
@Override
- public void visitsCancel(Integer visitId){
+ public void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo){
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(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
+ if(!(Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getMemberId()) ||
+ Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getCreateMemberId()) ||
+ ( CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) &&
+ loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
}
- visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.invalid)
- .eq(Visits::getId,visitId));
+ UpdateWrapper<Visits> updateWrapper = new UpdateWrapper();
+ updateWrapper.lambda().set(Visits::getStatus,Constants.VisitStatus.cancel)
+ .set(Visits::getEditDate,DateUtil.getCurrDateTime())
+ .set(Visits::getEditor,loginUserInfo.getId())
+ .eq(Visits::getId,visitId);
+ //璁垮鎶ュ
+ if(Constants.equalsInteger(visits.getType(),Constants.TWO)){
+ 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(),"璁垮璁板綍鐘舵�侀敊璇紝鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass)
+ && Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
+ &&StringUtils.isNotBlank(visits.getHkId())){
+ //鍙栨秷鍋滆溅鍦洪绾�
+ List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
+ .eq(VisitPark::getCarCode,visits.getCarNos())
+ .eq(VisitPark::getObjType,Constants.ONE)
+ .eq(VisitPark::getHkStatus,Constants.ONE)
+ .isNotNull(VisitPark::getHkId)
+ .apply(" END_TIME > now() ")
+ .orderByDesc(VisitPark::getCreateDate)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(visitParkList)){
+ for (VisitPark visitPark:visitParkList) {
+ ParkReservationDelRequest param = new ParkReservationDelRequest();
+ param.setReserveOrderNo(visitPark.getHkId());
+ BaseResponse response = HKService.parkReservationDeletion(param);
+ if(response!=null
+ && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ visitPark.setHkStatus(Constants.THREE);
+ visitPark.setIsdeleted(Constants.ONE);
+ visitPark.setEditDate(new Date());
+ visitParkMapper.updateById(visitPark);
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
+ }
+ }
+ updateWrapper.lambda().set(Visits::getHkStatus,Constants.ZERO).set(Visits::getHkDate,DateUtil.getCurrDateTime());
+ }
+ }
+ }else{
+ //璁垮鐢宠
+ if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
+ || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass)|| Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
+ }
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)
+ && Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
+ &&StringUtils.isNotBlank(visits.getHkId())){
+ VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest();
+ request.setAppointRecordIds(new String[]{visits.getHkId()});
+ BaseResponse response = HKService.iccmCancelAppointment(request);
+ if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
+ }
+ updateWrapper.lambda().set(Visits::getHkStatus,Constants.ZERO).set(Visits::getHkDate,DateUtil.getCurrDateTime());
+ }
+ }
+ visitsMapper.update(null,updateWrapper);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 82fb1cc..c9d09d6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -151,6 +151,7 @@
List<PlatformJob> jobs = platformJobMapper.selectList (new MPJLambdaWrapper<PlatformJob>()
.select(PlatformJob::getTotalNum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getOrigin,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId,platformGroupId)
.apply("to_days(done_date) = to_days(now())")
.in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
--
Gitblit v1.9.3