From ce72d87d12a0a53b1b7822d30b487413141455b6 Mon Sep 17 00:00:00 2001 From: cst61 Date: Thu, 11 Jun 2026 23:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E7=89=A9=E5=8C=85=E9=A2=84=E6=B5=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4=E7=9A=84?= =?UTF-8?q?=E7=A7=9F=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/rj/config/MybatisPlusConfig.java | 1 + src/main/java/com/rj/service/ILbGoodsService.java | 6 ++---- .../com/rj/service/impl/LbBuyAccountServiceImpl.java | 12 ++++++------ .../java/com/rj/service/impl/LbGoodsServiceImpl.java | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/rj/config/MybatisPlusConfig.java b/src/main/java/com/rj/config/MybatisPlusConfig.java index 8d8795d..c13594a 100644 --- a/src/main/java/com/rj/config/MybatisPlusConfig.java +++ b/src/main/java/com/rj/config/MybatisPlusConfig.java @@ -63,6 +63,7 @@ public class MybatisPlusConfig { ignoreTables.add("lb_third_integration_config"); // 每租户一条，按 tenant_id 显式查询，不走插件自动拼接 ignoreTables.add("lb_buy_account"); // 抢单账号跨租户管理；分页/批量抢单按记录 tenant_id 业务处理 ignoreTables.add("lb_buy_account_history"); // 抢单历史跨租户查询；按记录 tenant_id 业务过滤 + ignoreTables.add("lb_goods"); // 货品跨租户管理；分页/抢单按页面或业务传入的 tenant_id 显式过滤 return new TenantLineHandler() { diff --git a/src/main/java/com/rj/service/ILbGoodsService.java b/src/main/java/com/rj/service/ILbGoodsService.java index 7ddbb6d..84b0b60 100644 --- a/src/main/java/com/rj/service/ILbGoodsService.java +++ b/src/main/java/com/rj/service/ILbGoodsService.java @@ -50,10 +50,8 @@ public interface ILbGoodsService extends IService { * 成功笔数达到 {@code maxBuyCount} 后停止，且循环抢购总次数不超过 {@code maxBuyCount} 的5倍。 * * @param token 可选；非空时作为请求头 token，否则使用 {@code lb_third_integration_config} 中的 goodsApiToken - * @param rushBuyAccountLabel 批量账号抢单时传入，用于日志标识当前抢单账号 - * @param tokenRefreshContext 非空且 token 失效时，按账号凭证自动登录并刷新 {@code lb_buy_account.token_front} - * @param goodsCoordinator 批量抢单时传入，保证同租户同货品 ID 仅一个账号抢购 - * @param accountId 批量抢单时当前账号主键，与 {@code goodsCoordinator} 配合使用 + * + * @param token 失效时，按账号凭证自动登录并刷新 {@code lb_buy_account.token_front} */ default Map rushBuy(String tenantId, String token, Integer maxBuyCount) { return rushBuy(tenantId, token, maxBuyCount, null, null, null, null); diff --git a/src/main/java/com/rj/service/impl/LbBuyAccountServiceImpl.java b/src/main/java/com/rj/service/impl/LbBuyAccountServiceImpl.java index f9816d4..849d7f9 100644 --- a/src/main/java/com/rj/service/impl/LbBuyAccountServiceImpl.java +++ b/src/main/java/com/rj/service/impl/LbBuyAccountServiceImpl.java @@ -153,12 +153,12 @@ public class LbBuyAccountServiceImpl } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// if (tenantId != null && !tenantId.trim().isEmpty()) { -// queryWrapper.eq(LbBuyAccount::getTenantId, tenantId.trim()); -// } -// if (tenantName != null && !tenantName.trim().isEmpty()) { -// queryWrapper.like(LbBuyAccount::getTenantName, tenantName.trim()); -// } + if (tenantId != null && !tenantId.trim().isEmpty()) { + queryWrapper.eq(LbBuyAccount::getTenantId, tenantId.trim()); + } + if (tenantName != null && !tenantName.trim().isEmpty()) { + queryWrapper.like(LbBuyAccount::getTenantName, tenantName.trim()); + } if (loginAccount != null && !loginAccount.trim().isEmpty()) { queryWrapper.like(LbBuyAccount::getLoginAccount, loginAccount.trim()); } diff --git a/src/main/java/com/rj/service/impl/LbGoodsServiceImpl.java b/src/main/java/com/rj/service/impl/LbGoodsServiceImpl.java index ec82077..f51be04 100644 --- a/src/main/java/com/rj/service/impl/LbGoodsServiceImpl.java +++ b/src/main/java/com/rj/service/impl/LbGoodsServiceImpl.java @@ -843,6 +843,7 @@ public class LbGoodsServiceImpl extends ServiceImpl impl private List loadRushBuyGoodsList(String tid, String accountTag) { LocalDateTime updatedAfter = resolveRushBuyUpdatedAfter(); LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + w.eq(LbGoods::getTenantId, tid); w.isNotNull(LbGoods::getSellerId); w.gt(LbGoods::getTotalMoney, RUSH_BUY_MIN_TOTAL_MONEY); w.le(LbGoods::getTotalMoney, RUSH_BUY_MAX_TOTAL_MONEY);