czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
GYJ
2024-12-28 18:55:58 +08:00
parent a52dee9bce db4d7327cc
commit af8a0ece55
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/modules/invite/dao/InviteDao.java
View File

@@ -28,7 +28,8 @@ public interface InviteDao extends BaseMapper<Invite> {
Double selectInviteSum(@Param("state") Integer state, @Param("userId") Long userId);
IPage<Map<String,Object>> selectInviteUser(Page<Map<String,Object>> page, @Param("userId") Long userId,@Param("state") Integer state,@Param("userType") Integer userType);
// IPage<Map<String,Object>> selectInviteUser(Page<Map<String,Object>> page, @Param("userId") Long userId,@Param("state") Integer state,@Param("userType") Integer userType);
IPage<Map<String,Object>> selectInviteUser(Page<Map<String,Object>> page,@Param("code") String code);
Invite selectInviteByUser(@Param("userId")Long userId,@Param("inviteeUserId") Long inviteeUserId,@Param("userType") Integer userType);

3
src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java
View File

@@ -72,7 +72,8 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
@Override
public PageUtils selectInviteUser(int page, int limit, Long userId, Integer state, Integer userType) {
Page<Map<String, Object>> pages = new Page<>(page, limit);
return new PageUtils(inviteDao.selectInviteUser(pages, userId, state, userType));
UserEntity userEntity = userService.queryByUserId(userId);
return new PageUtils(inviteDao.selectInviteUser(pages, userEntity.getInvitationCode()));
}
@Override