From 1234620b50a8aed6f6d29c92050a74b6ee080b6c Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 10 Jul 2025 17:37:38 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E8=B0=83=E6=95=B4=EF=BC=9B=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CuMemberServiceImpl.java | 3 +++ .../enums/controller/EnumsController.java | 6 +++--- .../core/constant/EnumsPrefixConstants.java | 5 ----- .../com/hzs/common/core/enums/ECardType.java | 21 +++++++------------ .../hzs/common/core/enums/EChargeType.java | 16 ++++---------- .../com/hzs/common/core/enums/ETradeType.java | 5 +---- 6 files changed, 18 insertions(+), 38 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 634ac26e..bfd8e05a 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 @@ -2833,6 +2833,9 @@ public class CuMemberServiceImpl extends ServiceImpl i // 指定会员可见 isShowWares = pkMemberList.contains(showWaresDTO.getLoginMember()); } + if (isShowWares) { + break; + } } } 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 b63b8a88..49215d2b 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 @@ -1271,7 +1271,7 @@ public class EnumsController extends BaseController { public AjaxResult getChargeType() { List enumEntityList = new ArrayList<>(); for (EChargeType value : EChargeType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.CHARGE_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -1285,7 +1285,7 @@ public class EnumsController extends BaseController { public AjaxResult getETradeType() { List enumEntityList = new ArrayList<>(); for (ETradeType value : ETradeType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.TRADE_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -1299,7 +1299,7 @@ public class EnumsController extends BaseController { public AjaxResult getECardType() { List enumEntityList = new ArrayList<>(); for (ECardType value : ECardType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.CARD_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } 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 9e8f7954..3ac2e04e 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 @@ -601,11 +601,6 @@ public class EnumsPrefixConstants { */ public static final String E_PRODUCT_ATTR_TYPE = "ENU_PRODUCT_A_T_"; - /** - * 收费方式 - */ - public static final String CHARGE_TYPE = "ENU_CHARGE_TYPE_"; - /** * 产品发货渠道 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java index a108586d..2da0b542 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 证件类型枚举 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -16,28 +14,27 @@ public enum ECardType { /** * 身份证 */ - CARD(1, "身份证", 0, EnumsPrefixConstants.CARD_TYPE + "1"), + CARD(1, "身份证", 0), /** * 军官证 */ - OFFICER(2, "军官证", 0, EnumsPrefixConstants.CARD_TYPE + "2"), + OFFICER(2, "军官证", 0), /** * 学生证 */ - STUDENT (3, "学生证", 0, EnumsPrefixConstants.CARD_TYPE + "3"), + STUDENT(3, "学生证", 0), /** * 驾驶证 */ - DRIVE(4, "驾驶证", 0, EnumsPrefixConstants.CARD_TYPE + "4"), + DRIVE(4, "驾驶证", 0), /** * 护照 */ - PASSPORT(5, "护照", 0, EnumsPrefixConstants.CARD_TYPE + "5"), - + PASSPORT(5, "护照", 0), ; @@ -53,14 +50,10 @@ public enum ECardType { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - public static String getCardType(int value){ + public static String getCardType(int value) { for (ECardType eCardType : ECardType.values()) { - if (eCardType.getValue() == value){ + if (eCardType.getValue() == value) { return eCardType.getLabel(); } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java index bb1af0ef..08bce9df 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java @@ -5,21 +5,17 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 邮费设置表 收费方式枚举 - * @Author: yuhui - * @Time: 2022/10/27 9:42 - * @Classname: EChargeType - * @PackageName: com.hzs.common.core.enums + * 邮费设置表 收费方式枚举 */ @AllArgsConstructor @Getter public enum EChargeType { - WEIGHT(1, "按重量", 0, EnumsPrefixConstants.CHARGE_TYPE + "1"), + WEIGHT(1, "按重量", 0), - VOLUME(2, "按体积", 0, EnumsPrefixConstants.CHARGE_TYPE + "2"), + VOLUME(2, "按体积", 0), - PIECE(3, "按件数", 0, EnumsPrefixConstants.CHARGE_TYPE + "3"); + PIECE(3, "按件数", 0); /** * 实际值 @@ -33,8 +29,4 @@ public enum EChargeType { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java index dcb13eb0..d4316b17 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java @@ -10,10 +10,7 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum ETradeType { - //交易类型后继根据需求添加 - // 交易类型：10充值, 11转账, 12收益发放, 13转换, 14提现, 15提现撤回, 16提现拒绝, 17注册订单, 18升级订单, 19复购订单, - // * 20圣宝云代注册, 21圣宝云代升级, 22圣宝云代复购, 23商城vip, 24返还补偿鼓励币, 25返还本金鼓励币, 26扣减抢拼现金币, 27撤单返钱, 28返还本金, - // * 30抢拼专区, 31兑换专区, 50发放复购券, 51复购券撤单, 52使用复购券, 54圣宝云代使用复购券 + /** * 消费类 */