zy123/group-buying
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8.6 修改'拼团展示列表逻辑'

Browse Source
This commit is contained in:
zhangsan 2025-08-06 21:12:32 +08:00
parent 7daa39d416
commit 7a407a7efd
6 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml
View File

@ -93,7 +93,6 @@
select user_id,team_id,out_trade_no select user_id,team_id,out_trade_no
from group_buy_order_list from group_buy_order_list
where activity_id = #{activityId} 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 team_id in ( select team_id from group_buy_order where activity_id = #{activityId} and status = 0)
and status in (0, 1) and status in (0, 1)
and valid_end_time > now() and valid_end_time > now()

2
group-buying-sys-domain/src/main/java/edu/whut/domain/activity/adapter/repository/IActivityRepository.java
View File

@ -24,7 +24,7 @@ public interface IActivityRepository {
boolean cutRange(String userId); boolean cutRange(String userId);
List<UserGroupBuyOrderDetailEntity> listRandomDetails(Long activityId, String userId, int randomCount); List<UserGroupBuyOrderDetailEntity> listRandomDetails(Long activityId, int randomCount);
TeamStatisticVO queryTeamStatisticByActivityId(Long activityId); TeamStatisticVO queryTeamStatisticByActivityId(Long activityId);

4
group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IIndexGroupBuyMarketService.java
View File

@ -29,9 +29,7 @@ public interface IIndexGroupBuyMarketService {
* @return 用户拼团明细数据 * @return 用户拼团明细数据
*/ */
List<UserGroupBuyOrderDetailEntity> queryInProgressUserGroupBuyOrderDetailList(Long activityId, List<UserGroupBuyOrderDetailEntity> queryInProgressUserGroupBuyOrderDetailList(Long activityId, int randomCount);
String userId,
int randomCount);
/** /**
* 活动下的拼团队伍统计数据 * 活动下的拼团队伍统计数据

6
group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/IndexGroupBuyMarketServiceImpl.java
View File

@ -42,12 +42,10 @@ public class IndexGroupBuyMarketServiceImpl implements IIndexGroupBuyMarketServi
* 查询当前用户参与的ownerCount个拼团 + randomCount个随机其他拼团 * 查询当前用户参与的ownerCount个拼团 + randomCount个随机其他拼团
*/ */
@Override @Override
public List<UserGroupBuyOrderDetailEntity> queryInProgressUserGroupBuyOrderDetailList(Long activityId, public List<UserGroupBuyOrderDetailEntity> queryInProgressUserGroupBuyOrderDetailList(Long activityId, int randomCount) {
String userId,
int randomCount) {
return randomCount <= 0 return randomCount <= 0
? Collections.emptyList() ? Collections.emptyList()
: repository.listRandomDetails(activityId, userId, randomCount); : repository.listRandomDetails(activityId,randomCount);
} }

5
group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/ActivityRepository.java
View File

@ -134,9 +134,7 @@ public class ActivityRepository extends AbstractRepository implements IActivityR
return dccService.isCutRange(userId); return dccService.isCutRange(userId);
} }
public List<UserGroupBuyOrderDetailEntity> listRandomDetails(Long activityId, public List<UserGroupBuyOrderDetailEntity> listRandomDetails(Long activityId, int randomCount) {
String userId,
int randomCount) {
if (randomCount <= 0) { if (randomCount <= 0) {
@ -146,7 +144,6 @@ public class ActivityRepository extends AbstractRepository implements IActivityR
// 直接 DAO 调用，省掉 queryOrderLists // 直接 DAO 调用，省掉 queryOrderLists
GroupBuyOrderList req = new GroupBuyOrderList(); GroupBuyOrderList req = new GroupBuyOrderList();
req.setActivityId(activityId); req.setActivityId(activityId);
req.setUserId(userId);
req.setCount(randomCount); req.setCount(randomCount);
log.info("Built GroupBuyOrderList req: {}", req); log.info("Built GroupBuyOrderList req: {}", req);
List<GroupBuyOrderList> raw = Optional.ofNullable( List<GroupBuyOrderList> raw = Optional.ofNullable(

3
group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java
View File

@ -69,8 +69,7 @@ public class MarketIndexController implements IMarketIndexService {
// —— 4. 拼团队列 DTO 列表 —— // —— 4. 拼团队列 DTO 列表 ——
//获取拼团展示列表 //获取拼团展示列表
List<UserGroupBuyOrderDetailEntity> userGroupBuyOrderDetailEntities = indexGroupBuyMarketService.queryInProgressUserGroupBuyOrderDetailList( List<UserGroupBuyOrderDetailEntity> userGroupBuyOrderDetailEntities = indexGroupBuyMarketService.queryInProgressUserGroupBuyOrderDetailList(
trial.getGroupBuyActivityDiscountVO().getActivityId(), trial.getGroupBuyActivityDiscountVO().getActivityId(), 4);
req.getUserId(), 4);
List<GoodsMarketResponseDTO.Team> teams = new ArrayList<>(); List<GoodsMarketResponseDTO.Team> teams = new ArrayList<>();
if (null != userGroupBuyOrderDetailEntities && !userGroupBuyOrderDetailEntities.isEmpty()) { if (null != userGroupBuyOrderDetailEntities && !userGroupBuyOrderDetailEntities.isEmpty()) {