## 商品指定某个会员可见;
This commit is contained in:
parent
e94707f6fe
commit
011147e6e3
|
@ -2771,11 +2771,14 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
|||
Set<WaresAuthorityParentParam> waresAuthorityParentParamList = new HashSet<>();
|
||||
// 安置查询
|
||||
Set<WaresAuthorityParentParam> waresAuthorityPlaceParamList = new HashSet<>();
|
||||
// 指定会员
|
||||
Set<Long> pkMemberList = new HashSet<>();
|
||||
|
||||
for (ShowWaresDTO showWaresDTO : showWaresDTOS) {
|
||||
if (CollectionUtil.isNotEmpty(showWaresDTO.getWaresAuthorityList())) {
|
||||
for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) {
|
||||
if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) {
|
||||
// 血缘关系
|
||||
WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder()
|
||||
.pkMember(bw.getPkMember())
|
||||
.loginMember(showWaresDTO.getLoginMember())
|
||||
|
@ -2783,12 +2786,17 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
|||
waresAuthorityParentParamList.add(waresAuthorityParentParam);
|
||||
}
|
||||
if (bw.getAuthorityType() == EWaresPermissionType.PLACE_ALLWO.getValue() || bw.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) {
|
||||
// 安置关系
|
||||
WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder()
|
||||
.pkMember(bw.getPkMember())
|
||||
.loginMember(showWaresDTO.getLoginMember())
|
||||
.build();
|
||||
waresAuthorityPlaceParamList.add(waresAuthorityParentParam);
|
||||
}
|
||||
if (bw.getAuthorityType() == EWaresPermissionType.MEMBER.getValue()) {
|
||||
// 指定会员可见
|
||||
pkMemberList.add(bw.getPkMember());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2821,6 +2829,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
|||
} else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) {
|
||||
// 安置禁止
|
||||
isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember());
|
||||
} else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.MEMBER.getValue()) {
|
||||
// 指定会员可见
|
||||
isShowWares = pkMemberList.contains(showWaresDTO.getLoginMember());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -790,7 +790,7 @@ public class EnumsController extends BaseController {
|
|||
public AjaxResult getEWaresPermissionTypeList() {
|
||||
List<EnumEntity> enumEntityList = new ArrayList<>();
|
||||
for (EWaresPermissionType value : EWaresPermissionType.values()) {
|
||||
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ENU_WARES));
|
||||
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
|
||||
}
|
||||
return AjaxResult.success(enumEntityList);
|
||||
}
|
||||
|
|
|
@ -587,10 +587,6 @@ public class EnumsPrefixConstants {
|
|||
*/
|
||||
public static final String ENU_VERIFY = "ENU_VERIFY_T_";
|
||||
|
||||
/**
|
||||
* 商品权限类型枚举
|
||||
*/
|
||||
public static final String ENU_WARES = "ENU_WARES_P_";
|
||||
/**
|
||||
* 商品类型枚举
|
||||
*/
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package com.hzs.common.core.enums;
|
||||
|
||||
import com.hzs.common.core.constant.EnumsPrefixConstants;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
|
@ -11,29 +10,34 @@ import lombok.Getter;
|
|||
@Getter
|
||||
public enum EWaresPermissionType {
|
||||
|
||||
/**
|
||||
* 指定会员
|
||||
*/
|
||||
MEMBER(6, "指定会员", 0),
|
||||
|
||||
/**
|
||||
* 1=血缘可见
|
||||
*/
|
||||
BLOOD_ALLOW(1, "血缘可见", 0, EnumsPrefixConstants.ENU_WARES + "1"),
|
||||
BLOOD_ALLOW(1, "血缘可见", 0),
|
||||
/**
|
||||
* 2=血缘禁止
|
||||
*/
|
||||
BLOOD_STOP(2, "血缘禁止", 0, EnumsPrefixConstants.ENU_WARES + "2"),
|
||||
BLOOD_STOP(2, "血缘禁止", 0),
|
||||
|
||||
/**
|
||||
* 安置可见
|
||||
*/
|
||||
PLACE_ALLWO(3, "安置可见", 0, EnumsPrefixConstants.ENU_WARES + "3"),
|
||||
|
||||
PLACE_ALLWO(3, "安置可见", 0),
|
||||
/**
|
||||
* 安置禁止
|
||||
*/
|
||||
PLACE_STOP(4, "安置禁止", 0, EnumsPrefixConstants.ENU_WARES + "4"),
|
||||
PLACE_STOP(4, "安置禁止", 0),
|
||||
|
||||
/**
|
||||
* 全部
|
||||
*/
|
||||
AUTH_ORITY_TYPE(5, "全部", 0, EnumsPrefixConstants.ENU_WARES + "5"),
|
||||
AUTH_ORITY_TYPE(5, "全部", 0),
|
||||
|
||||
;
|
||||
|
||||
/**
|
||||
|
@ -48,10 +52,6 @@ public enum EWaresPermissionType {
|
|||
* 是否启用(0=是,1=否) -- 来源EYesNo
|
||||
*/
|
||||
private final int enable;
|
||||
/**
|
||||
* 国际化翻译key值
|
||||
*/
|
||||
private final String key;
|
||||
|
||||
/**
|
||||
* @param value 枚举值
|
||||
|
|
Loading…
Reference in New Issue