hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-12 09:11:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

Browse Source
This commit is contained in:
owen
2023-10-03 21:21:48 +08:00
parent a9e822762d ac55a9657c
commit 3c5917a6cd
55 changed files with 269 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserRespVO.java
View File

@@ -26,7 +26,7 @@ public class BrokerageUserRespVO extends BrokerageUserBaseVO {
@Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
private String nickname;
// ========== 推广信息 ==========
// ========== 推广信息 ========== 注意：是包括 1 + 2 级的数据
@Schema(description = "推广用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
private Integer brokerageUserCount;

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageRecordMapper.java
View File

@@ -68,7 +68,7 @@ public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> {
.in(BrokerageRecordDO::getUserId, userIds)
.eq(BrokerageRecordDO::getBizId, bizType)
.eq(BrokerageRecordDO::getStatus, status)
.groupBy(BrokerageRecordDO::getUserId));
.groupBy(BrokerageRecordDO::getUserId)); // 按照 userId 聚合
return BeanUtil.copyToList(list, UserBrokerageSummaryRespBO.class);
// selectJoinList有BUG，会与租户插件冲突：解析SQL时，发生异常 https://gitee.com/best_handsome/mybatis-plus-join/issues/I84GYW
// return selectJoinList(UserBrokerageSummaryBO.class, MPJWrappers.lambdaJoin(BrokerageRecordDO.class)

21
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
View File

@@ -329,26 +329,27 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
if (bindUserId == null) {
return Collections.emptyList();
}
// 先查第 1 级
List<Long> bindUserIds = brokerageUserMapper.selectIdListByBindUserIdIn(Collections.singleton(bindUserId));
if (CollUtil.isEmpty(bindUserIds)) {
return Collections.emptyList();
}
// 情况一：level 为空，查询所有级别
if (level == null) {
// level 为空，再查第 2 级，并合并结果
// 再查第 2 级，并合并结果
bindUserIds.addAll(brokerageUserMapper.selectIdListByBindUserIdIn(bindUserIds));
} else if (level == 2) {
// 只查第 2 级
bindUserIds = brokerageUserMapper.selectIdListByBindUserIdIn(bindUserIds);
} else if (level == 1) {
// 只查第 1 级
return bindUserIds;
} else {
throw exception(BROKERAGE_USER_LEVEL_NOT_SUPPORT);
}
return bindUserIds;
// 情况二：level 为 1，只查询第 1 级
if (level == 1) {
return bindUserIds;
}
// 情况三：level 为 1，只查询第 2 级
if (level == 2) {
return brokerageUserMapper.selectIdListByBindUserIdIn(bindUserIds);
}
throw exception(BROKERAGE_USER_LEVEL_NOT_SUPPORT);
}
}