diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java index da68fc76..8cba68bc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 考核类型 - * @Author: sui q - * @Time: 2022/10/28 17:07 - * @Classname: EAssessmentType - * @PackageName: com.hzs.common.core.enums + * 考核类型 */ @AllArgsConstructor @Getter @@ -26,10 +22,6 @@ public enum EAssessmentType { * 2=不考核 */ NO_ASSESSMENT(2, "不考核", 0, EnumsPrefixConstants.ASSESSMENT_TYPE + 2), - /** - * 乐享优选考核 - */ - LENJOY_ASSESS(4, "优选考核", 0, EnumsPrefixConstants.ASSESSMENT_TYPE + 4), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java index 36994637..ad90478a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 变化类型,考核业绩变化明细表 - * @Author: sui q - * @Time: 2022/10/28 17:03 - * @Classname: EChangeType - * @PackageName: com.hzs.common.core.enums + * 变化类型,考核业绩变化明细表 */ @AllArgsConstructor @Getter @@ -31,14 +27,6 @@ public enum EChangeType { * 3=分红考核扣除 */ SHARE_ASSESSMENT_DEDUCT(3, "分红考核扣除", 0, EnumsPrefixConstants.CHANGE_TYPE + 3), - /** - * 4=优选考核新增 - */ - LENJOY_ASSESSMENT_ADD(4, "优选考核新增", 1, EnumsPrefixConstants.CHANGE_TYPE + 4), - /** - * 5=优选考核扣除 - */ - LENJOY_ASSESSMENT_DEDUCT(5, "优选考核扣除", 1, EnumsPrefixConstants.CHANGE_TYPE + 5), ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index ab60bb4f..6ee03db3 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 操作业务 - * @Author: jiang chao - * @Time: 2023/4/26 14:08 - * @Classname: EOperationBusiness - * @PackageName: com.hzs.common.core.enums + * 操作业务 */ @AllArgsConstructor @Getter @@ -347,7 +343,6 @@ public enum EOperationBusiness { TRANSFER_ACCOUNT_WHITE("转账账户白名单"), - RANGE_STORE("乐享店铺配置"), CU_MEMBER_RETAIL_REGION("会员收益区域配置"), NOT_USED_REGION_AREA("未使用收益区域"), @@ -497,8 +492,6 @@ public enum EOperationBusiness { MONTHLY_JOB_LEVEL("月度职级名单查询"), MEMBER_RISK_CONTROL("K值风控设置"), MEMBER_RETAIL_STAT("收益区域数据"), - //////////////////////////店铺系统///////////////////////////// - SHOP_INFO("店铺"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationMethod.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationMethod.java index 0a8635b0..e80a853b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationMethod.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationMethod.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 操作方法 - * Author: jiang chao - * Time: 2022/9/14 16:23 - * Classname: EMethodType - * PackageName: com.hzs.common.core.enums + * 操作方法 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index 7cbb55f7..2d363a85 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 操作菜单 - * Author: jiang chao - * Time: 2022/9/19 11:07 - * Classname: EModuleType - * PackageName: com.hzs.common.core.enums + * 操作菜单 */ @AllArgsConstructor @Getter @@ -231,7 +227,6 @@ public enum EOperationModule { BDPURPOSE_CONFIG("领用用途配置"), AUTHORITY_CONTROL("会员控制配置"), - RANGE_STORE("乐享店铺配置"), CU_MEMBER_RETAIL_REGION("会员收益区域配置"), NOT_USED_REGION_AREA("未使用收益区域"), @@ -502,12 +497,6 @@ public enum EOperationModule { SUPPLIER_GOODS("供应商商品"), - //////////////////////////店铺系统///////////////////////////// - SHOP_INFO("店铺"), - SHOP_SYS_CONFIG("参数配置"), - SHOP_MEMBER("电务会员"), - MAKER_SPACE_STORE("门店发起人数据"), - ; /** diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/ext/CuRangeStoreExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/ext/CuRangeStoreExt.java deleted file mode 100644 index 68348bc3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/ext/CuRangeStoreExt.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.common.domain.member.base.ext; - -import com.hzs.common.domain.member.base.CuRangeStore; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @Description: 会员乐享店铺扩展类 - * @Author: jiang chao - * @Time: 2024/10/29 10:14 - * @Classname: CuRangeStoreExt - * @PackageName: com.hzs.common.domain.member.base.ext - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class CuRangeStoreExt extends CuRangeStore { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 真实奖衔 - */ - private String awardsName; - -} diff --git a/bd-third/pom.xml b/bd-third/pom.xml index 8267af3e..82004846 100644 --- a/bd-third/pom.xml +++ b/bd-third/pom.xml @@ -135,12 +135,6 @@ dg-java-sdk - - - org.springframework.boot - spring-boot-starter-mail - - com.alipay.sdk