From 410d777c0b8257b6b0c0540a4efd7d7ecd79ee68 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Thu, 8 Oct 2026 21:18:59 -0400 Subject: [PATCH] =?UTF-8?q?apps=E5=88=9B=E5=BB=BA=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=80=A7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/system/mapper/AppsMapper.java | 6 ++++++ .../com/ruoyi/system/service/impl/AppsServiceImpl.java | 10 +++++++++- .../src/main/resources/mapper/system/AppsMapper.xml | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java index 609e278..c73d0d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java @@ -15,6 +15,12 @@ import com.ruoyi.system.domain.AppsPlus; */ public interface AppsMapper extends BaseMapper { + /** 锁定所属用户,串行化同一用户的应用创建。 */ + Long lockUserById(@Param("userId") Long userId); + + /** 查询用户当前未删除的应用数量。 */ + int countActiveAppsByUserId(@Param("userId") Long userId); + int updatePublicKey(@Param("id") Long id, @Param("publicKey") String publicKey, @Param("updatedAt") java.util.Date updatedAt); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java index 6b384fe..e5b0ccd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java @@ -286,15 +286,23 @@ public class AppsServiceImpl extends ServiceImpl implement * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int insertApps(Apps apps, boolean isUser) { validateAppForCreate(apps, isUser); + Long ownerUserId = isUser ? SecurityUtils.getUserId() : apps.getUserId(); + if (ownerUserId == null || appsMapper.lockUserById(ownerUserId) == null) { + throw new CustomException("所属用户不存在"); + } + if (appsMapper.countActiveAppsByUserId(ownerUserId) > 0) { + throw new CustomException("该用户已经创建商户应用,每个用户只能创建一个应用"); + } + apps.setUserId(ownerUserId); // 每个新应用统一使用全局配置主钱包地址,忽略请求中可能伪造的归集地址。 apps.setDistTokenAddress(getGlobalAggregationAddress()); apps.setCreatedAt(DateUtils.getNowDate()); apps.setUpdatedAt(DateUtils.getNowDate()); apps.setDeletedAt(null); if (isUser) { - apps.setUserId(SecurityUtils.getUserId()); apps.setTrxBalance(BigDecimal.ZERO); apps.setUsdtBalance(BigDecimal.ZERO); apps.setCreditLimit(BigDecimal.ZERO); diff --git a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml index 089e8bf..f8a71d5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml @@ -28,6 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, user_id, name, description, status, created_at, updated_at, deleted_at, trx_balance, usdt_balance, public_key, credit_limit, google_sub, google_email, google_name, google_picture, dist_token_address from apps + + + +