From ab4841972b07a438893cce67ae597527f75ef648 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 13 六月 2024 09:16:23 +0800
Subject: [PATCH] 最新版本
---
/dev/null | 7 -------
server/system_timer/src/main/resources/application.yml | 2 --
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 12 ++++++++++++
server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
index 7013a1d..5052bdf 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
@@ -23,7 +23,7 @@
# data-id: com.doumee.meeting.admin
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit
+ namespace: dmvisit_test
username: nacos
password: nacos
# 瀹夊叏閰嶇疆
diff --git a/server/meeting/src/main/java/com/doumee/Main.java b/server/meeting/src/main/java/com/doumee/Main.java
deleted file mode 100644
index ada0d0d..0000000
--- a/server/meeting/src/main/java/com/doumee/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.doumee;
-
-public class Main {
- public static void main(String[] args) {
- System.out.println("Hello world!");
- }
-}
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/application.yml b/server/system_timer/src/main/resources/application.yml
index b08486e..aac855a 100644
--- a/server/system_timer/src/main/resources/application.yml
+++ b/server/system_timer/src/main/resources/application.yml
@@ -9,8 +9,6 @@
spring:
application:
name: systemTimer
- profiles:
- active: dev
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 2a2dd80..9deef32 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -544,6 +544,7 @@
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
Member member=new Member();
member.setId(id);
@@ -553,6 +554,17 @@
member.setHkStatus(Constants.ZERO);
member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
+
+ //鍒櫎绯荤粺鐧婚檰璐︽埛
+ SystemUser user = new SystemUser();
+ user.setMemberId(id);
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getMemberId,id)
+ .set(SystemUser::getDeleted,Boolean.TRUE)
+ .set(SystemUser::getUpdateUser,member.getEditor())
+ .set(SystemUser::getUpdateTime,member.getEditDate())
+ );
+
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
}
--
Gitblit v1.9.3