angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 乐学注册专区控制显示；

This commit is contained in:
cabbage 2025-04-22 14:30:48 +08:00
parent 0028d59d9b
commit 857b48d742
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java
View File

@ -1153,6 +1153,10 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
// // 可见乐学复购（标记是否乐学易考、金茗国际伞下） // // 可见乐学复购（标记是否乐学易考、金茗国际伞下）
// boolean isLex = null != memberServiceApi.checkMemberByParentList(SysConstants.CHINA_LEX_REPURCHASE_LIST, userId).getData(); // boolean isLex = null != memberServiceApi.checkMemberByParentList(SysConstants.CHINA_LEX_REPURCHASE_LIST, userId).getData();
// 注册专区权限
boolean isLexRegister = ERegistrationAuthority.DECLARATION.getValue() == loginMember.getRegisterAuthority()
|| ERegistrationAuthority.SERVICE.getValue() == loginMember.getRegisterAuthority();
// 查询配置菜单列表 // 查询配置菜单列表
// 结算等级 // 结算等级
int pkGrade = loginMember.getPkSettleGrade(); int pkGrade = loginMember.getPkSettleGrade();
@ -1195,13 +1199,13 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
if (StringUtils.isNotBlank(sArea.getLabel())) { if (StringUtils.isNotBlank(sArea.getLabel())) {
RecommendSpecialAreaVo recommendSpecialAreaVo = new RecommendSpecialAreaVo(); RecommendSpecialAreaVo recommendSpecialAreaVo = new RecommendSpecialAreaVo();
// if (specialArea.equals(ESpecialArea.SPECIAL_REGISTER_AREA.getValue()) if (specialArea.equals(ESpecialArea.SPECIAL_REGISTER_AREA.getValue())) {
// || specialArea.equals(ESpecialArea.SPECIAL_UPGRADE_AREA.getValue())) { // 乐学注册权限判断
// // 2024.03.28 添加需求，只有指定4个账号可以看乐学注册、乐学升级 if (!isLexRegister) {
// if (!isLexRegister) { continue;
// continue; }
// } }
// } else if (specialArea.equals(ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue())) { // else if (specialArea.equals(ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue())) {
// // 乐学复购专区处理 // // 乐学复购专区处理
// if (!isLex) { // if (!isLex) {
// continue; // continue;
@ -1258,7 +1262,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
resultList.sort(Comparator.comparingInt(RecommendSpecialAreaVo::getSort)); resultList.sort(Comparator.comparingInt(RecommendSpecialAreaVo::getSort));
recommendWaresInfoVo.setRecommendSpecialAreaList(resultList); recommendWaresInfoVo.setRecommendSpecialAreaList(resultList);
// 查询推荐商品 // 查询推荐商品
List<BdWaresExt> waresList = this.selectByRecommentList(pkCountry, specialAreaList); List<BdWaresExt> waresList = this.selectByRecommentList(pkCountry, specialAreaList);
// 校验商品奖衔和等级/团队权限 // 校验商品奖衔和等级/团队权限
List<Integer> waresIdList = waresList.stream().map(BdWares::getPkId).collect(Collectors.toList()); List<Integer> waresIdList = waresList.stream().map(BdWares::getPkId).collect(Collectors.toList());
@ -1368,13 +1371,13 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
// 商品信息填充 // 商品信息填充
WaresVo waresVo = new WaresVo(); WaresVo waresVo = new WaresVo();
// if (bdWares.getSpecialArea().equals(ESpecialArea.SPECIAL_REGISTER_AREA.getValue()) if (bdWares.getSpecialArea().equals(ESpecialArea.SPECIAL_REGISTER_AREA.getValue())) {
// || bdWares.getSpecialArea().equals(ESpecialArea.SPECIAL_UPGRADE_AREA.getValue())) { // 乐学注册权限判断
// // 2024.03.28 添加需求，只有指定4个账号可以看乐学注册、乐学升级 if (!isLexRegister) {
// if (!isLexRegister) { continue;
// continue; }
// } }
// } else if (bdWares.getSpecialArea().equals(ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue())) { // else if (bdWares.getSpecialArea().equals(ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue())) {
// // 乐学复购专区处理 // // 乐学复购专区处理
// if (!isLex) { // if (!isLex) {
// continue; // continue;

8
hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/provider/AdvertBannerServiceProvider.java
View File

@ -14,14 +14,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/**
* @BelongsProject: hzs_cloud
* @BelongsPackage: com.hzs.system.config.provider
* @Author: yh
* @CreateTime: 2023-05-15 10:14
* @Description:
* @Version: 1.0
*/
@DubboService @DubboService
public class AdvertBannerServiceProvider implements AdvertBannerServiceApi { public class AdvertBannerServiceProvider implements AdvertBannerServiceApi {