From c51933105493270034d8767433e34c45e3ca09f8 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 9 May 2025 09:48:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E8=B0=83=E5=B2=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysUserTransactionServiceImpl.java    | 10 ++++++++++
 .../pjcloud/wallet/api/feign/RemoteWalletService.java  |  1 +
 .../wallet/controller/WalletManageController.java      |  1 +
 3 files changed, 12 insertions(+)

diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java
index 6e35d0b11..e7a28ac17 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java
@@ -36,10 +36,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 人员调动表
@@ -56,6 +59,7 @@ public class SysUserTransactionServiceImpl extends ServiceImpl<SysUserTransactio
 
     private final RemoteFlowEngineService remoteFlowEngineService;
     private final RemoteWalletThirdZyService remoteWalletThirdZyService;
+    private final RemoteWalletService remoteWalletService;
 
     private final FlowUtil flowUtil;
 
@@ -207,6 +211,12 @@ public class SysUserTransactionServiceImpl extends ServiceImpl<SysUserTransactio
                     // 通知正元
                     remoteWalletThirdZyService.syncUserById(detail.getUserId());
                 }
+                // 通知钱包进行相关修改
+                RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+                CompletableFuture.runAsync(() -> {
+                    RequestContextHolder.setRequestAttributes(requestAttributes);
+                    remoteWalletService.userChange(detail.getUserId(), Boolean.FALSE);
+                });
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java
index e99f9c11e..efa1c8c18 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java
@@ -48,6 +48,7 @@ public interface RemoteWalletService {
     @GetMapping("/wallet-manage/del-wallet")
     R<Boolean> delWallet(@RequestParam("userIds") List<Long> userIds);
 
+    @NoToken
     @GetMapping("/wallet-manage/user-change")
     R<Boolean> userChange(@RequestParam Long userId, @RequestParam Boolean isDel);
 
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java
index 551e5035f..757b02e1b 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java
@@ -121,6 +121,7 @@ public class WalletManageController {
         return R.ok(walletManageService.delWalletByUserIds(userIds));
     }
 
+    @Inner
     @GetMapping("/user-change")
     public R<Boolean> userChange(@RequestParam Long userId, @RequestParam Boolean isDel) {
         walletManageService.userChange(userId, isDel);