## 报单赠送详情返回会员姓名
This commit is contained in:
parent
2049e0e2b1
commit
9033a82434
|
|
@ -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<AcBaseAuthority> {
|
|||
*/
|
||||
Set<Long> queryPlace(@Param("paramList") Set<String> paramList, @Param("pkMember") Long pkMember);
|
||||
|
||||
List<AcBaseAuthorityVO> listAuthorityAndMemberName(@Param("pkBaseId") Long pkBaseId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<AcBaseAuthority> {
|
|||
*/
|
||||
boolean checkAuthority(Long pkMember, String memberCode, Long pkBaseId);
|
||||
|
||||
List<AcBaseAuthorityVO> listAuthorityAndMemberName(Long pkBaseId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<AcBaseAuthorityMappe
|
|||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<AcBaseAuthorityVO> listAuthorityAndMemberName(Long pkBaseId) {
|
||||
return baseMapper.listAuthorityAndMemberName(pkBaseId);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<AcDeclaratio
|
|||
@Override
|
||||
public AjaxResult getDetail(Integer pkId) {
|
||||
AcBaseConfig baseConfig = baseConfigService.getById(pkId);
|
||||
AcDeclarationDetailParam activityParam = BeanUtil.copyProperties(baseConfig, AcDeclarationDetailParam.class);
|
||||
AcDeclarationDetailVO acDeclarationDetailVO = BeanUtil.copyProperties(baseConfig, AcDeclarationDetailVO.class);
|
||||
|
||||
List<AcDeclarationGiftConfig> list = baseMapper.selectList(new LambdaQueryWrapper<AcDeclarationGiftConfig>()
|
||||
.eq(AcDeclarationGiftConfig::getPkBaseId, pkId)
|
||||
|
|
@ -88,11 +87,11 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl<AcDeclaratio
|
|||
acDeclarationConfigParams.add(acDeclarationConfigParam);
|
||||
});
|
||||
// 添加权限控制信息
|
||||
List<AcBaseAuthority> acBaseAuthorities = iAcBaseAuthorityService.listAuthority(baseConfig.getPkId());
|
||||
activityParam.setAuthorityList(acBaseAuthorities);
|
||||
activityParam.setAcDeclarationConfigParams(acDeclarationConfigParams);
|
||||
activityParam.setPkBaseId(baseConfig.getPkId());
|
||||
return AjaxResult.success(activityParam);
|
||||
List<AcBaseAuthorityVO> acBaseAuthorities = iAcBaseAuthorityService.listAuthorityAndMemberName(baseConfig.getPkId());
|
||||
acDeclarationDetailVO.setAuthorityList(acBaseAuthorities);
|
||||
acDeclarationDetailVO.setAcDeclarationConfigParams(acDeclarationConfigParams);
|
||||
acDeclarationDetailVO.setPkBaseId(baseConfig.getPkId());
|
||||
return AjaxResult.success(acDeclarationDetailVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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<AcBaseAuthority> authorityList;
|
||||
private List<AcBaseAuthorityVO> authorityList;
|
||||
|
||||
/**
|
||||
* 是否强制弹框 0 是 1 否
|
||||
|
|
@ -57,5 +57,12 @@
|
|||
connect by cm.pk_id = prior cm.pk_place_parent
|
||||
</foreach>
|
||||
</select>
|
||||
<select id="listAuthorityAndMemberName" resultType="com.hzs.activity.declaration.vo.AcBaseAuthorityVO">
|
||||
select aba.*,cm.MEMBER_CODE
|
||||
from AC_BASE_AUTHORITY aba
|
||||
LEFT JOIN CU_MEMBER cm on aba.MEMBER_CODE = cm.MEMBER_CODE
|
||||
where aba.del_flag = 0
|
||||
and aba.pk_base_id = #{pkBaseId}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue