From 9033a82434dda9d755e590261fb88db452ac2f35 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Mon, 3 Nov 2025 10:05:06 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8A=A5=E5=8D=95=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E4=BC=9A=E5=91=98=E5=A7=93?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/AcBaseAuthorityMapper.java | 2 + .../base/service/IAcBaseAuthorityService.java | 2 + .../impl/AcBaseAuthorityServiceImpl.java | 7 +++ .../AcDeclarationGiftConfigServiceImpl.java | 17 +++---- .../declaration/vo/AcBaseAuthorityVO.java | 51 +++++++++++++++++++ .../AcDeclarationDetailVO.java} | 9 ++-- .../activity/base/AcBaseAuthorityMapper.xml | 7 +++ 7 files changed, 81 insertions(+), 14 deletions(-) create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcBaseAuthorityVO.java rename bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/{param/AcDeclarationDetailParam.java => vo/AcDeclarationDetailVO.java} (88%) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcBaseAuthorityMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcBaseAuthorityMapper.java index bccb4e85..9466e364 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcBaseAuthorityMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcBaseAuthorityMapper.java @@ -1,6 +1,7 @@ package com.hzs.activity.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.activity.declaration.vo.AcBaseAuthorityVO; import com.hzs.common.domain.activity.base.AcBaseAuthority; import org.apache.ibatis.annotations.Param; @@ -48,4 +49,5 @@ public interface AcBaseAuthorityMapper extends BaseMapper { */ Set queryPlace(@Param("paramList") Set paramList, @Param("pkMember") Long pkMember); + List listAuthorityAndMemberName(@Param("pkBaseId") Long pkBaseId); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseAuthorityService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseAuthorityService.java index 6455dfab..c0904afe 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseAuthorityService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseAuthorityService.java @@ -1,6 +1,7 @@ package com.hzs.activity.base.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.hzs.activity.declaration.vo.AcBaseAuthorityVO; import com.hzs.common.domain.activity.base.AcBaseAuthority; import java.util.List; @@ -41,4 +42,5 @@ public interface IAcBaseAuthorityService extends IService { */ boolean checkAuthority(Long pkMember, String memberCode, Long pkBaseId); + List listAuthorityAndMemberName(Long pkBaseId); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseAuthorityServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseAuthorityServiceImpl.java index cee11255..13fb1335 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseAuthorityServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseAuthorityServiceImpl.java @@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollectionUtil; import com.hzs.activity.base.mapper.AcBaseAuthorityMapper; import com.hzs.activity.base.service.IAcBaseAuthorityService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.activity.declaration.vo.AcBaseAuthorityVO; import com.hzs.common.core.enums.EWaresPermissionType; import com.hzs.common.domain.activity.base.AcBaseAuthority; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -88,4 +90,9 @@ public class AcBaseAuthorityServiceImpl extends ServiceImpl listAuthorityAndMemberName(Long pkBaseId) { + return baseMapper.listAuthorityAndMemberName(pkBaseId); + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java index 2fac52ed..26221c4f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java @@ -2,7 +2,6 @@ package com.hzs.activity.declaration.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -12,13 +11,13 @@ import com.hzs.activity.base.service.IAcBaseConfigService; import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper; import com.hzs.activity.declaration.param.AcDeclarationConfigParam; -import com.hzs.activity.declaration.param.AcDeclarationDetailParam; +import com.hzs.activity.declaration.vo.AcBaseAuthorityVO; +import com.hzs.activity.declaration.vo.AcDeclarationDetailVO; import com.hzs.activity.declaration.param.AcDeclarationParam; import com.hzs.activity.declaration.param.AcDeclarationProductParam; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; -import com.hzs.activity.recommend.param.AcRecommendParam; import com.hzs.common.core.enums.*; import com.hzs.common.domain.activity.base.AcBaseAuthority; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig; @@ -74,7 +73,7 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl list = baseMapper.selectList(new LambdaQueryWrapper() .eq(AcDeclarationGiftConfig::getPkBaseId, pkId) @@ -88,11 +87,11 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl acBaseAuthorities = iAcBaseAuthorityService.listAuthority(baseConfig.getPkId()); - activityParam.setAuthorityList(acBaseAuthorities); - activityParam.setAcDeclarationConfigParams(acDeclarationConfigParams); - activityParam.setPkBaseId(baseConfig.getPkId()); - return AjaxResult.success(activityParam); + List acBaseAuthorities = iAcBaseAuthorityService.listAuthorityAndMemberName(baseConfig.getPkId()); + acDeclarationDetailVO.setAuthorityList(acBaseAuthorities); + acDeclarationDetailVO.setAcDeclarationConfigParams(acDeclarationConfigParams); + acDeclarationDetailVO.setPkBaseId(baseConfig.getPkId()); + return AjaxResult.success(acDeclarationDetailVO); } @Override diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcBaseAuthorityVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcBaseAuthorityVO.java new file mode 100644 index 00000000..b31904fa --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcBaseAuthorityVO.java @@ -0,0 +1,51 @@ +package com.hzs.activity.declaration.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AcBaseAuthorityVO { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long pkId; + + /** + * 活动基本配置主键 + */ + private Long pkBaseId; + + /** + * 权限类型 (1=血缘可见,2=血缘禁止,3=安置可见,4=安置禁止,5=全部) + */ + private Integer authorityType; + + /** + * 会员编号 + */ + private String memberCode; + + /** + * 会员姓名 + */ + private String memberName; + + /** + * 逻辑删除 (0=未删除，1已删除) + */ + @JsonIgnore + @TableLogic + private Integer delFlag; + + +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationDetailParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationDetailVO.java similarity index 88% rename from bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationDetailParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationDetailVO.java index 473bf01e..ee904e97 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationDetailParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationDetailVO.java @@ -1,9 +1,8 @@ -package com.hzs.activity.declaration.param; +package com.hzs.activity.declaration.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.activity.add.param.AcAddUpgradeConfigParam; +import com.hzs.activity.declaration.param.AcDeclarationConfigParam; import com.hzs.common.domain.activity.base.AcBaseAuthority; -import com.hzs.common.domain.activity.base.AcBaseConfig; import com.hzs.common.domain.activity.base.AcGoalMemberConfig; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class AcDeclarationDetailParam implements Serializable { +public class AcDeclarationDetailVO implements Serializable { private static final long serialVersionUID = 5874438017657659289L; /** @@ -112,7 +111,7 @@ public class AcDeclarationDetailParam implements Serializable { /** * 权限配置列表 */ - private List authorityList; + private List authorityList; /** * 是否强制弹框 0 是 1 否 diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcBaseAuthorityMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcBaseAuthorityMapper.xml index 5ef62d21..8adbf2de 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcBaseAuthorityMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcBaseAuthorityMapper.xml @@ -57,5 +57,12 @@ connect by cm.pk_id = prior cm.pk_place_parent +