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/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index 56d039b0..5a8573cd 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -44,17 +44,17 @@ public enum ESpecialArea { /** * 注册专区 */ - SPECIAL_REGISTER_AREA(24, "乐学注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 24, 1, EMenuDetail.REGISTER_LXYK.getValue()), + SPECIAL_REGISTER_AREA(24, "乐学注册专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 24, 1, EMenuDetail.REGISTER_LXYK.getValue()), /** * 升级专区 */ - SPECIAL_UPGRADE_AREA(25, "乐学升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 25, 2, EMenuDetail.UPGRADE_LXYK.getValue()), + SPECIAL_UPGRADE_AREA(25, "乐学升级专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 25, 2, EMenuDetail.UPGRADE_LXYK.getValue()), /** * 乐学甄选 */ - SPECIAL_REPURCHASE_AREA(26, "乐学甄选", 0, EnumsPrefixConstants.SPECIAL_AREA + 26, 6, EMenuDetail.REPURCHASE_LXYK.getValue()), + SPECIAL_REPURCHASE_AREA(26, "乐学甄选", 1, EnumsPrefixConstants.SPECIAL_AREA + 26, 6, EMenuDetail.REPURCHASE_LXYK.getValue()), /** * 续约专区 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..e354911d 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圣宝云代使用复购券 + /** * 消费类 */ @@ -22,9 +19,6 @@ public enum ETradeType { REPURCHASE_ORDER(103, 0, "复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 103, EOrderType.REPURCHASE_ORDER.getValue()), PICK_ORDER(108, 0, "提货订单", 0, EnumsPrefixConstants.TRADE_TYPE + 108, EOrderType.PICK_ORDER.getValue()), CONSUME_ORDER(110, 0, "消费订单", 0, EnumsPrefixConstants.TRADE_TYPE + 110, EOrderType.CONSUME_ORDER.getValue()), - SPECIAL_REGISTER_ORDER(124, 0, "乐学易考注册订单", 0, EnumsPrefixConstants.TRADE_TYPE + 124, EOrderType.SPECIAL_REGISTER_ORDER.getValue()), - SPECIAL_UPGRADE_ORDER(125, 0, "乐学易考升级订单", 0, EnumsPrefixConstants.TRADE_TYPE + 125, EOrderType.SPECIAL_UPGRADE_ORDER.getValue()), - SPECIAL_REPURCHASE_ORDER(126, 0, "乐学易考复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 126, EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()), RENEWAL_ORDER(129, 0, "续约订单", 0, EnumsPrefixConstants.TRADE_TYPE + 129, EOrderType.RENEWAL_ORDER.getValue()), @@ -70,9 +64,6 @@ public enum ETradeType { REVOKE_REPURCHASE_ORDER(604, 0, "复购订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 604, -EOrderType.REPURCHASE_ORDER.getValue()), REVOKE_PICK_ORDER(609, 0, "提货订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 609, -EOrderType.PICK_ORDER.getValue()), REVOKE_CONSUME_ORDER(611, 0, "消费订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 611, -EOrderType.CONSUME_ORDER.getValue()), - REVOKE_SPECIAL_REGISTER_ORDER(622, 0, "乐学易考注册订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 622, -EOrderType.SPECIAL_REGISTER_ORDER.getValue()), - REVOKE_SPECIAL_UPGRADE_ORDER(623, 0, "乐学易考升级订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 623, -EOrderType.SPECIAL_UPGRADE_ORDER.getValue()), - REVOKE_SPECIAL_REPURCHASE_ORDER(624, 0, "乐学易考复购订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 624, -EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()), REVOKE_RENEWAL_ORDER(629, 0, "续约订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 629, -EOrderType.RENEWAL_ORDER.getValue()), REVOKE_RETAIL_TICKET_ORDER(645, 0, "自主购票撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 645, -EOrderType.RETAIL_TICKET.getValue()), ORDER_SELF_DELIVER(680, 0, "自提返还邮费", 0, EnumsPrefixConstants.TRADE_TYPE + 680, -99),