From 304ccac4319142cad40e2c047f559d2e73c41316 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 8 Jul 2025 14:41:41 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/controller/EnumsController.java | 210 +++++------------- .../hzs/common/core/enums/ESignSource.java | 6 +- .../hzs/common/core/enums/ESpecialArea.java | 10 +- .../hzs/common/core/enums/EUpgradeType.java | 1 + .../hzs/common/core/enums/EnableStatus.java | 8 +- .../common/core/web/domain/EnumEntity.java | 8 +- 6 files changed, 65 insertions(+), 178 deletions(-) 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 f8e5608b..ee0f7181 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 @@ -42,27 +42,23 @@ import java.util.Map; @RequestMapping("/pub/enums") public class EnumsController extends BaseController { - private IBdSystemConfigService bdSystemConfigService; - @Autowired - public void setBdSystemConfigService(IBdSystemConfigService bdSystemConfigService) { - this.bdSystemConfigService = bdSystemConfigService; - } + private IBdSystemConfigService bdSystemConfigService; @Autowired private IBdAccountService iBdAccountService; @Autowired - private IBdGradeService gradeService; + private IBdGradeService iBdGradeService; @Autowired - private IBdAwardsService awardsService; + private IBdAwardsService iBdAwardsService; @Autowired - private IBdCountryService countryService; + private IBdCountryService iBdCountryService; @Autowired - private IBdServiceChargeService serviceChargeService; + private IBdServiceChargeService iBdServiceChargeService; @Autowired private IBdDeliveryService iBdDeliveryService; @Autowired - private IBdBonusItemsService bonusItemsService; + private IBdBonusItemsService iBdBonusItemsService; @DubboReference IMenuColumnServiceApi iMenuColumnServiceApi; @@ -106,7 +102,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EApprovalBusiness value : EApprovalBusiness.values()) { if (value.getValue() == 233 || value.getValue() == 234) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.APPROVAL_BUSINESS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } @@ -123,7 +119,7 @@ public class EnumsController extends BaseController { public AjaxResult AssessmentType() { List enumEntityList = new ArrayList<>(); for (EAssessmentType value : EAssessmentType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ASSESSMENT_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -137,7 +133,7 @@ public class EnumsController extends BaseController { public AjaxResult incomeStatus() { List enumEntityList = new ArrayList<>(); for (EIncomeStatus value : EIncomeStatus.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.INCOME_STATUS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -153,7 +149,7 @@ public class EnumsController extends BaseController { for (EApproveStatus value : EApproveStatus.values()) { if (EApproveStatus.WAIT_SUBMIT.getValue() != value.getValue() && EApproveStatus.ALREADY_SUBMIT.getValue() != value.getValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.APPROVE_STATUS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -170,7 +166,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EApproveStatus value : EApproveStatus.values()) { if (EApproveStatus.WAIT_SUBMIT.getValue() != value.getValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.APPROVE_STATUS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -186,7 +182,7 @@ public class EnumsController extends BaseController { public AjaxResult approvalStatusAll() { List enumEntityList = new ArrayList<>(); for (EApproveStatus value : EApproveStatus.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.APPROVE_STATUS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -200,7 +196,7 @@ public class EnumsController extends BaseController { public AjaxResult approvalOperation() { List enumEntityList = new ArrayList<>(); for (EApproveOperation value : EApproveOperation.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.APPROVE_OPERATION)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -215,7 +211,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EAwards value : EAwards.values()) { if (value.getEnable() == EYesNo.YES.getIntValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.AWARDS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -223,18 +219,13 @@ public class EnumsController extends BaseController { /** * 奖衔级别 - * - * @author: zhang jing - * @date: 2023/10/17 10:53 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/awardsLevelList") public AjaxResult awardsLevelList() { List enumEntityList = new ArrayList<>(); for (EAwardsLevel value : EAwardsLevel.values()) { if (value.getEnable() == EYesNo.YES.getIntValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.AWARDS_LEVEL)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -249,7 +240,7 @@ public class EnumsController extends BaseController { public AjaxResult awardsAllList() { List enumEntityList = new ArrayList<>(); for (EAwards value : EAwards.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.AWARDS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -264,7 +255,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EGrade value : EGrade.values()) { if (value.getEnable() == EnableStatus.ENABLE.getValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.GRADE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -279,7 +270,7 @@ public class EnumsController extends BaseController { public AjaxResult signSource() { List enumEntityList = new ArrayList<>(); for (ESignSource value : ESignSource.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SIGN_SOURCE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -292,8 +283,8 @@ public class EnumsController extends BaseController { @GetMapping("/sign-source-first-two") public AjaxResult signSourceFirstTwo() { List enumEntityList = new ArrayList<>(); - enumEntityList.add(new EnumEntity(ESignSource.MANAGE.getValue(), ESignSource.MANAGE.getLabel(), EnumsPrefixConstants.SIGN_SOURCE)); - enumEntityList.add(new EnumEntity(ESignSource.MEMBER.getValue(), ESignSource.MEMBER.getLabel(), EnumsPrefixConstants.SIGN_SOURCE)); + enumEntityList.add(new EnumEntity(ESignSource.MANAGE.getValue(), ESignSource.MANAGE.getLabel())); + enumEntityList.add(new EnumEntity(ESignSource.MEMBER.getValue(), ESignSource.MEMBER.getLabel())); return AjaxResult.success(enumEntityList); } @@ -306,7 +297,7 @@ public class EnumsController extends BaseController { public AjaxResult permissionType() { List enumEntityList = new ArrayList<>(); for (EPermissionType value : EPermissionType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.PERMISSION_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -320,7 +311,7 @@ public class EnumsController extends BaseController { public AjaxResult orderBusiness() { List enumEntityList = new ArrayList<>(); for (EOrderBusiness value : EOrderBusiness.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ORDER_BUSINESS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -334,7 +325,7 @@ public class EnumsController extends BaseController { public AjaxResult orderUpBusiness() { List enumEntityList = new ArrayList<>(); for (EOrderUpBusiness value : EOrderUpBusiness.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ORDER_UP_BUSINESS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -349,7 +340,7 @@ public class EnumsController extends BaseController { public AjaxResult batchType() { List enumEntityList = new ArrayList<>(); for (EBatchType value : EBatchType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.BATCH_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -363,7 +354,7 @@ public class EnumsController extends BaseController { public AjaxResult currencyType() { List enumEntityList = new ArrayList<>(); for (ECurrencyType value : ECurrencyType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.CURRENCY_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -377,7 +368,7 @@ public class EnumsController extends BaseController { public AjaxResult AchievementType() { List enumEntityList = new ArrayList<>(); for (EAchievementType value : EAchievementType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ACHIEVEMENT_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -392,7 +383,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EAchievementType value : EAchievementType.values()) { if (value.getValue() == EAchievementType.FIRST_PURCHASE.getValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ACHIEVEMENT_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -407,42 +398,32 @@ public class EnumsController extends BaseController { public AjaxResult algebra() { List enumEntityList = new ArrayList<>(); for (EAlgebra value : EAlgebra.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ALGEBRA)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } /** * 直推配置取值枚举 - * - * @author: zhang jing - * @date: 2023/6/2 16:32 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/take-value-type") public AjaxResult takeValueType() { List enumEntityList = new ArrayList<>(); for (ETakeValueType value : ETakeValueType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.TAKE_VALUE_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } /** * 专区枚举list - * - * @author: zhang jing - * @date: 2022/9/29 16:29 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo **/ @GetMapping("/special-area") public AjaxResult specialArea() { List enumEntityList = new ArrayList<>(); for (ESpecialArea value : ESpecialArea.values()) { if (value.getEnable() == EnableStatus.ENABLE.getValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SPECIAL_AREA)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -450,11 +431,6 @@ public class EnumsController extends BaseController { /** * 控制类型枚举 - * - * @author: zhang jing - * @date: 2024/6/24 10:47 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/authority-control-type") public AjaxResult authorityControlType() { @@ -467,11 +443,6 @@ public class EnumsController extends BaseController { /** * 地区类型枚举 - * - * @author: zhang jing - * @date: 2022/9/29 16:29 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo **/ @GetMapping("/areaType") public AjaxResult areaType() { @@ -486,11 +457,6 @@ public class EnumsController extends BaseController { /** * 专区枚举-消费配置专用 - * - * @author: zhang jing - * @date: 2023/5/8 15:10 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/special-area-consume") public AjaxResult specialAreaConsume() { @@ -503,11 +469,6 @@ public class EnumsController extends BaseController { /** * 注水业绩枚举 - * - * @author: zhang jing - * @date: 2023/3/28 17:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/member-achieve") public AjaxResult memberAchieve() { @@ -520,11 +481,6 @@ public class EnumsController extends BaseController { /** * 注水方式枚举 - * - * @author: zhang jing - * @date: 2023/4/11 14:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/member-watertype") public AjaxResult watertype() { @@ -537,11 +493,6 @@ public class EnumsController extends BaseController { /** * 统计值枚举 - * - * @author: zhang jing - * @date: 2022/9/30 14:30 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult STATISTICAL_VALUE **/ @GetMapping("/statistical-value") public AjaxResult statisticalValue() { @@ -554,11 +505,6 @@ public class EnumsController extends BaseController { /** * 注册权限 - * - * @author: zhang jing - * @date: 2022/9/30 14:57 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/registration-authority") public AjaxResult registrationAuthority() { @@ -571,11 +517,6 @@ public class EnumsController extends BaseController { /** * 关系类型 - * - * @author: zhang jing - * @date: 2022/9/30 14:59 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/relation-type") public AjaxResult relationType() { @@ -588,11 +529,6 @@ public class EnumsController extends BaseController { /** * 极差类型 - * - * @author: zhang jing - * @date: 2022/9/30 15:18 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/range-type") public AjaxResult rangeType() { @@ -606,11 +542,6 @@ public class EnumsController extends BaseController { /** * 计算类型 - * - * @author: zhang jing - * @date: 2022/9/30 15:24 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/cal-type") public AjaxResult calType() { @@ -623,11 +554,6 @@ public class EnumsController extends BaseController { /** * 货币种类 - * - * @author: zhang jing - * @date: 2022/9/30 15:34 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/account") public AjaxResult account() { @@ -640,11 +566,6 @@ public class EnumsController extends BaseController { /** * 账户状态（会员登录账户） - * - * @author: zhang jing - * @date: 2022/9/30 15:38 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/account-status") public AjaxResult accountStatus() { @@ -657,11 +578,6 @@ public class EnumsController extends BaseController { /** * 活动类型 - * - * @author: zhang jing - * @date: 2022/9/30 15:40 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/activity-type") public AjaxResult activityType() { @@ -677,11 +593,6 @@ public class EnumsController extends BaseController { /** * 条码状态 - * - * @author: zhang jing - * @date: 2022/9/30 15:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/barcode-status") public AjaxResult barcodeStatus() { @@ -694,11 +605,6 @@ public class EnumsController extends BaseController { /** * 会员类型 - * - * @author: zhang jing - * @date: 2022/9/30 16:26 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/customerTypeList") public AjaxResult getECustomerTypeList() { @@ -1157,7 +1063,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EOrderType value : EOrderType.values()) { if (value.getEnable() == EYesNo.YES.getIntValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ORDER_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -1262,7 +1168,7 @@ public class EnumsController extends BaseController { */ @GetMapping("/bonus-country") public AjaxResult bonusCountry() { - List list = bonusItemsService.queryBonusItems(SecurityUtils.getPkCountry()); + List list = iBdBonusItemsService.queryBonusItems(SecurityUtils.getPkCountry()); List enumEntityList = new ArrayList<>(); for (BdBonusItemsExt bonusItemsExt : list) { @@ -1798,7 +1704,7 @@ public class EnumsController extends BaseController { pkCountry = SecurityUtils.getPkCountry(); } // 查询国家等级列表 - List gradeList = gradeService.queryGradeConfigByCondition(pkCountry); + List gradeList = iBdGradeService.queryGradeConfigByCondition(pkCountry); gradeList.sort(Comparator.comparing(BdGrade::getGradeValue)); List enumEntityList = new ArrayList<>(); @@ -1820,7 +1726,7 @@ public class EnumsController extends BaseController { pkCountry = SecurityUtils.getPkCountry(); } // 查询国家奖衔列表 - List awardList = awardsService.queryAwards(pkCountry); + List awardList = iBdAwardsService.queryAwards(pkCountry); List enumEntityList = new ArrayList<>(); for (BdAwards bdAwards : awardList) { @@ -1970,7 +1876,7 @@ public class EnumsController extends BaseController { //变更会员姓名 if (value.getValue() == EApprovalBusiness.CHANGE_NAME.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -1986,7 +1892,7 @@ public class EnumsController extends BaseController { //变更联系方式 } else if (value.getValue() == EApprovalBusiness.CHANGE_PHONE.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2002,7 +1908,7 @@ public class EnumsController extends BaseController { //重置会员密码 } else if (value.getValue() == EApprovalBusiness.RESET_LOGIN_PASSWORD.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2018,7 +1924,7 @@ public class EnumsController extends BaseController { //实名认证 } else if (value.getValue() == EApprovalBusiness.REAL_NAME_AUTHENTICATION.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2034,7 +1940,7 @@ public class EnumsController extends BaseController { //重置银行信息 } else if (value.getValue() == EApprovalBusiness.RESET_BANK.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2050,7 +1956,7 @@ public class EnumsController extends BaseController { //修改注册等级 } else if (value.getValue() == EApprovalBusiness.CHANGE_REGISTER_GRADE.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2059,7 +1965,7 @@ public class EnumsController extends BaseController { QueryWrapper queryWrapperGr = new QueryWrapper(); queryWrapperGr.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); queryWrapperGr.orderByAsc("GRADE_VALUE"); - List grList = gradeService.list(queryWrapperGr); + List grList = iBdGradeService.list(queryWrapperGr); List enumEntityList1 = new ArrayList<>(); for (BdGrade gr : grList) { enumEntityList1.add(new EnumEntity(gr.getPkId(), gr.getGradeName(), EnumsPrefixConstants.KEY_GRADE)); @@ -2070,7 +1976,7 @@ public class EnumsController extends BaseController { //修改结算等级 } else if (value.getValue() == EApprovalBusiness.CHANGE_SETTLEMENT_GRADE.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2079,7 +1985,7 @@ public class EnumsController extends BaseController { QueryWrapper queryWrapperGr = new QueryWrapper(); queryWrapperGr.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); queryWrapperGr.orderByAsc("GRADE_VALUE"); - List grList = gradeService.list(queryWrapperGr); + List grList = iBdGradeService.list(queryWrapperGr); List enumEntityList1 = new ArrayList<>(); for (BdGrade gr : grList) { enumEntityList1.add(new EnumEntity(gr.getPkId(), gr.getGradeName(), EnumsPrefixConstants.KEY_GRADE)); @@ -2090,7 +1996,7 @@ public class EnumsController extends BaseController { //修改奖衔 } else if (value.getValue() == EApprovalBusiness.CHANGE_AWARDS.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2101,7 +2007,7 @@ public class EnumsController extends BaseController { queryWrapperAw.eq("ENABLE_STATE", EnableStatus.ENABLE.getValue()); queryWrapperAw.orderByAsc("AWARDS_VALUE"); List enumEntityList1 = new ArrayList<>(); - List list = awardsService.list(queryWrapperAw); + List list = iBdAwardsService.list(queryWrapperAw); for (BdAwards ba : list) { enumEntityList1.add(new EnumEntity(ba.getPkId(), ba.getAwardsName(), EnumsPrefixConstants.AWARDS)); } @@ -2112,14 +2018,14 @@ public class EnumsController extends BaseController { } else if (value.getValue() == EApprovalBusiness.CHANGE_NATURAL_COUNTRY.getValue()) { //修改自然国家 queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } handleBusinessEnumVO.setBusinessType(value.getValue()); handleBusinessEnumVO.setEditTypeName(value.getLabel()); List enumEntityList1 = new ArrayList<>(); - List list = countryService.list(); + List list = iBdCountryService.list(); for (BdCountry value1 : list) { enumEntityList1.add(new EnumEntity(value1.getPkId(), value1.getName())); } @@ -2129,7 +2035,7 @@ public class EnumsController extends BaseController { //修改登录状态 } else if (value.getValue() == EApprovalBusiness.SIGN_IN_STATE.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2145,7 +2051,7 @@ public class EnumsController extends BaseController { //修改收益状态 } else if (value.getValue() == EApprovalBusiness.PROFIT_STATE.getValue()) { queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2162,7 +2068,7 @@ public class EnumsController extends BaseController { } else if (value.getValue() == EApprovalBusiness.WALLET_STATE.getValue()) { handleBusinessEnumVO.setButtonType(EButtonType.MULTIPLE_CHOICE.getValue()); queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2179,7 +2085,7 @@ public class EnumsController extends BaseController { } else if (value.getValue() == EApprovalBusiness.FREE_ASSESSMENT_STATE.getValue()) { handleBusinessEnumVO.setButtonType(EButtonType.MULTIPLE_CHOICE.getValue()); queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2195,7 +2101,7 @@ public class EnumsController extends BaseController { } else if (value.getValue() == EApprovalBusiness.IS_REGION.getValue()) { //是否收益区域 queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2211,7 +2117,7 @@ public class EnumsController extends BaseController { } else if (value.getValue() == EApprovalBusiness.IS_ACTIVATE.getValue()) { //是否激活 queryWrapper.eq("TYPE", value.getValue()); - BdServiceCharge bdServiceCharge = serviceChargeService.getOne(queryWrapper); + BdServiceCharge bdServiceCharge = iBdServiceChargeService.getOne(queryWrapper); if (StringUtils.isNotNull(bdServiceCharge)) { handleBusinessEnumVO.setPkAccount(bdServiceCharge.getPkAccount().intValue()); } @@ -2742,11 +2648,6 @@ public class EnumsController extends BaseController { /** * 结算方式枚举 - * - * @author: zhang jing - * @date: 2024/3/29 11:54 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/settle-Type") public AjaxResult settleType() { @@ -2818,11 +2719,6 @@ public class EnumsController extends BaseController { /** * 联创数据报表类型枚举 - * - * @author: zhang jing - * @date: 2025/2/27 10:46 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/sheetType") public AjaxResult sheetType() { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java index e9a2b5fe..0dffb5c1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 签呈来源 - * @Author: jiang chao - * @Time: 2023/4/10 14:09 - * @Classname: EApprovalSource - * @PackageName: com.hzs.common.core.enums + * 签呈来源 */ @AllArgsConstructor @Getter 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 a1f95558..842d1585 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 @@ -14,27 +14,27 @@ public enum ESpecialArea { /** * 注册专区 */ - REGISTER_AREA(1, "旧注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "1", 3, EMenuDetail.REGISTER.getValue()), + REGISTER_AREA(1, "旧注册专区", 1, EnumsPrefixConstants.SPECIAL_AREA + "1", 3, EMenuDetail.REGISTER.getValue()), /** * 升级专区 */ - UPGRADE_AREA(2, "旧升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "2", 4, EMenuDetail.UPGRADE.getValue()), + UPGRADE_AREA(2, "旧升级专区", 1, EnumsPrefixConstants.SPECIAL_AREA + "2", 4, EMenuDetail.UPGRADE.getValue()), /** * 复购专区 */ - REPURCHASE_AREA(3, "旧复购自营", 0, EnumsPrefixConstants.SPECIAL_AREA + "3", 5, EMenuDetail.REPURCHASE.getValue()), + REPURCHASE_AREA(3, "旧复购自营", 1, EnumsPrefixConstants.SPECIAL_AREA + "3", 5, EMenuDetail.REPURCHASE.getValue()), /** * 重消专区 */ - RESCISSION_AREA(10, "旧重消专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "10", 8, EMenuDetail.REPEATED_CONSUMPTION.getValue()), + RESCISSION_AREA(10, "旧重消专区", 1, EnumsPrefixConstants.SPECIAL_AREA + "10", 8, EMenuDetail.REPEATED_CONSUMPTION.getValue()), /** * 直播专区 */ - LIVE_BROADCAST(14, "直播专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 14, 14, EMenuDetail.LIVE.getValue()), + LIVE_BROADCAST(14, "直播专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 14, 14, EMenuDetail.LIVE.getValue()), /** * 新零售会员专区（注册） diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java index 279d0f3d..90179359 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java @@ -10,6 +10,7 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum EUpgradeType { + /** * 1=自动升级 (奖衔),2=手动升级（等级奖衔）,3=购买赠予（奖衔） 4=购买升级（等级前台报单、升级） 5=活动升级（等级） */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EnableStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EnableStatus.java index 9a0dc8c5..efe68c8e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EnableStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EnableStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 启用状态 - * @Author: jiang chao - * @Time: 2023/1/4 15:32 - * @Classname: EnableStatus - * @PackageName: com.hzs.common.core.enums + * 启用状态 */ @AllArgsConstructor @Getter @@ -18,7 +14,7 @@ public enum EnableStatus { /** * 已启用 */ - ENABLE(0, "已启用", 0,EnumsPrefixConstants.ENABLE_STATUS + "0"), + ENABLE(0, "已启用", 0, EnumsPrefixConstants.ENABLE_STATUS + "0"), /** * 已禁用 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java index da29c05b..2ffccebb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java @@ -8,8 +8,6 @@ import java.util.List; /** * 枚举统一返回实体 - * - * @author: jiiangchao */ @AllArgsConstructor @Data @@ -69,9 +67,9 @@ public class EnumEntity { /** * 需要翻译的构造函数 * - * @param value 值 - * @param label 标签 - * @param field 字段 + * @param value 值 + * @param label 标签 + * @param field 字段 * @param transactionKey 翻译健 */ public EnumEntity(int value, String label, String field, String transactionKey) {