Merge remote-tracking branch 'origin/master'

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

@@ -721,6 +721,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             String message = MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, userDto.getPhone());
             return R.failed(message);
         }
+
         saveUser(userDto);
         return R.ok(true);
     }

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 {

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)) {