irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-08-26 23:14:02 +08:00
parent 3d771521e9
commit 8ad984c9ed
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java
View File

@@ -23,7 +23,14 @@ public interface IPlayClerkDataReviewInfoService extends IService<PlayClerkDataR
*/ */
PlayClerkDataReviewInfoEntity selectPlayClerkDataReviewInfoById(String id); PlayClerkDataReviewInfoEntity selectPlayClerkDataReviewInfoById(String id);
List<PlayClerkDataReviewInfoEntity> queryByClerkId(String clerkId); /**
* 查询店员资料申请
*
* @param clerkId 店员ID
* @param reviewState 审核状态（0：未审核:1：审核通过，2：审核不通过）
* @return PlayClerkDataReviewInfoEntity
*/
List<PlayClerkDataReviewInfoEntity> queryByClerkId(String clerkId, String reviewState);
/** /**
* 查询店员资料申请 * 查询店员资料申请

3
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkDataReviewInfoServiceImpl.java
View File

@@ -57,9 +57,10 @@ public class PlayClerkDataReviewInfoServiceImpl extends ServiceImpl<PlayClerkDat
} }
@Override @Override
public List<PlayClerkDataReviewInfoEntity> queryByClerkId(String clerkId) { public List<PlayClerkDataReviewInfoEntity> queryByClerkId(String clerkId,String reviewState) {
LambdaQueryWrapper<PlayClerkDataReviewInfoEntity> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlayClerkDataReviewInfoEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, clerkId); queryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, clerkId);
queryWrapper.eq(PlayClerkDataReviewInfoEntity::getReviewState, reviewState);
return this.baseMapper.selectList(queryWrapper); return this.baseMapper.selectList(queryWrapper);
} }

4
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
View File

@@ -139,14 +139,14 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
@Override @Override
public PlayClerkUserLoginResponseVo getVo(PlayClerkUserInfoEntity userInfo) { public PlayClerkUserLoginResponseVo getVo(PlayClerkUserInfoEntity userInfo) {
PlayClerkUserLoginResponseVo result = ConvertUtil.entityToVo(userInfo, PlayClerkUserLoginResponseVo.class); PlayClerkUserLoginResponseVo result = ConvertUtil.entityToVo(userInfo, PlayClerkUserLoginResponseVo.class);
List<PlayClerkDataReviewInfoEntity> list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId()); List<PlayClerkDataReviewInfoEntity> list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(),"0");
// 判断头像、音频、相册是否可以编辑，如果存在未审核的数据，则不允许编辑 // 判断头像、音频、相册是否可以编辑，如果存在未审核的数据，则不允许编辑
Map<String, PlayClerkDataReviewInfoEntity> map = list.stream().collect(Collectors.toMap(PlayClerkDataReviewInfoEntity::getDataType, account -> account, (entity1, entity2) -> entity1)); Map<String, PlayClerkDataReviewInfoEntity> map = list.stream().collect(Collectors.toMap(PlayClerkDataReviewInfoEntity::getDataType, account -> account, (entity1, entity2) -> entity1));
if (map.containsKey("1")) { if (map.containsKey("1")) {
result.setAvatarAllowEdit(false); result.setAvatarAllowEdit(false);
} }
if (map.containsKey("2")) { if (map.containsKey("2")) {
result.setAvatarAllowEdit(false); result.setAlbumAllowEdit(false);
} }
if (map.containsKey("3")) { if (map.containsKey("3")) {
result.setAudioAllowEdit(false); result.setAudioAllowEdit(false);

2
play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java
View File

@@ -70,6 +70,7 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl<PlayCommodityInfoM
public List<PlayCommodityReturnVo> selectTree() { public List<PlayCommodityReturnVo> selectTree() {
MPJLambdaWrapper<PlayCommodityInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PlayCommodityInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
lambdaQueryWrapper.selectAll(PlayCommodityInfoEntity.class); lambdaQueryWrapper.selectAll(PlayCommodityInfoEntity.class);
lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort);
List<PlayCommodityInfoEntity> list = this.baseMapper.selectJoinList(PlayCommodityInfoEntity.class, lambdaQueryWrapper); List<PlayCommodityInfoEntity> list = this.baseMapper.selectJoinList(PlayCommodityInfoEntity.class, lambdaQueryWrapper);
Map<String, List<PlayCommodityInfoEntity>> collect = list.stream().filter(a -> a != null && a.getId() != null).collect(Collectors.groupingBy(PlayCommodityInfoEntity::getPId)); Map<String, List<PlayCommodityInfoEntity>> collect = list.stream().filter(a -> a != null && a.getId() != null).collect(Collectors.groupingBy(PlayCommodityInfoEntity::getPId));
return this.assembleTree(collect, collect.get("00")); return this.assembleTree(collect, collect.get("00"));
@@ -137,6 +138,7 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl<PlayCommodityInfoM
public List<PlayCommodityInfoEntity> selectByPId(String pId) { public List<PlayCommodityInfoEntity> selectByPId(String pId) {
LambdaQueryWrapper<PlayCommodityInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlayCommodityInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getPId, pId); lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getPId, pId);
lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort);
return this.baseMapper.selectList(lambdaQueryWrapper); return this.baseMapper.selectList(lambdaQueryWrapper);
} }