From 3f0cd01c412afe306f6cc1dd9557893affc671c0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 24 Mar 2025 20:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=AD=A3=E5=85=83=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E5=88=A4=E6=96=AD=EF=BC=8C=E6=9C=89=E9=92=B1=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E7=9A=84=E6=89=8D=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/constant/CommonRoleConstant.java      |  1 +
 .../wallet/service/impl/WalletManageServiceImpl.java  |  3 ++-
 .../service/impl/thrid/WalletThirdZyServiceImpl.java  | 11 +++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java
index 0fdb41a12..8f7ea0f25 100644
--- a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java
+++ b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java
@@ -6,6 +6,7 @@ public interface CommonRoleConstant {
 
     String DEPT_ADMIN = "DEPT_ADMIN";
 
+    // 自动创建钱包
     String AUTO_CREATE_WALLET = "WALLET_AUTO_CREATE";
 
 }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
index 8026aa505..9fe16db13 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
@@ -22,6 +22,7 @@ import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.admin.api.utils.DataUtil;
 import com.bsd.pjcloud.common.core.constant.CacheConstants;
+import com.bsd.pjcloud.common.core.constant.CommonRoleConstant;
 import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
@@ -102,7 +103,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
         UserInfo user = null;
         if (checkPermission) {
             user = userService.getByUserId(userId).getData();
-            String autoWalletRoleCode = ParamResolver.getStr("WALLET_AUTO_CREATE");
+            String autoWalletRoleCode = ParamResolver.getStr(CommonRoleConstant.AUTO_CREATE_WALLET);
             if (ObjectUtil.isEmpty(autoWalletRoleCode)) {
                 log.info("|{}|创建用户电子钱包失败,userId:{},WALLET_AUTO_CREATE参数未配置", TAG, userId);
                 return;
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java
index fe4797bef..da874185a 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java
@@ -14,6 +14,7 @@ import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.feign.RemoteRoleService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.admin.api.vo.UserVO;
+import com.bsd.pjcloud.common.core.constant.CommonRoleConstant;
 import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdZyService;
 import com.bsd.pjcloud.thirdparty.dto.zy.mer.ZyMerSyncAccClassInfoDto;
@@ -27,11 +28,9 @@ import com.bsd.pjcloud.thirdparty.vo.zy.mer.ZyMerSyncEnterpriseInfoVo;
 import com.bsd.pjcloud.wallet.api.constant.WalleCardStatusEnum;
 import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
-import com.bsd.pjcloud.wallet.api.dto.WalletManageDto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
-import com.bsd.pjcloud.wallet.api.vo.WalletManageVo;
 import com.bsd.pjcloud.wallet.service.MchManageService;
 import com.bsd.pjcloud.wallet.service.WalletThirdZyService;
 import com.bsd.pjcloud.wallet.service.WalletManageService;
@@ -249,6 +248,14 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService {
         List<ZyMerSyncAccountInfoDto> syncList = new ArrayList<>();
         String syncAllMchVersion = getSyncAllMchVersion();
         for (UserVO v : userVOList) {
+            if (ObjectUtil.isEmpty(v) || ObjectUtil.isEmpty(v.getUserId())) {
+                log.error("|{}|syncAllUserGroup用户不存在WalletManageVo|{}|", TAG, JSONUtil.toJsonStr(v));
+                continue;
+            }
+            if (ObjectUtil.isEmpty(v.getRoleList()) || !v.getRoleList().contains(CommonRoleConstant.AUTO_CREATE_WALLET)) {
+                log.error("|{}|syncAllUserGroup用户没有自动创建钱包权限|{}|", TAG, JSONUtil.toJsonStr(v));
+                continue;
+            }
             MchManageVo mch = mchManageService.getFirstMchByDeptId(v.getDeptId());
             // 查询是在商户下
             if (ObjectUtil.isEmpty(mch)) {