From c1f31aff0a5737b12b2cb6d046056cc61252e96e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 3 Jul 2025 19:51:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:admin=E6=B3=A8=E5=86=8C=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/admin/service/impl/SysUserServiceImpl.java    | 4 ++++
 .../admin/service/impl/SysUserTransactionServiceImpl.java | 8 +++++---
 .../impl/rule/WalletRuleTransactionServiceImpl.java       | 4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
index d9ff9f753..46c8ef2e1 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
@@ -721,6 +721,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             String message = MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, userDto.getPhone());
             return R.failed(message);
         }
+
+        // 设置权限
+        List<SysRole> defaultRoles = sysRoleService.findRolesByCodes(List.of(CommonRoleConstant.DEFAULT_USER, CommonRoleConstant.AUTO_CREATE_WALLET));
+        userDto.setRole(defaultRoles.stream().map(SysRole::getRoleId).toList());
         saveUser(userDto);
         return R.ok(true);
     }
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 d05106f8a..3fb9c2beb 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
@@ -243,7 +243,7 @@ public class SysUserTransactionServiceImpl extends ServiceImpl<SysUserTransactio
      */
     @Override
     public void walletTransationCallback(String params) {
-        Long days = 0L;
+        Long days = 30L;
         LocalDate now = LocalDate.now();
         LocalDate localDate = now.minusDays(days);
         String dateStr = LocalDateTimeUtil.format(localDate, DatePattern.NORM_DATE_PATTERN);
@@ -254,8 +254,10 @@ public class SysUserTransactionServiceImpl extends ServiceImpl<SysUserTransactio
         }
         // 用户转账逻辑,把饭卡钱包的钱自动转入到消费钱包
 
-        // 离职人员部门id
-        List<String> leaveDeptIds = List.of(ParamResolver.getStr("USER_TRANSACTION_LEAVE"), ParamResolver.getStr("USER_TRANSACTION_TRANSFER"));
+        // 离职退休人员部门id
+        // List<String> leaveDeptIds = List.of(ParamResolver.getStr("USER_TRANSACTION_LEAVE"), ParamResolver.getStr("USER_TRANSACTION_TRANSFER"));
+        // 离职用户
+        List<String> leaveDeptIds = List.of(ParamResolver.getStr("USER_TRANSACTION_LEAVE"));
         List<SysUserTransactionEntity> updateList = new ArrayList<>();
         for (SysUserTransactionEntity v : list) {
             try {
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java
index 0d22c7d67..4f11eeea3 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java
@@ -75,6 +75,10 @@ public class WalletRuleTransactionServiceImpl extends ServiceImpl<WalletRuleTran
                 log.error(msg);
                 throw new RuntimeException(msg);
             }
+            // 如果饭卡钱包金额为0直接返回成功
+            if (ObjectUtil.equals(eatWallet.getBalance(), 0)) {
+                return true;
+            }
             // 消费钱包
             WalletManageEntity payWallet = walletManageService.getWallet(userId, WalletTypeEnum.PAY);
             if (ObjectUtil.isEmpty(payWallet)) {