From 7a407a7efd5fb90c594c957492adf725d7f5d038 Mon Sep 17 00:00:00 2001 From: zhangsan <646228430@qq.com> Date: Wed, 6 Aug 2025 21:12:32 +0800 Subject: [PATCH] =?UTF-8?q?8.6=20=E4=BF=AE=E6=94=B9'=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8=E9=80=BB=E8=BE=91'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/group_buy_order_list_mapper.xml | 1 - .../activity/adapter/repository/IActivityRepository.java | 2 +- .../activity/service/IIndexGroupBuyMarketService.java | 4 +--- .../activity/service/IndexGroupBuyMarketServiceImpl.java | 6 ++---- .../adapter/repository/ActivityRepository.java | 5 +---- .../java/edu/whut/trigger/http/MarketIndexController.java | 3 +-- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml b/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml index a0b8171..3e749a5 100644 --- a/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml +++ b/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml @@ -93,7 +93,6 @@ select user_id,team_id,out_trade_no from group_buy_order_list where activity_id = #{activityId} - and user_id = #{userId} and team_id in ( select team_id from group_buy_order where activity_id = #{activityId} and status = 0) and status in (0, 1) and valid_end_time > now() diff --git a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/adapter/repository/IActivityRepository.java b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/adapter/repository/IActivityRepository.java index aa03ed4..adcc05a 100644 --- a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/adapter/repository/IActivityRepository.java +++ b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/adapter/repository/IActivityRepository.java @@ -24,7 +24,7 @@ public interface IActivityRepository { boolean cutRange(String userId); - List listRandomDetails(Long activityId, String userId, int randomCount); + List listRandomDetails(Long activityId, int randomCount); TeamStatisticVO queryTeamStatisticByActivityId(Long activityId); diff --git a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IIndexGroupBuyMarketService.java b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IIndexGroupBuyMarketService.java index 8bc3c09..7f2d6ed 100644 --- a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IIndexGroupBuyMarketService.java +++ b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IIndexGroupBuyMarketService.java @@ -29,9 +29,7 @@ public interface IIndexGroupBuyMarketService { * @return 用户拼团明细数据 */ - List queryInProgressUserGroupBuyOrderDetailList(Long activityId, - String userId, - int randomCount); + List queryInProgressUserGroupBuyOrderDetailList(Long activityId, int randomCount); /** * 活动下的拼团队伍统计数据 diff --git a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IndexGroupBuyMarketServiceImpl.java b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IndexGroupBuyMarketServiceImpl.java index 01ff188..ef6aaad 100644 --- a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IndexGroupBuyMarketServiceImpl.java +++ b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IndexGroupBuyMarketServiceImpl.java @@ -42,12 +42,10 @@ public class IndexGroupBuyMarketServiceImpl implements IIndexGroupBuyMarketServi * 查询当前用户参与的ownerCount个拼团 + randomCount个随机其他拼团 */ @Override - public List queryInProgressUserGroupBuyOrderDetailList(Long activityId, - String userId, - int randomCount) { + public List queryInProgressUserGroupBuyOrderDetailList(Long activityId, int randomCount) { return randomCount <= 0 ? Collections.emptyList() - : repository.listRandomDetails(activityId, userId, randomCount); + : repository.listRandomDetails(activityId,randomCount); } diff --git a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/ActivityRepository.java b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/ActivityRepository.java index b5fe6ad..f719f2d 100644 --- a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/ActivityRepository.java +++ b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/ActivityRepository.java @@ -134,9 +134,7 @@ public class ActivityRepository extends AbstractRepository implements IActivityR return dccService.isCutRange(userId); } - public List listRandomDetails(Long activityId, - String userId, - int randomCount) { + public List listRandomDetails(Long activityId, int randomCount) { if (randomCount <= 0) { @@ -146,7 +144,6 @@ public class ActivityRepository extends AbstractRepository implements IActivityR // 直接 DAO 调用，省掉 queryOrderLists GroupBuyOrderList req = new GroupBuyOrderList(); req.setActivityId(activityId); - req.setUserId(userId); req.setCount(randomCount); log.info("Built GroupBuyOrderList req: {}", req); List raw = Optional.ofNullable( diff --git a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java index 048f0b1..0229084 100644 --- a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java +++ b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java @@ -69,8 +69,7 @@ public class MarketIndexController implements IMarketIndexService { // —— 4. 拼团队列 DTO 列表 —— //获取拼团展示列表 List userGroupBuyOrderDetailEntities = indexGroupBuyMarketService.queryInProgressUserGroupBuyOrderDetailList( - trial.getGroupBuyActivityDiscountVO().getActivityId(), - req.getUserId(), 4); + trial.getGroupBuyActivityDiscountVO().getActivityId(), 4); List teams = new ArrayList<>(); if (null != userGroupBuyOrderDetailEntities && !userGroupBuyOrderDetailEntities.isEmpty()) {