From be22a0a722e42ed9bb84bfe7da1be1f56bdc292c Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 24 Mar 2025 18:01:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/order/HardOrderMapper.xml | 4 ++-- .../bsd/pjcloud/wallet/mapper/MchManageMapper.java | 4 ++-- .../wallet/service/impl/MchManageServiceImpl.java | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index aafd662a9..d35aace40 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -219,9 +219,9 @@ #{v} - + and a.user_dept_id in - + #{v} diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java index c7cdae33e..5fc10cbf5 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java @@ -59,8 +59,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) - .orderByDesc(MchManageEntity::getCreateTime) - .orderByDesc(MchManageEntity::getId); + .orderByDesc(MchManageEntity::getDeptId) + .orderByDesc(MchManageEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), MchManageVo.class)); return list; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java index a42b562af..c8c9c6df0 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java @@ -78,10 +78,10 @@ public class MchManageServiceImpl extends ServiceImpl() .eq(ObjectUtil.isNotEmpty(name), MchManageEntity::getName, name) + .eq(ObjectUtil.isNotEmpty(types), MchManageEntity::getTypes, types) .ne(ObjectUtil.isNotEmpty(id), MchManageEntity::getId, id) ); if (ObjectUtil.isNotEmpty(id)) { @@ -277,9 +278,10 @@ public class MchManageServiceImpl extends ServiceImpl 0; } - private boolean existDeptId(Long deptId, Long id) { + private boolean existDeptId(Long deptId, String types, Long id) { Long count = baseMapper.selectCount(new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(deptId), MchManageEntity::getDeptId, deptId) + .eq(ObjectUtil.isNotEmpty(types), MchManageEntity::getTypes, types) .ne(ObjectUtil.isNotEmpty(id), MchManageEntity::getId, id) ); if (ObjectUtil.isNotEmpty(id)) { 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 2/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=AD=A3=E5=85=83?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E5=88=A4=E6=96=AD=EF=BC=8C=E6=9C=89=E9=92=B1?= =?UTF-8?q?=E5=8C=85=E7=9A=84=E6=9D=83=E9=99=90=E7=9A=84=E6=89=8D=E5=90=8C?= =?UTF-8?q?=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 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)) { From 81c45f5374b13f726f7fd0b03968f64048458347 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 24 Mar 2025 20:16:14 +0800 Subject: [PATCH 3/4] 111 --- .../service/impl/thrid/WalletThirdZyServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 da874185a..6d46af41a 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 @@ -252,7 +252,12 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService { log.error("|{}|syncAllUserGroup用户不存在WalletManageVo|{}|", TAG, JSONUtil.toJsonStr(v)); continue; } - if (ObjectUtil.isEmpty(v.getRoleList()) || !v.getRoleList().contains(CommonRoleConstant.AUTO_CREATE_WALLET)) { + if (ObjectUtil.isEmpty(v.getRoleList())) { + log.error("|{}|syncAllUserGroup用户没有自动创建钱包权限|{}|", TAG, JSONUtil.toJsonStr(v)); + continue; + } + List roleCodes = v.getRoleList().stream().map(SysRole::getRoleCode).toList(); + if (!roleCodes.contains(CommonRoleConstant.AUTO_CREATE_WALLET)) { log.error("|{}|syncAllUserGroup用户没有自动创建钱包权限|{}|", TAG, JSONUtil.toJsonStr(v)); continue; } From ac75e72a49326cb8c08e63973b43b20b56e7e570 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 25 Mar 2025 10:22:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=95=86=E6=88=B7=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/order/HardOrderMapper.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index d35aace40..8b53d4d58 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -103,6 +103,22 @@ #{v} + + + + and a.user_dept_id IN + + + and a.user_dept_id NOT IN + + + and a.user_dept_id IN + + + + #{v} + + and a.order_status in