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-10-15 18:26:44 +08:00
parent 7c01f75b7d
commit e3f656e730
6 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyAdminVo.java
View File

@@ -65,5 +65,8 @@ public class FamilyAdminVo {
private String inviteCheck;
@ExcelIgnore
private Boolean enableEditInvite;
@ApiModelProperty("操作人")
@ExcelProperty("操作人")
private String operator;
}

12
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java
View File

@@ -11,7 +11,10 @@ import com.accompany.business.constant.family.FamilyConstant;
import com.accompany.business.event.FamilyMemberStatusChangeEvent;
import com.accompany.business.event.NewGuildEvent;
import com.accompany.business.message.NewGuildMessage;
import com.accompany.business.model.family.*;
import com.accompany.business.model.family.Family;
import com.accompany.business.model.family.FamilyMember;
import com.accompany.business.model.family.FamilyOperateRecord;
import com.accompany.business.model.family.FamilyPayAccount;
import com.accompany.business.mybatismapper.family.FamilyMemberDiamondSettlementRecordMapper;
import com.accompany.business.service.UploadAvatarService;
import com.accompany.business.service.family.*;
@@ -87,7 +90,7 @@ public class FamilyManageAdminService {
private FamilyMemberDiamondSettlementRecordMapper familyMemberDiamondSettlementRecordMapper;
@Transactional(rollbackFor = Exception.class)
public Family createFamily(Long erbanNo, String referrer, Long inviteErbanNo) {
public Family createFamily(Long erbanNo, String referrer, Long inviteErbanNo, Integer adminId) {
Users u = usersService.getUserByErbanNo(erbanNo);
if (null == u){
throw new AdminServiceException(BusiStatus.USERNOTEXISTS);
@@ -126,6 +129,7 @@ public class FamilyManageAdminService {
Date now = new Date();
Family family = new Family();
family.setAdminId(adminId);
family.setPartitionId(u.getPartitionId());
family.setOwnerUid(u.getUid());
family.setName(u.getNick() + I18NMessageSourceUtil.getMessage(FamilyConstant.DefaultInfo.DEFAULT_NAME_SUFFIX_I18N_ID,
@@ -300,6 +304,7 @@ public class FamilyManageAdminService {
.list().stream().collect(Collectors.toMap(FamilyPayAccount::getFamilyId, a->a));
Date now = new Date();
Map<Integer, String> adminUserMap = adminUserService.adminUserMap();
for (Family family: poList){
FamilyAdminVo vo = new FamilyAdminVo();
vo.setId(family.getId());
@@ -314,6 +319,9 @@ public class FamilyManageAdminService {
vo.setCreateTime(DateTimeUtil.convertDate(family.getCreateTime()));
vo.setEnable(family.getEnable());
vo.setIdCard(family.getIdCard());
if (family.getAdminId() != null) {
vo.setOperator(adminUserMap.get(family.getAdminId()));
}
vo.setInviteCheck(family.getInviteCheck());
if (family.getInviteUid() != null) {
Users users = usersMap.get(family.getInviteUid());

6
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildSuperAdminService.java
View File

@@ -105,11 +105,13 @@ public class GuildSuperAdminService {
}
}
Family family = familyManageAdminService.createFamily(erbanNo, adminUserVo.getUsername(), inviteErbanNo);
Family family = familyManageAdminService.createFamily(erbanNo, adminUserVo.getUsername(), inviteErbanNo, adminUserVo.getAdminId());
guildAdminRefService.bindAdminGuild(adminId, family.getId(), user.getPartitionId());
}
public Page<FamilyAdminVo> pageFamily(Integer partitionId, Integer familyId, Long erbanNo,long pageNum, long pageSize, Integer adminId) {
public Page<FamilyAdminVo> pageFamily(Integer familyId, Long erbanNo,long pageNum, long pageSize, Integer adminId) {
AdminUserVo adminUserVo = adminUserService.getByAdminId(adminId);
Integer partitionId = adminUserVo.getPartitionIds().get(0);
List<Integer> guildIdsByAdminId = guildAdminRefService.getGuildIdsByAdminId(adminId, partitionId);
if (CollectionUtils.isEmpty(guildIdsByAdminId)) {
return new Page<>(pageNum, pageSize);

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyManageAdminController.java
View File

@@ -4,8 +4,8 @@ import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.family.FamilyManageAdminService;
import com.accompany.admin.service.system.AdminLogService;
import com.accompany.admin.vo.family.FamilyAdminVo;
import com.accompany.business.vo.family.FamilyMemberAdminVo;
import com.accompany.admin.vo.family.FamilyOperateRecordAdminVo;
import com.accompany.business.vo.family.FamilyMemberAdminVo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.result.PageResult;
import com.accompany.common.status.BusiStatus;
@@ -51,7 +51,7 @@ public class FamilyManageAdminController extends BaseController {
throw new AdminServiceException(BusiStatus.PARAMERROR);
}
Integer adminId = getAdminId();
service.createFamily(erbanNo, referrer, inviteErbanNo);
service.createFamily(erbanNo, referrer, inviteErbanNo, adminId);
adminLogService.insertLog(adminId,getClass().getCanonicalName(),
"create family","params===>>erbanNo:"+erbanNo + ",referrer:" + referrer + ",inviteErbanNo:"+ inviteErbanNo);
return BusiResult.success();

6
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperAdminController.java
View File

@@ -81,16 +81,16 @@ public class GuildSuperAdminController extends BaseController {
@ApiOperation(value = "查询公会信息",httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "partitionId", value = "分区id"),
// @ApiImplicitParam(name = "partitionId", value = "分区id"),
@ApiImplicitParam(name = "familyId", value = "家族id"),
@ApiImplicitParam(name = "erbanNo", value = "家族长erbanNo"),
@ApiImplicitParam(name = "pageNum", value = "页码", required = true),
@ApiImplicitParam(name = "pageSize", value = "页长", required = true)
})
@GetMapping("/pageFamily")
public BusiResult<PageResult<FamilyAdminVo>> pageFamily(Integer partitionId, Integer familyId, Long erbanNo,
public BusiResult<PageResult<FamilyAdminVo>> pageFamily(Integer familyId, Long erbanNo,
long pageNum, long pageSize){
Page<FamilyAdminVo> page = guildSuperAdminService.pageFamily(partitionId, familyId, erbanNo, pageNum, pageSize, getAdminId());
Page<FamilyAdminVo> page = guildSuperAdminService.pageFamily(familyId, erbanNo, pageNum, pageSize, getAdminId());
return BusiResult.success(new PageResult<>(page));
}

2
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/family/Family.java
View File

@@ -39,4 +39,6 @@ public class Family {
* 邀请人证明
*/
private String inviteCheck;
private Integer adminId;
}