moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代理不能添加为主播

Browse Source
This commit is contained in:
hokli
2025-04-22 11:00:57 +08:00
parent 1516e2e98d
commit 9c1400975b
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java
View File

@@ -31,6 +31,8 @@ import com.accompany.core.model.Users;
import com.accompany.core.service.partition.PartitionInfoService;
import com.accompany.core.service.region.RegionInfoService;
import com.accompany.core.util.I18NMessageSourceUtil;
import com.accompany.payment.model.RechargeUser;
import com.accompany.payment.service.RechargeUserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -69,6 +71,8 @@ public class GuildManageAdminService {
private RegionInfoService regionInfoService;
@Autowired
private UploadAvatarService uploadAvatarService;
@Autowired
private RechargeUserService rechargeUserService;
@Transactional(rollbackFor = Exception.class)
public void createGuild(Long erbanNo, Integer adminId, Long inviteErbanNo) {
@@ -597,13 +601,16 @@ public class GuildManageAdminService {
if (null == guild){
throw new AdminServiceException(BusiStatus.FAMILY_NOT_EXIST);
}
Users u = usersService.getUserByErbanNo(erbanNo);
if (null == u){
throw new AdminServiceException(BusiStatus.USERNOTEXISTS);
} else if (!u.getPartitionId().equals(guild.getPartitionId())) {
throw new AdminServiceException(BusiStatus.PARTITION_ERROR);
}
RechargeUser rechargeUser = rechargeUserService.selectByUid(u.getUid());
if (rechargeUser != null) {
throw new AdminServiceException("代理不能添加为主播");
}
guildApplyAdminService.existNotAuditByApplyUidCheck4Admin(u.getUid(), "");
GuildMember guildMember = guildMemberService.getLastGuildMemberByUid(u.getUid(), u.getPartitionId());

22
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsDayMapper.xml
View File

@@ -46,26 +46,26 @@
gd.uid as uid,
pi.`desc` as partitionDesc,
rimu.`name` as regionName,
sum(gd.diamond_num) as diamondNum,
sum(ifnull(gd.diamond_num,0)) as diamondNum,
if(gm.`enable` = 1 , '有效', '无效') as statusDesc
from guild_diamond_statistics_day gd
inner join guild_member gm on gm.id = gd.guild_member_id
from guild_member gm
left join guild_diamond_statistics_day gd on gm.id = gd.guild_member_id
and gd.stat_date >= #{startDate} and gd.stat_date <= #{endDate}
left join guild g on g.id = gm.guild_id
left join users u on u.uid = g.owner_uid
left join region_info riu on riu.id = u.region_id
left join users mu on mu.uid=gd.uid
left join users mu on mu.uid=gm.uid
left join region_info rimu on rimu.id = mu.region_id
left join partition_info pi on pi.id = gd.partition_id
where gd.stat_date >= #{startDate}
and gd.stat_date <= #{endDate}
and gd.partition_id = #{partitionId}
where
mu.partition_id = #{partitionId}
<if test="guildId != null">
and gd.guild_id = #{guildId}
and gm.guild_id = #{guildId}
</if>
<if test="uid != null">
and gd.uid = #{uid}
and gm.uid = #{uid}
</if>
group by gd.guild_member_id,gd.guild_id, gd.uid
ORDER BY gm.`enable` desc, diamondNum desc, gd.guild_id desc
group by gm.guild_member_id,gm.guild_id, gm.uid
ORDER BY gm.`enable` desc, diamondNum desc, gm.guild_id desc
</select>
</mapper>