From 702a936a613cc16d1aeb0b2326cd795e0e8ecefd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 五月 2025 14:41:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 5 ++++-
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/VisitorWebController.java | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index e99d61c..23d0ac9 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -118,11 +118,11 @@
*/
@ApiOperation("鍙栨秷棰勭害")
@GetMapping("/visitsSelfCancel")
- public ApiResponse visitsSelfCancel(@RequestParam Integer visitId,@RequestParam Integer memberId){
+ public ApiResponse visitsSelfCancel(@RequestParam Integer visitId,Integer memberId,@RequestParam String openid){
if(Objects.isNull(memberId)){
memberId = Constants.ZERO;
}
- visitsService.visitsSelfCancel(visitId,memberId);
+ visitsService.visitsSelfCancel(visitId,memberId,openid);
return ApiResponse.success(null);
}
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 73737b9..3cdcc8c 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
@@ -146,7 +146,7 @@
* 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
* 2025骞�3鏈�25鏃�14:10:10
*/
- void visitsSelfCancel(Integer visitId,Integer memberId);
+ void visitsSelfCancel(Integer visitId,Integer memberId,String openid);
void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo);
void resetPassword(ResetPasswordDTO resetPasswordDTO);
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 cc46309..4490ed7 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
@@ -1598,7 +1598,7 @@
@Override
- public void visitsSelfCancel(Integer visitId,Integer memberId){
+ public void visitsSelfCancel(Integer visitId,Integer memberId,String openid){
Visits visits = visitsMapper.selectById(visitId);
if(Objects.isNull(visits)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -1606,6 +1606,9 @@
if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
}
+ if(!StringUtils.equals(openid,visits.getOpenid())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
+ }
this.visitsCancelBiz(visits);
}
--
Gitblit v1.9.3