From 6bf49f16ceb4392a841d548a28cc7e3770e91d35 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 3 Jul 2025 13:47:21 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E5=AF=B9=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E4=BC=9A=E5=91=98=E5=8F=AF=E8=A7=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CuMemberServiceImpl.java | 11 ++ .../enums/controller/EnumsController.java | 118 +++++++++++------- .../core/constant/EnumsPrefixConstants.java | 10 -- .../com/hzs/common/core/enums/ECycle.java | 24 ++-- .../core/enums/EWaresPermissionType.java | 30 ++--- 5 files changed, 104 insertions(+), 89 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index a1744025..be6a5416 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -2464,10 +2464,13 @@ public class CuMemberServiceImpl extends ServiceImpl i Set waresAuthorityParentParamList = new HashSet<>(); // 安置查询 Set waresAuthorityPlaceParamList = new HashSet<>(); + // 指定会员 + Set pkMemberList = new HashSet<>(); for (ShowWaresDTO showWaresDTO : showWaresDTOS) { 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()) @@ -2475,12 +2478,17 @@ public class CuMemberServiceImpl extends ServiceImpl 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()); + } } } @@ -2511,6 +2519,9 @@ public class CuMemberServiceImpl extends ServiceImpl 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()); } } resultMap.put(showWaresDTO.getPkWares(), isShowWares); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 9f286496..9205e2e2 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -222,7 +222,8 @@ public class EnumsController extends BaseController { } /** - * @description: 奖衔级别 + * 奖衔级别 + * * @author: zhang jing * @date: 2023/10/17 10:53 * @param: [] @@ -412,7 +413,8 @@ public class EnumsController extends BaseController { } /** - * @description: 直推配置取值枚举 + * 直推配置取值枚举 + * * @author: zhang jing * @date: 2023/6/2 16:32 * @param: [] @@ -428,7 +430,8 @@ public class EnumsController extends BaseController { } /** - * @description: 专区枚举list + * 专区枚举list + * * @author: zhang jing * @date: 2022/9/29 16:29 * @param: [] @@ -446,7 +449,8 @@ public class EnumsController extends BaseController { } /** - * @description: 控制类型枚举 + * 控制类型枚举 + * * @author: zhang jing * @date: 2024/6/24 10:47 * @param: [] @@ -462,7 +466,8 @@ public class EnumsController extends BaseController { } /** - * @description: 地区类型枚举 + * 地区类型枚举 + * * @author: zhang jing * @date: 2022/9/29 16:29 * @param: [] @@ -480,7 +485,8 @@ public class EnumsController extends BaseController { } /** - * @description: 专区枚举-消费配置专用 + * 专区枚举-消费配置专用 + * * @author: zhang jing * @date: 2023/5/8 15:10 * @param: [] @@ -496,7 +502,8 @@ public class EnumsController extends BaseController { } /** - * @description: 注水业绩枚举 + * 注水业绩枚举 + * * @author: zhang jing * @date: 2023/3/28 17:52 * @param: [] @@ -512,7 +519,8 @@ public class EnumsController extends BaseController { } /** - * @description: 注水方式枚举 + * 注水方式枚举 + * * @author: zhang jing * @date: 2023/4/11 14:52 * @param: [] @@ -528,7 +536,8 @@ public class EnumsController extends BaseController { } /** - * @description: 统计值枚举 + * 统计值枚举 + * * @author: zhang jing * @date: 2022/9/30 14:30 * @param: [] @@ -544,7 +553,8 @@ public class EnumsController extends BaseController { } /** - * @description: 注册权限 + * 注册权限 + * * @author: zhang jing * @date: 2022/9/30 14:57 * @param: [] @@ -560,7 +570,8 @@ public class EnumsController extends BaseController { } /** - * @description: 关系类型 + * 关系类型 + * * @author: zhang jing * @date: 2022/9/30 14:59 * @param: [] @@ -576,7 +587,8 @@ public class EnumsController extends BaseController { } /** - * @description: 极差类型 + * 极差类型 + * * @author: zhang jing * @date: 2022/9/30 15:18 * @param: [] @@ -593,7 +605,8 @@ public class EnumsController extends BaseController { /** - * @description: 计算类型 + * 计算类型 + * * @author: zhang jing * @date: 2022/9/30 15:24 * @param: [] @@ -609,7 +622,8 @@ public class EnumsController extends BaseController { } /** - * @description: 货币种类 + * 货币种类 + * * @author: zhang jing * @date: 2022/9/30 15:34 * @param: [] @@ -625,7 +639,8 @@ public class EnumsController extends BaseController { } /** - * @description: 账户状态（会员登录账户） + * 账户状态（会员登录账户） + * * @author: zhang jing * @date: 2022/9/30 15:38 * @param: [] @@ -641,7 +656,8 @@ public class EnumsController extends BaseController { } /** - * @description: 活动类型 + * 活动类型 + * * @author: zhang jing * @date: 2022/9/30 15:40 * @param: [] @@ -660,7 +676,8 @@ public class EnumsController extends BaseController { /** - * @description: 条码状态 + * 条码状态 + * * @author: zhang jing * @date: 2022/9/30 15:52 * @param: [] @@ -676,7 +693,8 @@ public class EnumsController extends BaseController { } /** - * @description: 会员类型 + * 会员类型 + * * @author: zhang jing * @date: 2022/9/30 16:26 * @param: [] @@ -692,7 +710,8 @@ public class EnumsController extends BaseController { } /** - * @description: 发货方式 + * 发货方式 + * * @author: zhang jing * @date: 2022/9/30 16:28 * @param: [] @@ -716,7 +735,8 @@ public class EnumsController extends BaseController { } /** - * @description: 发货状态 + * 发货状态 + * * @author: zhang jing * @date: 2022/9/30 16:30 * @param: [] @@ -732,7 +752,8 @@ public class EnumsController extends BaseController { } /** - * @description: 首页banner类型枚举类 + * 首页banner类型枚举类 + * * @author: zhang jing * @date: 2022/10/13 11:27 * @param: [] @@ -748,7 +769,8 @@ public class EnumsController extends BaseController { } /** - * @description: 转账特殊设置枚举 + * 转账特殊设置枚举 + * * @author: zhang jing * @date: 2022/10/21 9:58 * @param: [] @@ -764,7 +786,8 @@ public class EnumsController extends BaseController { } /** - * @description: 用户状态枚举 + * 用户状态枚举 + * * @author: zhang jing * @date: 2022/10/21 17:39 * @param: [] @@ -780,7 +803,8 @@ public class EnumsController extends BaseController { } /** - * @description: 钱包状态枚举 + * 钱包状态枚举 + * * @author: zhang jing * @date: 2022/10/21 17:41 * @param: [] @@ -796,23 +820,20 @@ public class EnumsController extends BaseController { } /** - * @description: 商品权限类型枚举 - * @author: zhang jing - * @date: 2022/10/21 17:44 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 商品权限类型枚举 **/ @GetMapping("/getEWaresPermissionTypeList") public AjaxResult getEWaresPermissionTypeList() { List 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); } /** - * @description: 是否经销商枚举类 + * 是否经销商枚举类 + * * @author: zhang jing * @date: 2022/10/21 17:46 * @param: [] @@ -828,7 +849,8 @@ public class EnumsController extends BaseController { } /** - * @description: 系统是否枚举类 + * 系统是否枚举类 + * * @author: zhang jing * @date: 2022/10/21 17:46 * @param: [] @@ -891,7 +913,7 @@ public class EnumsController extends BaseController { public AjaxResult getECycle() { List enumEntityList = new ArrayList<>(); for (ECycle value : ECycle.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.CYCLE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -1217,7 +1239,8 @@ public class EnumsController extends BaseController { */ /** - * @description: 奖项枚举类 + * 奖项枚举类 + * * @author: zhang jing * @date: 2022/11/9 19:54 * @param: [] @@ -1251,7 +1274,8 @@ public class EnumsController extends BaseController { /** - * @description: 公布日期、发布日期、可提现日期 枚举 + * 公布日期、发布日期、可提现日期 枚举 + * * @author: zhang jing * @date: 2022/11/9 19:55 * @param: [] @@ -1267,7 +1291,8 @@ public class EnumsController extends BaseController { } /** - * @description: 奖结算周期枚举 + * 奖结算周期枚举 + * * @author: zhang jing * @date: 2022/11/9 19:56 * @param: [] @@ -1341,7 +1366,8 @@ public class EnumsController extends BaseController { } /** - * @description: 订单来源枚举 + * 订单来源枚举 + * * @author: zhang jing * @date: 2022/11/17 14:56 * @param: [] @@ -1357,7 +1383,8 @@ public class EnumsController extends BaseController { } /** - * @description: 是否认证枚举 + * 是否认证枚举 + * * @author: zhang jing * @date: 2022/11/17 15:05 * @param: [] @@ -1373,7 +1400,8 @@ public class EnumsController extends BaseController { } /** - * @description: 会员有效状态枚举 + * 会员有效状态枚举 + * * @author: zhang jing * @date: 2022/11/17 15:05 * @param: [] @@ -1389,7 +1417,8 @@ public class EnumsController extends BaseController { } /** - * @description: 是否上传枚举 + * 是否上传枚举 + * * @author: zhang jing * @date: 2022/11/17 15:09 * @param: [] @@ -1405,7 +1434,8 @@ public class EnumsController extends BaseController { } /** - * @description: 钱包账户状态 + * 钱包账户状态 + * * @author: zhang jing * @date: 2022/9/30 15:38 * @param: [] @@ -2753,7 +2783,8 @@ public class EnumsController extends BaseController { } /** - * @description: 结算方式枚举 + * 结算方式枚举 + * * @author: zhang jing * @date: 2024/3/29 11:54 * @param: [] @@ -2828,7 +2859,8 @@ public class EnumsController extends BaseController { } /** - * @description: 联创数据报表类型枚举 + * 联创数据报表类型枚举 + * * @author: zhang jing * @date: 2025/2/27 10:46 * @param: [] diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java index 09223f7d..2c0ab31c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java @@ -579,11 +579,6 @@ public class EnumsPrefixConstants { * 用户状态 */ public static final String ENU_USER = "ENU_USER_S_"; - - /** - * 商品权限类型枚举 - */ - public static final String ENU_WARES = "ENU_WARES_P_"; /** * 商品类型枚举 */ @@ -628,11 +623,6 @@ public class EnumsPrefixConstants { */ public static final String EXEMPT_TYPE = "ENU_EXE_T_"; - /** - * 提现周期 - */ - public static final String CYCLE = "ENU_CYCLE_"; - /** * 提现状态 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java index 6b51280d..5c8940ba 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java @@ -1,13 +1,10 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; /** * 提现周期枚举类 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -16,32 +13,31 @@ public enum ECycle { /** * 周一 */ - MONDAY( 1, "周一", EnumsPrefixConstants.CYCLE + "1"), - + MONDAY(1, "周一"), /** * 周二 */ - TUESDAY( 2, "周二", EnumsPrefixConstants.CYCLE + "2"), + TUESDAY(2, "周二"), /** * 周三 */ - WEDNESDAY( 3, "周三", EnumsPrefixConstants.CYCLE + "3"), + WEDNESDAY(3, "周三"), /** * 周四 */ - THURSDAY( 4, "周四", EnumsPrefixConstants.CYCLE + "4"), + THURSDAY(4, "周四"), /** * 周五 */ - FRIDAY( 5, "周五", EnumsPrefixConstants.CYCLE + "5"), + FRIDAY(5, "周五"), /** * 周六 */ - SATURDAY( 6, "周六", EnumsPrefixConstants.CYCLE + "6"), + SATURDAY(6, "周六"), /** * 周日 */ - SUNDAY( 7, "周日", EnumsPrefixConstants.CYCLE + "7"), + SUNDAY(7, "周日"), ; @@ -54,11 +50,5 @@ public enum ECycle { * 显示标签 */ private final String label; - /** - * 国际化翻译key值 - */ - private final String key; - - } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java index f3cd55a6..0d1a702f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java @@ -1,45 +1,42 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; /** * 商品权限类型枚举 - * - * @author: sui q - * @time: 2022/8/27 10:26 - * @description: 商品权限类型 - * @classname: EWaresPermissionType - * @package_name: com.hzs.common.core.enums */ @AllArgsConstructor @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), ; /** @@ -54,14 +51,8 @@ public enum EWaresPermissionType { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; /** - * - * * @param value 枚举值 * @return */ @@ -73,4 +64,5 @@ public enum EWaresPermissionType { } return null; } + }