From eabe4f2efc47b65ffd69d8f6feb1c5642d7de664 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 30 Jun 2025 13:37:51 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A5=96=E8=A1=94=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=E5=8E=BB=E6=8E=894-N=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=AD=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/system/config/dto/BonusConfigDTO.java | 16 - .../controller/manage/BdAwardsController.java | 171 ++---- .../manage/BdBonusExpandController.java | 63 -- .../controller/manage/BdGradeController.java | 23 +- .../manage/BdRetailAwardsController.java | 149 +---- .../config/mapper/BdBonusCloudMapper.java | 10 +- .../config/mapper/BdBonusExpandMapper.java | 11 - .../config/mapper/BdBonusHiPinkMapper.java | 6 - .../provider/BonusItemsServiceProvider.java | 59 -- .../config/service/IBdBonusCloudService.java | 33 +- .../config/service/IBdBonusExpandService.java | 17 - .../config/service/IBdBonusHiPinkService.java | 33 - .../service/impl/BdBonusCloudServiceImpl.java | 33 +- .../impl/BdBonusExpandServiceImpl.java | 22 - .../impl/BdBonusHiPinkServiceImpl.java | 46 -- .../service/impl/BdGradeServiceImpl.java | 18 - .../system/config/BdBonusCloudMapper.xml | 24 - .../system/config/BdBonusExpandMapper.xml | 29 - .../common/core/constant/CacheConstants.java | 2 - .../core/constant/msg/ConfigMsgConstants.java | 570 ++++++++---------- .../common/domain/system/config/BdAwards.java | 9 - .../domain/system/config/BdBonusCloud.java | 8 +- .../domain/system/config/BdBonusExpand.java | 42 -- .../domain/system/config/BdBonusHiPink.java | 5 - .../domain/system/config/ext/BdAwardsExt.java | 7 +- .../system/config/ext/BdBonusExpandExt.java | 34 -- .../domain/system/config/ext/BdGradeExt.java | 27 +- 27 files changed, 353 insertions(+), 1114 deletions(-) delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdBonusExpandController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusExpandMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusExpandService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusExpandServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusExpandMapper.xml delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusExpand.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdBonusExpandExt.java diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java index 8acea130..3a7affd8 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java @@ -37,21 +37,11 @@ public class BonusConfigDTO implements Serializable { */ private Map bonusDirectDtoMap; - /** - * 嗨粉直推奖励配置 key 第一个键国家主键 ，第二个键 range_type+pk_level - */ - private Map> bonusHiPinkDtoMap; - /** * 一次性补差 key 国家作为主键，只有一条 */ private Map bonusDifferenceDtoMap; - /** - * 奖金4-N配置 国家 - */ - private Map bonusExpandMap; - /** * 复购推荐奖励配置 key第一个键国家主键，第二个键 代数 */ @@ -84,7 +74,6 @@ public class BonusConfigDTO implements Serializable { private List awardsList; - /** * 奖金扣项 需要主键 奖金主键 */ @@ -95,9 +84,4 @@ public class BonusConfigDTO implements Serializable { */ private Map bonusServiceMap; - /** - * 云代奖金 需要主键 国家+收益类型 - */ - private Map bonusCloudMap; - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAwardsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAwardsController.java index 6a0ae0b1..9ccd236d 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAwardsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAwardsController.java @@ -34,9 +34,6 @@ import java.util.List; /** * 奖衔配置前端控制器 - * - * @author zhangjing - * @since 2022-09-08 */ @Slf4j @RestController @@ -44,27 +41,18 @@ import java.util.List; public class BdAwardsController extends BaseController { @Autowired - private IBdAwardsService awardsService; + private IBdAwardsService iBdAwardsService; @Autowired - private IBdNoticeService noticeService; + private IBdNoticeService iBdNoticeService; + @Autowired + private RedisService redisService; @DubboReference ITransactionServiceApi iTransactionServiceApi; - private RedisService redisService; - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - /** - * @description: 查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [awards] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询奖衔配置列表 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/list") @@ -78,15 +66,15 @@ public class BdAwardsController extends BaseController { } queryWrapper.orderByAsc(BdAwards::getAwardsValue); List listExt = new ArrayList<>(); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); list.forEach(item -> listExt.add(BeanUtil.copyProperties(item, BdAwardsExt.class))); if (CollectionUtil.isNotEmpty(listExt)) { for (BdAwardsExt ae : listExt) { if (StringUtils.isNotNull(ae.getPkCheckAwardsLeft())) { - ae.setPkCheckAwardsLeft(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsLeft(), null)); + ae.setPkCheckAwardsLeft(iBdNoticeService.getAwardsTranslateValue(ae.getPkCheckAwardsLeft(), null)); } if (StringUtils.isNotNull(ae.getPkCheckAwardsRight())) { - ae.setPkCheckAwardsRight(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsRight(), null)); + ae.setPkCheckAwardsRight(iBdNoticeService.getAwardsTranslateValue(ae.getPkCheckAwardsRight(), null)); } } } @@ -94,11 +82,7 @@ public class BdAwardsController extends BaseController { } /** - * @description: 导出奖衔配置 - * @author: zhang jing - * @date: 2023/3/9 15:32 - * @param: [response, awards] - * @return: void + * 导出奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @PostMapping("/export") @@ -112,12 +96,12 @@ public class BdAwardsController extends BaseController { } queryWrapper.orderByAsc(BdAwards::getAwardsValue); List listExt = new ArrayList<>(); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); list.forEach(item -> listExt.add(BeanUtil.copyProperties(item, BdAwardsExt.class))); if (CollectionUtil.isNotEmpty(listExt)) { for (BdAwardsExt ae : listExt) { - ae.setPkCheckAwardsLeft(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsLeft(), null)); - ae.setPkCheckAwardsRight(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsRight(), null)); + ae.setPkCheckAwardsLeft(iBdNoticeService.getAwardsTranslateValue(ae.getPkCheckAwardsLeft(), null)); + ae.setPkCheckAwardsRight(iBdNoticeService.getAwardsTranslateValue(ae.getPkCheckAwardsRight(), null)); } } ExcelUtil util = new ExcelUtil<>(BdAwardsExt.class); @@ -125,11 +109,7 @@ public class BdAwardsController extends BaseController { } /** - * @description: 真实奖衔下拉选 - * @author: zhang jing - * @date: 2022/10/27 10:15 - * @param: [awards] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 真实奖衔下拉选 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/awardsList") @@ -137,7 +117,7 @@ public class BdAwardsController extends BaseController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.orderByAsc(BdAwards::getAwardsValue); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); List listExt = new ArrayList<>(); for (BdAwards ba : list) { BdAwardsExt baExt = new BdAwardsExt(); @@ -159,7 +139,7 @@ public class BdAwardsController extends BaseController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.orderByAsc(BdAwards::getAwardsValue); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); List listExt = new ArrayList<>(); for (BdAwards ba : list) { BdAwardsExt baExt = new BdAwardsExt(); @@ -172,11 +152,7 @@ public class BdAwardsController extends BaseController { } /** - * @description: 辅导分红列表 - * @author: zhang jing - * @date: 2022/10/27 10:15 - * @param: [awards] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 辅导分红列表 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/coachBonusList") @@ -185,7 +161,7 @@ public class BdAwardsController extends BaseController { queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdAwards::getSystemType, ESystemType.DEFAULT.getValue()); queryWrapper.orderByAsc(BdAwards::getAwardsValue); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); List listExt = new ArrayList<>(); for (BdAwards ba : list) { BdAwardsExt baExt = new BdAwardsExt(); @@ -200,11 +176,7 @@ public class BdAwardsController extends BaseController { } /** - * @description: 环球积分列表+车奖积分列表 - * @author: zhang jing - * @date: 2022/11/2 9:16 - * @param: [awards] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 环球积分列表+车奖积分列表 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/integralList") @@ -213,7 +185,7 @@ public class BdAwardsController extends BaseController { queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdAwards::getSystemType, ESystemType.DEFAULT.getValue()); queryWrapper.orderByAsc(BdAwards::getAwardsValue); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); List listExt = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { for (BdAwards ba : list) { @@ -230,11 +202,7 @@ public class BdAwardsController extends BaseController { /** - * @description: 新增奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [awards] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 新增奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.INSERT) @PostMapping("/generate") @@ -246,25 +214,10 @@ public class BdAwardsController extends BaseController { if (StringUtils.isEmpty(awards.getAwardsName())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.AWARDS_NAME_NOT_NULL)); } - if (StringUtils.isNull(awards.getCommunityCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getCommunityCheckEnd())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_END_NOT_NULL)); - } - if (StringUtils.isNull(awards.getPurchaseCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PURCHASE_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getShareCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SHARE_CHECK_NOT_NULL)); - } if (StringUtils.isNull(awards.getColor())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COLOR_NOT_NULL)); } - if ((null == awards.getPkCheckAwardsLeft() || null == awards.getPkCheckAwardsRight()) && StringUtils.isNotNull(awards.getRelationType())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LEFT_RIGHT_AWARDS_NAME_NOT_NULL)); - } awards.setPkCountry(SecurityUtils.getPkCountry()); awards.setPkCreator(SecurityUtils.getUserId()); awards.setCreationTime(new Date()); @@ -273,7 +226,7 @@ public class BdAwardsController extends BaseController { queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdAwards::getAwardsValue, awards.getAwardsValue()); queryWrapper.eq(BdAwards::getSystemType, ESystemType.DEFAULT.getValue()); - List list1 = awardsService.list(queryWrapper); + List list1 = iBdAwardsService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list1)) { return AjaxResult.error((ConfigMsgConstants.DATA_REPEAT)); } @@ -283,17 +236,13 @@ public class BdAwardsController extends BaseController { awards.setPkTransaction(pkTransaction.getData()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + pkCountry); awards.setSystemType(ESystemType.DEFAULT.getValue()); - awardsService.save(awards); + iBdAwardsService.save(awards); return AjaxResult.success(); } /** - * @description: 修改奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [awards] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.UPDATE) @PostMapping("/update") @@ -305,38 +254,23 @@ public class BdAwardsController extends BaseController { if (StringUtils.isEmpty(awards.getAwardsName())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.AWARDS_NAME_NOT_NULL)); } - if (StringUtils.isNull(awards.getCommunityCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getCommunityCheckEnd())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_END_NOT_NULL)); - } - if (StringUtils.isNull(awards.getPurchaseCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PURCHASE_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getShareCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SHARE_CHECK_NOT_NULL)); - } if (StringUtils.isNull(awards.getColor())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COLOR_NOT_NULL)); } - if ((null == awards.getPkCheckAwardsLeft() || null == awards.getPkCheckAwardsRight()) && StringUtils.isNotNull(awards.getRelationType())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LEFT_RIGHT_AWARDS_NAME_NOT_NULL)); - } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdAwards::getAwardsValue, awards.getAwardsValue()); queryWrapper.eq(BdAwards::getSystemType, ESystemType.DEFAULT.getValue()); queryWrapper.ne(BdAwards::getPkId, awards.getPkId()); - List list1 = awardsService.list(queryWrapper); + List list1 = iBdAwardsService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list1)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.DATA_REPEAT)); } //字段翻译保存到数据库 if (null != awards.getPkTransaction()) { - R b = iTransactionServiceApi.updateTransaction(pkCountry, + iTransactionServiceApi.updateTransaction(pkCountry, awards.getAwardsName(), awards.getPkTransaction(), true); } else { R pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.AWARDS, @@ -346,15 +280,11 @@ public class BdAwardsController extends BaseController { awards.setPkModified(SecurityUtils.getUserId()); awards.setModifiedTime(new Date()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + pkCountry); - return toAjax(awardsService.updateById(awards)); + return toAjax(iBdAwardsService.updateById(awards)); } /** - * @description: 修改启用禁用 - * @author: zhang jing - * @date: 2023/4/24 14:30 - * @param: [gradeExt] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改启用禁用 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.UPDATE) @PostMapping("/updateState") @@ -370,17 +300,13 @@ public class BdAwardsController extends BaseController { updateWrapper.eq(BdAwards::getPkId, awards.getPkId()); updateWrapper.set(BdAwards::getPkModified, SecurityUtils.getUserId()); updateWrapper.set(BdAwards::getModifiedTime, new Date()); - awardsService.update(updateWrapper); + iBdAwardsService.update(updateWrapper); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + SecurityUtils.getPkCountry()); return AjaxResult.success(); } /** - * @description: 修改辅导分红 - * @author: zhang jing - * @date: 2022/10/31 19:39 - * @param: [awards] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改辅导分红 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.UPDATE) @PostMapping("/updateCoachBonus") @@ -388,7 +314,7 @@ public class BdAwardsController extends BaseController { List awardsList = new ArrayList<>(); if (CollectionUtil.isNotEmpty(awardsExt.getAwardsList())) { for (BdAwards awards : awardsExt.getAwardsList()) { - BdAwards awardsOld = awardsService.getById(awards.getPkId()); + BdAwards awardsOld = iBdAwardsService.getById(awards.getPkId()); if (StringUtils.isNull(awards.getPkId())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_GRADE_AWARDS_NOT_NULL)); } @@ -411,18 +337,14 @@ public class BdAwardsController extends BaseController { } awardsExt.setAwardsList(awardsList); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS_COACH + SecurityUtils.getPkCountry()); - return AjaxResult.success(awardsService.updateAwards(awardsExt)); + return AjaxResult.success(iBdAwardsService.updateAwards(awardsExt)); } else { return AjaxResult.error(); } } /** - * @description: 修改环球积分 - * @author: zhang jing - * @date: 2022/11/2 9:38 - * @param: [awardsExt] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改环球积分 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.UPDATE) @PostMapping("/updategLobalIntegral") @@ -440,18 +362,14 @@ public class BdAwardsController extends BaseController { awards.setPkModified(SecurityUtils.getUserId()); awards.setModifiedTime(new Date()); } - return AjaxResult.success(awardsService.updateLobalIntegral(awardsExt)); + return AjaxResult.success(iBdAwardsService.updateLobalIntegral(awardsExt)); } else { return AjaxResult.error(); } } /** - * @description: 修改车奖积分 - * @author: zhang jing - * @date: 2022/11/2 9:38 - * @param: [awardsExt] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改车奖积分 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.UPDATE) @PostMapping("/updategCarAwardPoints") @@ -469,7 +387,7 @@ public class BdAwardsController extends BaseController { awards.setPkModified(SecurityUtils.getUserId()); awards.setModifiedTime(new Date()); } - return AjaxResult.success(awardsService.updateGlobalIntegral(awardsExt)); + return AjaxResult.success(iBdAwardsService.updateGlobalIntegral(awardsExt)); } else { return AjaxResult.error(); } @@ -477,26 +395,17 @@ public class BdAwardsController extends BaseController { /** - * @description: 查询单条奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 查询单条奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/getOne/{pkId}") public AjaxResult getOne(@PathVariable Long pkId) { - BdAwards awards = awardsService.getById(pkId); - return AjaxResult.success(awards); + return AjaxResult.success(iBdAwardsService.getById(pkId)); } /** - * @description: 删除奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 删除奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") @@ -508,11 +417,11 @@ public class BdAwardsController extends BaseController { updateWrapper.set(BdAwards::getModifiedTime, new Date()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + SecurityUtils.getPkCountry()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS_COACH + SecurityUtils.getPkCountry()); - Integer count = awardsService.checkGradeAwards(null, null, pkId); + Integer count = iBdAwardsService.checkGradeAwards(null, null, pkId); if (count > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE)); } - return AjaxResult.success(awardsService.update(updateWrapper)); + return AjaxResult.success(iBdAwardsService.update(updateWrapper)); } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdBonusExpandController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdBonusExpandController.java deleted file mode 100644 index 864048a0..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdBonusExpandController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.system.config.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.config.BdBonusExpand; -import com.hzs.common.domain.system.config.ext.BdBonusExpandExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.config.service.IBdBonusExpandService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 奖金4—N配置 - 前端控制器 - *

- * - * @author hzs - * @since 2022-10-31 - */ -@RestController -@RequestMapping("/manage/bd-bonus-expand") -public class BdBonusExpandController extends BaseController { - @Autowired - IBdBonusExpandService bonusExpandService; - - @Log(module = EOperationModule.LEVEL_CONFIG,business = EOperationBusiness.GRADE, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(BdBonusExpand bonusExpand) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - queryWrapper.orderByDesc("CREATION_TIME"); - List list = bonusExpandService.list(queryWrapper); - List listExt=new ArrayList<>(); - if(CollectionUtil.isNotEmpty(list)){ - for(BdBonusExpand be : list){ - BdBonusExpandExt bee = BeanUtil.copyProperties(be, BdBonusExpandExt.class); - bee.setExpandName(TransactionUtils.getContent(ConfigMsgConstants.FOUR_N_DISPOSE)); - listExt.add(bee); - } - }else{ - BdBonusExpandExt bee = new BdBonusExpandExt(); - bee.setExpandName(TransactionUtils.getContent(ConfigMsgConstants.FOUR_N_DISPOSE)); - listExt.add(bee); - } - return getDataTable(listExt); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdGradeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdGradeController.java index 79ec7d34..bae69e3c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdGradeController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdGradeController.java @@ -17,7 +17,6 @@ import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdGradeScope; -import com.hzs.common.domain.system.config.ext.BdBonusExpandExt; import com.hzs.common.domain.system.config.ext.BdGradeExt; import com.hzs.common.domain.system.ext.BdGradeScopeExt; import com.hzs.common.security.utils.SecurityUtils; @@ -38,9 +37,6 @@ import java.util.List; /** * 等级配置表 前端控制器 - * - * @author zhangjing - * @since 2022-09-08 */ @Slf4j @RestController @@ -57,13 +53,8 @@ public class BdGradeController extends BaseController { private IBdAwardsService awardsService; @Autowired private IBdNoticeService noticeService; - - private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } + private RedisService redisService; /** * @description: 查询等级配置列表 @@ -362,18 +353,6 @@ public class BdGradeController extends BaseController { @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.GRADE, method = EOperationMethod.UPDATE) @PostMapping("/updateExpand") public AjaxResult updateExpand(@RequestBody BdGradeExt gradeExt) { - if (CollectionUtil.isNotEmpty(gradeExt.getBonusExpands())) { - for (BdBonusExpandExt bee : gradeExt.getBonusExpands()) { - if (StringUtils.isNull(bee.getExpandNumber())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EXPAND_NUMBER_NOT_NULL)); - } - if (StringUtils.isNull(bee.getExpandRatio())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EXPAND_RATIO_NOT_NULL)); - } - } - } else { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.BONUS_EXPANDS_NOT_NULL)); - } if (CollectionUtil.isNotEmpty(gradeExt.getExpandList())) { for (BdGrade bg : gradeExt.getExpandList()) { if (StringUtils.isNull(bg.getPkId())) { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailAwardsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailAwardsController.java index da41493c..0f2562a7 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailAwardsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailAwardsController.java @@ -11,7 +11,6 @@ import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; @@ -27,16 +26,12 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * 新零售奖衔配置前端控制器 - * - * @author zhangjing - * @since 2022-09-08 */ @Slf4j @RestController @@ -44,27 +39,18 @@ import java.util.List; public class BdRetailAwardsController extends BaseController { @Autowired - private IBdAwardsService awardsService; + private IBdAwardsService iBdAwardsService; @Autowired - private IBdNoticeService noticeService; + private IBdNoticeService iBdNoticeService; + @Autowired + private RedisService redisService; @DubboReference ITransactionServiceApi iTransactionServiceApi; - private RedisService redisService; - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - /** - * @description: 查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [awards] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询奖衔配置列表 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/list") @@ -77,15 +63,15 @@ public class BdRetailAwardsController extends BaseController { } queryWrapper.orderByAsc(BdAwards::getAwardsValue); List listExt = new ArrayList<>(); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); list.forEach(item -> listExt.add(BeanUtil.copyProperties(item, BdAwardsExt.class))); if (CollectionUtil.isNotEmpty(listExt)) { for (BdAwardsExt ae : listExt) { if (StringUtils.isNotNull(ae.getPkCheckAwardsLeft())) { - ae.setPkCheckAwardsLeft(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsLeft(), null)); + ae.setPkCheckAwardsLeft(iBdNoticeService.getAwardsTranslateValue(ae.getPkCheckAwardsLeft(), null)); } if (StringUtils.isNotNull(ae.getPkCheckAwardsRight())) { - ae.setPkCheckAwardsRight(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsRight(), null)); + ae.setPkCheckAwardsRight(iBdNoticeService.getAwardsTranslateValue(ae.getPkCheckAwardsRight(), null)); } } } @@ -93,41 +79,7 @@ public class BdRetailAwardsController extends BaseController { } /** - * @description: 导出奖衔配置 - * @author: zhang jing - * @date: 2023/3/9 15:32 - * @param: [response, awards] - * @return: void - **/ - @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) - @PostMapping("/export") - public void export(HttpServletResponse response, BdAwards awards) { - startPage(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); - if (StringUtils.isNotNull(awards.getAwardsName())) { - queryWrapper.eq(BdAwards::getAwardsName, awards.getAwardsName()); - } - queryWrapper.orderByAsc(BdAwards::getAwardsValue); - List listExt = new ArrayList<>(); - List list = awardsService.list(queryWrapper); - list.forEach(item -> listExt.add(BeanUtil.copyProperties(item, BdAwardsExt.class))); - if (CollectionUtil.isNotEmpty(listExt)) { - for (BdAwardsExt ae : listExt) { - ae.setPkCheckAwardsLeft(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsLeft(), null)); - ae.setPkCheckAwardsRight(noticeService.getAwardsTranslateValue(ae.getPkCheckAwardsRight(), null)); - } - } - ExcelUtil util = new ExcelUtil<>(BdAwardsExt.class); - util.exportExcel(response, listExt, "奖衔配置"); - } - - /** - * @description: 真实奖衔下拉选 - * @author: zhang jing - * @date: 2022/10/27 10:15 - * @param: [awards] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 真实奖衔下拉选 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/awardsList") @@ -136,7 +88,7 @@ public class BdRetailAwardsController extends BaseController { queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); // 原接口，默认为会员系统 queryWrapper.orderByAsc(BdAwards::getAwardsValue); - List list = awardsService.list(queryWrapper); + List list = iBdAwardsService.list(queryWrapper); List listExt = new ArrayList<>(); for (BdAwards ba : list) { BdAwardsExt baExt = new BdAwardsExt(); @@ -148,13 +100,8 @@ public class BdRetailAwardsController extends BaseController { return getDataTable(listExt); } - /** - * @description: 新增奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [awards] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 新增奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.INSERT) @PostMapping("/generate") @@ -166,25 +113,10 @@ public class BdRetailAwardsController extends BaseController { if (StringUtils.isEmpty(awards.getAwardsName())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.AWARDS_NAME_NOT_NULL)); } - if (StringUtils.isNull(awards.getCommunityCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getCommunityCheckEnd())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_END_NOT_NULL)); - } - if (StringUtils.isNull(awards.getPurchaseCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PURCHASE_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getShareCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SHARE_CHECK_NOT_NULL)); - } if (StringUtils.isNull(awards.getColor())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COLOR_NOT_NULL)); } - if ((null == awards.getPkCheckAwardsLeft() || null == awards.getPkCheckAwardsRight()) && StringUtils.isNotNull(awards.getRelationType())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LEFT_RIGHT_AWARDS_NAME_NOT_NULL)); - } awards.setPkCountry(SecurityUtils.getPkCountry()); awards.setPkCreator(SecurityUtils.getUserId()); awards.setCreationTime(new Date()); @@ -192,7 +124,7 @@ public class BdRetailAwardsController extends BaseController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdAwards::getAwardsValue, awards.getAwardsValue()); - List list1 = awardsService.list(queryWrapper); + List list1 = iBdAwardsService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list1)) { return AjaxResult.error((ConfigMsgConstants.DATA_REPEAT)); } @@ -201,17 +133,12 @@ public class BdRetailAwardsController extends BaseController { awards.getAwardsName(), EYesNo.YES, EYesNo.NO); awards.setPkTransaction(pkTransaction.getData()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + pkCountry); - awardsService.save(awards); + iBdAwardsService.save(awards); return AjaxResult.success(); } - /** - * @description: 修改奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [awards] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.UPDATE) @PostMapping("/update") @@ -223,37 +150,22 @@ public class BdRetailAwardsController extends BaseController { if (StringUtils.isEmpty(awards.getAwardsName())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.AWARDS_NAME_NOT_NULL)); } - if (StringUtils.isNull(awards.getCommunityCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getCommunityCheckEnd())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMMUNITY_CHECK_END_NOT_NULL)); - } - if (StringUtils.isNull(awards.getPurchaseCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PURCHASE_CHECK_NOT_NULL)); - } - if (StringUtils.isNull(awards.getShareCheck())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SHARE_CHECK_NOT_NULL)); - } if (StringUtils.isNull(awards.getColor())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COLOR_NOT_NULL)); } - if ((null == awards.getPkCheckAwardsLeft() || null == awards.getPkCheckAwardsRight()) && StringUtils.isNotNull(awards.getRelationType())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LEFT_RIGHT_AWARDS_NAME_NOT_NULL)); - } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdAwards::getAwardsValue, awards.getAwardsValue()); queryWrapper.ne(BdAwards::getPkId, awards.getPkId()); - List list1 = awardsService.list(queryWrapper); + List list1 = iBdAwardsService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list1)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.DATA_REPEAT)); } //字段翻译保存到数据库 if (null != awards.getPkTransaction()) { - R b = iTransactionServiceApi.updateTransaction(pkCountry, + iTransactionServiceApi.updateTransaction(pkCountry, awards.getAwardsName(), awards.getPkTransaction(), true); } else { R pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.AWARDS, @@ -263,15 +175,11 @@ public class BdRetailAwardsController extends BaseController { awards.setPkModified(SecurityUtils.getUserId()); awards.setModifiedTime(new Date()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + pkCountry); - return toAjax(awardsService.updateById(awards)); + return toAjax(iBdAwardsService.updateById(awards)); } /** - * @description: 修改启用禁用 - * @author: zhang jing - * @date: 2023/4/24 14:30 - * @param: [gradeExt] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改启用禁用 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.UPDATE) @PostMapping("/updateState") @@ -287,32 +195,23 @@ public class BdRetailAwardsController extends BaseController { updateWrapper.eq(BdAwards::getPkId, awards.getPkId()); updateWrapper.set(BdAwards::getPkModified, SecurityUtils.getUserId()); updateWrapper.set(BdAwards::getModifiedTime, new Date()); - awardsService.update(updateWrapper); + iBdAwardsService.update(updateWrapper); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + SecurityUtils.getPkCountry()); return AjaxResult.success(); } /** - * @description: 查询单条奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 查询单条奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.SELECT) @GetMapping("/getOne/{pkId}") public AjaxResult getOne(@PathVariable Long pkId) { - BdAwards awards = awardsService.getById(pkId); - return AjaxResult.success(awards); + return AjaxResult.success(iBdAwardsService.getById(pkId)); } /** - * @description: 删除奖衔配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 删除奖衔配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.AWARD_CONTROL, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") @@ -324,11 +223,11 @@ public class BdRetailAwardsController extends BaseController { updateWrapper.set(BdAwards::getModifiedTime, new Date()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS + SecurityUtils.getPkCountry()); redisService.deleteObjectByKey(CacheConstants.BD_AWARDS_COACH + SecurityUtils.getPkCountry()); - Integer count = awardsService.checkGradeAwards(null, null, pkId); + Integer count = iBdAwardsService.checkGradeAwards(null, null, pkId); if (count > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE)); } - return AjaxResult.success(awardsService.update(updateWrapper)); + return AjaxResult.success(iBdAwardsService.update(updateWrapper)); } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusCloudMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusCloudMapper.java index 4846f25e..f08a3cb6 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusCloudMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusCloudMapper.java @@ -1,17 +1,11 @@ package com.hzs.system.config.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdBonusCloud; /** - *

- * 云代配置 - Mapper 接口 - *

- * - * @author zhangjing - * @since 2022-11-01 + * 云代配置 + * Mapper 接口 */ public interface BdBonusCloudMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusExpandMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusExpandMapper.java deleted file mode 100644 index 25e04132..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusExpandMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hzs.system.config.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.config.BdBonusExpand; - -/** - * 奖金4—N配置 - */ -public interface BdBonusExpandMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusHiPinkMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusHiPinkMapper.java index fadb2f47..133c224c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusHiPinkMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusHiPinkMapper.java @@ -1,16 +1,10 @@ package com.hzs.system.config.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdBonusHiPink; /** - *

* 嗨粉直推奖励配置 Mapper 接口 - *

- * - * @author zhangjing - * @since 2022-11-03 */ public interface BdBonusHiPinkMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java index 2f078969..79c1df9c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java @@ -36,18 +36,12 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { @Autowired private IBdBonusDirectLoopService bdBonusDirectLoopService; - @Autowired - private IBdBonusHiPinkService bdBonusHiPinkService; - @Autowired private IBdBonusDirectService bdBonusDirectService; @Autowired private IBdBonusDifferenceService bdBonusDifferenceService; - @Autowired - private IBdBonusExpandService bdBonusExpandService; - @Autowired private IBdGradeService gradeService; @@ -69,9 +63,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { @Autowired private IBdRepoDirectPushService bdRepoDirectPushService; - @Autowired - private IBdBonusCloudService bdBonusCloudService; - @Override public R> queryBonusItems(Integer pkCountry) { return R.ok(bonusItemsService.queryBonusItems(pkCountry)); @@ -103,12 +94,8 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { bonusConfigDTO.setBonusDirectLoopDtoMap(getBonusLoopConfig()); // 查询直推奖励配置 bonusConfigDTO.setBonusDirectDtoMap(getBonusDirectConfig()); - // 嗨粉直推奖励配置 - bonusConfigDTO.setBonusHiPinkDtoMap(getBonusHiPinkMap()); // 一次性补差 bonusConfigDTO.setBonusDifferenceDtoMap(getBonusDifferenceConfig()); - // 奖金4-N配置 - bonusConfigDTO.setBonusExpandMap(getBonusExpandConfig()); // 复购直推配置 bonusConfigDTO.setBonusRepurchasePushMap(getRepurchasePushMap()); // 拓展奖跟辅导奖需要查询所有国家的配置 @@ -124,8 +111,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { bonusConfigDTO.setBonusDeductsMap(getBonusDeductConfig()); // 报单服务费 bonusConfigDTO.setBonusServiceMap(getBonusServiceConfig()); - // 云代奖金 - bonusConfigDTO.setBonusCloudMap(getBonusCloudConfig()); return R.ok(bonusConfigDTO); } @@ -149,25 +134,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { return bonusItemsMap; } - /** - * 嗨粉直推奖励 - */ - private Map> getBonusHiPinkMap() { - List bdBonusHiPinks = bdBonusHiPinkService.queryBonusHiPink(); - Map> bonusHiPinkMap = new LinkedHashMap<>(ComputeUtil.mapInitCapacity(bdBonusHiPinks.size())); - bdBonusHiPinks.forEach(bdBonusHiPink -> { - BonusHiPinkDTO bonusHiPinkDTO = BeanUtil.copyProperties(bdBonusHiPink, BonusHiPinkDTO.class); - if (bonusHiPinkMap.containsKey(bonusHiPinkDTO.getPkCountry())) { - bonusHiPinkMap.get(bonusHiPinkDTO.getPkCountry()).add(bonusHiPinkDTO); - } else { - List bonusHiPinkDTOList = new ArrayList<>(); - bonusHiPinkDTOList.add(bonusHiPinkDTO); - bonusHiPinkMap.put(bonusHiPinkDTO.getPkCountry(), bonusHiPinkDTOList); - } - }); - return bonusHiPinkMap; - } - /** * 复购直推奖励 */ @@ -227,20 +193,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { return bonusDifferenceDtoMap; } - - /** - * 拓展奖拓展的次数 国家作为键 - */ - private Map getBonusExpandConfig() { - List bdBonusExpandList = bdBonusExpandService.queryBdBonusExpand(); - Map bdBonusExpandMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusExpandList.size())); - bdBonusExpandList.forEach(bdBonusExpand -> { - BonusExpandDTO bonusExpandDTO = BeanUtil.copyProperties(bdBonusExpand, BonusExpandDTO.class); - bdBonusExpandMap.put(bonusExpandDTO.getPkCountry(), bonusExpandDTO); - }); - return bdBonusExpandMap; - } - /** * 获取等级对应的拓展奖对应参数 */ @@ -294,15 +246,4 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { return bdBonusDeductMap; } - /** - * 获取每个国家奖金项对应的扣项 - */ - private Map getBonusCloudConfig() { - List bonusCloudList = bdBonusCloudService.queryBdBonusCloud(); - Map bdBonusCloudHashMap = new HashMap<>(ComputeUtil.mapInitCapacity(bonusCloudList.size())); - bonusCloudList.forEach(bdBonusCloud -> - bdBonusCloudHashMap.put(bdBonusCloud.getPkCountry().toString() + bdBonusCloud.getCloudType(), bdBonusCloud)); - return bdBonusCloudHashMap; - } - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusCloudService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusCloudService.java index 9f9be085..0bc30b23 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusCloudService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusCloudService.java @@ -1,45 +1,22 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdBonusCloud; import com.hzs.common.domain.system.config.ext.BdBonusCloudExt; -import java.util.List; - /** - *

- * 云代配置 - 服务类 - *

- * - * @author zhangjing - * @since 2022-11-01 + * 云代配置 + * 服务类 */ public interface IBdBonusCloudService extends IService { - /* - * @description: 查询云代奖金配置 - * @author: sui q - * @date: 2023/7/5 15:17 - * @param: null null - **/ - List queryBdBonusCloud(); - /** - * @description: 新增云代配置 - * @author: zhang jing - * @date: 2022/11/1 17:13 - * @param: [bonusCloudExt] - * @return: boolean + * 新增云代配置 **/ boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt); + /** - * @description: 修改云代配置 - * @author: zhang jing - * @date: 2022/11/1 17:13 - * @param: [bonusCloudExt] - * @return: boolean + * 修改云代配置 **/ boolean updateBonusCloud(BdBonusCloudExt bonusCloudExt); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusExpandService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusExpandService.java deleted file mode 100644 index c646a8cf..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusExpandService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.config.BdBonusExpand; - -import java.util.List; - -/** - * 奖金4—N配置 - */ -public interface IBdBonusExpandService extends IService { - - /** - * 查询奖金的4-n配置 - */ - List queryBdBonusExpand(); -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusHiPinkService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusHiPinkService.java index 1f12feef..4e329637 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusHiPinkService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusHiPinkService.java @@ -1,44 +1,11 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdBonusHiPink; -import java.util.List; - /** - *

* 嗨粉直推奖励配置 服务类 - *

- * - * @author zhangjing - * @since 2022-11-03 */ public interface IBdBonusHiPinkService extends IService { - /** - * @description: 新增嗨粉直推奖励配置 - * @author: zhang jing - * @date: 2022/11/4 9:25 - * @param: [bonusHiPinkList] - * @return: boolean - **/ - boolean saveBonusHiPink(List bonusHiPinkList); - - /** - * @description: 修改嗨粉直推奖励配置 - * @author: zhang jing - * @date: 2022/11/4 9:25 - * @param: [bonusHiPinkList] - * @return: boolean - **/ - boolean updateBonusHiPink(List bonusHiPinkList); - - /** - * 查询会员嗨粉推荐奖金 - * @return: List - * @Author: sui q - * @Date: 2023/1/4 15:23 - */ - List queryBonusHiPink(); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusCloudServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusCloudServiceImpl.java index 6e8c2cfd..8a06051e 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusCloudServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusCloudServiceImpl.java @@ -1,6 +1,5 @@ package com.hzs.system.config.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.system.config.BdBonusCloud; @@ -11,43 +10,23 @@ import com.hzs.system.config.service.IBdBonusCloudService; import org.springframework.stereotype.Service; import java.util.Date; -import java.util.List; /** - *

- * 云代配置 - 服务实现类 - *

- * - * @author zhangjing - * @since 2022-11-01 + * 云代配置 + * 服务实现类 */ @Service public class BdBonusCloudServiceImpl extends ServiceImpl implements IBdBonusCloudService { @Override - public List queryBdBonusCloud() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("CLOUD_TYPE,CLOUD_RATIO,PK_COUNTRY"); - return baseMapper.selectList(queryWrapper); - } - - /** - * @description: 新增云代配置 - * @author: zhang jing - * @date: 2022/11/1 17:11 - * @param: [bonusCloudExt] - * @return: boolean - **/ - @Override public boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt) { - for(BdBonusCloud bonusCloud:bonusCloudExt.getBonusCloudList()){ + for (BdBonusCloud bonusCloud : bonusCloudExt.getBonusCloudList()) { bonusCloud.setPkCountry(SecurityUtils.getPkCountry()); - if(StringUtils.isNotNull(bonusCloud.getPkId())){ + if (StringUtils.isNotNull(bonusCloud.getPkId())) { bonusCloud.setPkModified(SecurityUtils.getUserId()); bonusCloud.setModifiedTime(new Date()); baseMapper.updateById(bonusCloud); - }else{ + } else { bonusCloud.setPkCreator(SecurityUtils.getUserId()); bonusCloud.setCreationTime(new Date()); baseMapper.insert(bonusCloud); @@ -58,7 +37,7 @@ public class BdBonusCloudServiceImpl extends ServiceImpl implements IBdBonusExpandService { - - @Override - public List queryBdBonusExpand() { - return baseMapper.selectList(new QueryWrapper<>()); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusHiPinkServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusHiPinkServiceImpl.java index 3770d727..797990c4 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusHiPinkServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusHiPinkServiceImpl.java @@ -1,60 +1,14 @@ package com.hzs.system.config.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.system.config.BdBonusHiPink; import com.hzs.system.config.mapper.BdBonusHiPinkMapper; import com.hzs.system.config.service.IBdBonusHiPinkService; import org.springframework.stereotype.Service; -import java.util.List; - /** - *

* 嗨粉直推奖励配置 服务实现类 - *

- * - * @author zhangjing - * @since 2022-11-03 */ @Service public class BdBonusHiPinkServiceImpl extends ServiceImpl implements IBdBonusHiPinkService { - - /** - * @description: 新增嗨粉直推奖励配置 - * @author: zhang jing - * @date: 2022/11/3 19:54 - * @param: [bonusHiPinkList] - * @return: boolean - **/ - @Override - public boolean saveBonusHiPink(List bonusHiPinkList) { - for(BdBonusHiPink bbhp : bonusHiPinkList){ - baseMapper.insert(bbhp); - } - return true; - } - - /** - * @description: 修改嗨粉直推奖励配置 - * @author: zhang jing - * @date: 2022/11/4 9:25 - * @param: [bonusHiPinkList] - * @return: boolean - **/ - @Override - public boolean updateBonusHiPink(List bonusHiPinkList) { - for(BdBonusHiPink bbhp : bonusHiPinkList){ - baseMapper.insert(bbhp); - } - return true; - } - - @Override - public List queryBonusHiPink() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(" pk_country,range_type,pk_level,cal_type,bonus_value ") - .orderByAsc("pk_country,bonus_value,range_type,pk_level"); - return baseMapper.selectList(queryWrapper); - } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java index ccef8e7a..fa96fbeb 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java @@ -9,15 +9,12 @@ import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdGradeScope; -import com.hzs.common.domain.system.config.ext.BdBonusExpandExt; import com.hzs.common.domain.system.config.ext.BdGradeExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.system.base.ITransactionServiceApi; import com.hzs.system.config.mapper.BdGradeMapper; -import com.hzs.system.config.service.IBdBonusExpandService; import com.hzs.system.config.service.IBdGradeScopeService; import com.hzs.system.config.service.IBdGradeService; import org.apache.dubbo.config.annotation.DubboReference; @@ -38,8 +35,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl @Autowired private IBdGradeScopeService iBdGradeScopeService; @Autowired - private IBdBonusExpandService iBdBonusExpandService; - @Autowired private RedisService redisService; @DubboReference @@ -177,19 +172,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public boolean updateExpand(BdGradeExt gradeExt) { - //添加或修改4-N配置 - for (BdBonusExpandExt bee : gradeExt.getBonusExpands()) { - bee.setPkCountry(SecurityUtils.getPkCountry()); - if (StringUtils.isNull(bee.getPkId())) { - bee.setPkCreator(SecurityUtils.getUserId()); - bee.setCreationTime(new Date()); - iBdBonusExpandService.save(bee); - } else { - bee.setPkModified(SecurityUtils.getUserId()); - bee.setModifiedTime(new Date()); - iBdBonusExpandService.updateById(bee); - } - } //修改拓展信息 for (BdGrade bg : gradeExt.getExpandList()) { bg.setPkCountry(SecurityUtils.getPkCountry()); diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusCloudMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusCloudMapper.xml index 043a4815..03e428a6 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusCloudMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusCloudMapper.xml @@ -2,28 +2,4 @@ - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, CLOUD_TYPE, CLOUD_RATIO - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusExpandMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusExpandMapper.xml deleted file mode 100644 index 0b2016ae..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusExpandMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, EXPAND_NUMBER, EXPAND_RATIO - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java index f1414a4b..290e310e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 缓存的统一key 常量 - * - * @author hzs */ public class CacheConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java index 674fdf53..bcf38869 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java @@ -7,178 +7,178 @@ public class ConfigMsgConstants { /** * 最低提现金额不能为空 -- 最低提现金额不能为空！ */ -public static final String MIN_AMOUNT_NOT_NULL = "最低提现金额不能为空！"; + public static final String MIN_AMOUNT_NOT_NULL = "最低提现金额不能为空！"; /** * 手续费类型不能为空 -- 手续费类型不能为空！ */ -public static final String SERVICE_TYPE_NOT_NULL = "手续费类型不能为空！"; + public static final String SERVICE_TYPE_NOT_NULL = "手续费类型不能为空！"; /** * 提现个税扣除类型不能为空 -- 提现个税扣除类型不能为空！ */ -public static final String TAX_SERVICE_TYPE_NOT_NULL = "提现个税扣除类型不能为空！"; + public static final String TAX_SERVICE_TYPE_NOT_NULL = "提现个税扣除类型不能为空！"; /** * 提现个税明细不能为空 -- 提现个税明细不能为空！ */ -public static final String BD_WITHDRAWAL_TAX_DETAILS_NOT_NULL = "提现个税明细不能为空！"; + public static final String BD_WITHDRAWAL_TAX_DETAILS_NOT_NULL = "提现个税明细不能为空！"; /** * 手续费值不能为空 -- 手续费金额不能为空！ */ -public static final String SERVICE_RATIO_NOT_NULL = "手续费金额不能为空！"; + public static final String SERVICE_RATIO_NOT_NULL = "手续费金额不能为空！"; /** * 手续费重复 -- 手续费重复！ */ -public static final String SERVICE_TYPE_REPEAT = "手续费重复！"; + public static final String SERVICE_TYPE_REPEAT = "手续费重复！"; /** * 最高提现金额不能为空 -- 最高提现金额不能为空！ */ -public static final String MAX_AMOUNT_NOT_NULL = "最高提现金额不能为空！"; + public static final String MAX_AMOUNT_NOT_NULL = "最高提现金额不能为空！"; /** * 最低自动提现金额不能为空 -- 最低自动提现金额不能为空！ */ -public static final String LOWER_BOUND_NOT_NULL = "最低自动提现金额不能为空！"; + public static final String LOWER_BOUND_NOT_NULL = "最低自动提现金额不能为空！"; /** * 个税上界不能为空 -- 个税上界不能为空！ */ -public static final String TAX_MAX_AMOUNT_NOT_NULL = "个税上界不能为空！"; + public static final String TAX_MAX_AMOUNT_NOT_NULL = "个税上界不能为空！"; /** * 个税下界不能为空 -- 个税下界不能为空！ */ -public static final String TAX_LOWER_BOUND_NOT_NULL = "个税下界不能为空！"; + public static final String TAX_LOWER_BOUND_NOT_NULL = "个税下界不能为空！"; /** * 个税扣除不能为空 -- 个税扣除不能为空！ */ -public static final String TAX_RATIO_NOT_NULL = "个税扣除不能为空！"; + public static final String TAX_RATIO_NOT_NULL = "个税扣除不能为空！"; /** * 提现个税周期不能为空 -- 提现个税周期不能为空！ */ -public static final String TAX_CYCLE_NOT_NULL = "提现个税周期不能为空！"; + public static final String TAX_CYCLE_NOT_NULL = "提现个税周期不能为空！"; /** * 提现个税周期不能小于0大于12 -- 提现个税周期不能小于0大于12！ */ -public static final String TAX_CYCLE_NOT_STANDARD = "提现个税周期不能小于0大于12！"; + public static final String TAX_CYCLE_NOT_STANDARD = "提现个税周期不能小于0大于12！"; /** * 最高自动提现金额不能为空 -- 最高自动提现金额不能为空！ */ -public static final String UPPER_BOUND_NOT_NULL = "最高自动提现金额不能为空！"; + public static final String UPPER_BOUND_NOT_NULL = "最高自动提现金额不能为空！"; /** * 是否自动不能为空 -- 是否自动不能为空！ */ -public static final String IS_AUTO_NOT_NULL = "是否自动不能为空！"; + public static final String IS_AUTO_NOT_NULL = "是否自动不能为空！"; /** * 是否整取不能为空 -- 是否整取不能为空！ */ -public static final String IS_ROUNDING_NOT_NULL = "是否整取不能为空！"; + public static final String IS_ROUNDING_NOT_NULL = "是否整取不能为空！"; /** * 是否血缘不能为空 -- 是否血缘不能为空 */ -public static final String BD_TRANSFER_IS_REFERENCE_NOT_NULL = "是否血缘不能为空"; + public static final String BD_TRANSFER_IS_REFERENCE_NOT_NULL = "是否血缘不能为空"; /** * 提现次数不能为空 -- 提现次数不能为空 */ -public static final String WITHDRAWAL_NUMBER_NOT_NULL = "提现次数不能为空"; + public static final String WITHDRAWAL_NUMBER_NOT_NULL = "提现次数不能为空"; /** * 提现周期不能为空 -- 提现周期不能为空 */ -public static final String WITHDRAWAL_CYCLE_NOT_NULL = "提现周期不能为空"; + public static final String WITHDRAWAL_CYCLE_NOT_NULL = "提现周期不能为空"; /** * 最低提现金额不能大于最高提现金额 -- 最低提现金额不能大于最高提现金额 */ -public static final String COMPARISON_OF_SIZE = "最低提现金额不能大于最高提现金额"; + public static final String COMPARISON_OF_SIZE = "最低提现金额不能大于最高提现金额"; /** * 生效日期不能为空 -- 生效日期不能为空 */ -public static final String EFFECTIVE_DATE_NOT_NULL = "生效日期不能为空"; + public static final String EFFECTIVE_DATE_NOT_NULL = "生效日期不能为空"; /** * 倍数不能为空 -- 倍数不能为空 */ -public static final String MULTIPLE_NOT_NULL = "倍数不能为空"; + public static final String MULTIPLE_NOT_NULL = "倍数不能为空"; /** * 显示顺序不能为空 -- 显示顺序不能为空 */ -public static final String SORT_NOT_NULL = "显示顺序不能为空"; + public static final String SORT_NOT_NULL = "显示顺序不能为空"; /** * 显示顺序重复 -- 显示顺序重复 */ -public static final String SORT_NOT_REPEAT = "显示顺序重复"; + public static final String SORT_NOT_REPEAT = "显示顺序重复"; /** * 在线充值重复 -- 在线充值重复 */ -public static final String RECHARGE_NOT_REPEAT = "在线充值重复"; + public static final String RECHARGE_NOT_REPEAT = "在线充值重复"; /** * 账户名称不能为空 -- 账户名称不能为空 */ -public static final String ACCOUNT_NAME_NOT_NULL = "账户名称不能为空"; + public static final String ACCOUNT_NAME_NOT_NULL = "账户名称不能为空"; /** * 洲际名称不能为空 -- 大洲名称不能为空 */ -public static final String CONTINENT_NAME_NOT_NULL = "大洲名称不能为空"; + public static final String CONTINENT_NAME_NOT_NULL = "大洲名称不能为空"; /** * 大区名称不能为空 -- 大区名称不能为空 */ -public static final String REGION_NAME_NOT_NULL = "大区名称不能为空"; + public static final String REGION_NAME_NOT_NULL = "大区名称不能为空"; /** * 地区名称不能为空 -- 地区名称不能为空 */ -public static final String CONTINENT_AREA_NAME_NOT_NULL = "地区名称不能为空"; + public static final String CONTINENT_AREA_NAME_NOT_NULL = "地区名称不能为空"; /** * 上一级不能为空 -- 上一级不能为空 */ -public static final String UPPER_LEVEL_NOT_NULL = "上一级不能为空"; + public static final String UPPER_LEVEL_NOT_NULL = "上一级不能为空"; /** * 请选择要关联的国家 -- 请选择要关联的国家 */ -public static final String BINDING_COUNTRY_NOT_NULL = "请选择要关联的国家"; + public static final String BINDING_COUNTRY_NOT_NULL = "请选择要关联的国家"; /** * 请选择要关联的省 -- 请选择要关联的省 */ -public static final String BINDING_PROVINCE_NOT_NULL = "请选择要关联的省"; + public static final String BINDING_PROVINCE_NOT_NULL = "请选择要关联的省"; /** * 账户值不能为空 -- 账户值不能为空 */ -public static final String ACCOUNT_VALUE_NOT_NULL = "账户值不能为空"; + public static final String ACCOUNT_VALUE_NOT_NULL = "账户值不能为空"; /** * 办理业务手续费不存在 -- 办理业务手续费不存在 */ -public static final String BUSINESS_ACCOUNT_IS_NULL = "办理业务手续费不存在"; + public static final String BUSINESS_ACCOUNT_IS_NULL = "办理业务手续费不存在"; /** * 办理业务手续费退款失败 -- 办理业务手续费退款失败 */ -public static final String BUSINESS_ACCOUNT_IS_REFUND = "办理业务手续费退款失败"; + public static final String BUSINESS_ACCOUNT_IS_REFUND = "办理业务手续费退款失败"; /** * 所属专区不能为空 -- 所属专区不能为空 */ -public static final String SPECIAL_AREA_NOT_NULL = "所属专区不能为空"; + public static final String SPECIAL_AREA_NOT_NULL = "所属专区不能为空"; /** * 账户类型不能为空 -- 账户类型不能为空 */ -public static final String PK_ACCOUNT_NOT_NULL = "账户类型不能为空"; + public static final String PK_ACCOUNT_NOT_NULL = "账户类型不能为空"; /** * 扣款顺序重复 -- 扣款顺序重复 */ -public static final String DEDUCT_SORT_NOT_REPEAT = "扣款顺序重复"; + public static final String DEDUCT_SORT_NOT_REPEAT = "扣款顺序重复"; /** * 扣款顺序不能为空 -- 扣款顺序不能为空 */ -public static final String DEDUCT_SORT_NOT_NULL = "扣款顺序不能为空"; + public static final String DEDUCT_SORT_NOT_NULL = "扣款顺序不能为空"; /** * 扣款比例不能超过100% -- 扣款比例不能超过100% */ -public static final String DEDUCT_EXCEED_MAX = "扣款比例不能超过100%"; + public static final String DEDUCT_EXCEED_MAX = "扣款比例不能超过100%"; /** * 政策币扣款比例必须大于0 */ @@ -187,35 +187,31 @@ public static final String DEDUCT_EXCEED_MAX = "扣款比例不能超过100%"; /** * 扣款比例不能大于 -- 扣款比例不能大于 */ -public static final String DEDUCT_RATIO_NOT_MORE_THAN = "扣款比例不能大于"; - /** - * 配置扣款比例不足 -- 扣款比例不足 - */ -public static final String DEDUCT_RATIO_NOT_ENOUGH = "扣款比例不足"; + public static final String DEDUCT_RATIO_NOT_MORE_THAN = "扣款比例不能大于"; /** * 扣款比例不能为空 -- 扣款比例不能为空 */ -public static final String DEDUCT_RATIO_NOT_NULL = "扣款比例不能为空"; + public static final String DEDUCT_RATIO_NOT_NULL = "扣款比例不能为空"; /** * 扣款不能为空 -- 扣款不能为空 */ -public static final String DEDUCT_NOT_NULL = "扣款不能为空"; + public static final String DEDUCT_NOT_NULL = "扣款不能为空"; /** * 扣款比例已满100 -- 扣款比例已满100 */ -public static final String DEDUCT_RATIO_FULL = "扣款比例已满100"; + public static final String DEDUCT_RATIO_FULL = "扣款比例已满100"; /** * 比例不能为空 -- 比例不能为空 */ -public static final String RATIO_NOT_NULL = "比例不能为空"; + public static final String RATIO_NOT_NULL = "比例不能为空"; /** * 会员编号不能为空 -- 会员编号不能为空 */ -public static final String MEMBER_CODE_NOT_NULL = "会员编号不能为空"; + public static final String MEMBER_CODE_NOT_NULL = "会员编号不能为空"; /** * 会员名称不能为空 -- 会员名称不能为空 */ -public static final String MEMBER_NAME_NOT_NULL = "会员名称不能为空"; + public static final String MEMBER_NAME_NOT_NULL = "会员名称不能为空"; /** * 安置部门不能为空 -- 安置部门不能为空 @@ -224,41 +220,41 @@ public static final String MEMBER_NAME_NOT_NULL = "会员名称不能为空"; /** * 会员编号前两位编号不能修改 -- 会员编号前两位编号不能修改 */ -public static final String MEMBER_CODE_NOT_EQUAL = "会员编号前两位编号不能修改"; + public static final String MEMBER_CODE_NOT_EQUAL = "会员编号前两位编号不能修改"; /** * 请选择注水业绩 -- 请选择注水业绩 */ -public static final String ACHIEVE_NOT_NULL = "请选择注水业绩"; + public static final String ACHIEVE_NOT_NULL = "请选择注水业绩"; /** * 会员信息不存在 -- 会员信息不存在 */ -public static final String MEMBER_NOT_VALID = "会员信息不存在"; + public static final String MEMBER_NOT_VALID = "会员信息不存在"; /** * 变更后会员编号重复 -- 变更后会员编号重复 */ -public static final String UPDATE_MEMBER_CODE_REPEAT = "变更后会员编号重复"; + public static final String UPDATE_MEMBER_CODE_REPEAT = "变更后会员编号重复"; /** * 审批修改 -- 当前有修改正在进行中 */ -public static final String MEMBER_PARENT_UPDATE = "当前有修改正在进行中"; + public static final String MEMBER_PARENT_UPDATE = "当前有修改正在进行中"; /** * 最低转账金额不能为空 -- 最低转账金额不能为空 */ -public static final String MIN_AMOUNT_TRANSFER_NOT_NULL = "最低转账金额不能为空"; + public static final String MIN_AMOUNT_TRANSFER_NOT_NULL = "最低转账金额不能为空"; /** * 最高转账金额不能为空 -- 最高转账金额不能为空 */ -public static final String MAX_AMOUNT_TRANSFER_NOT_NULL = "最高转账金额不能为空"; + public static final String MAX_AMOUNT_TRANSFER_NOT_NULL = "最高转账金额不能为空"; /** * 转账特殊设置 -- 转账特殊设置不能为空 */ -public static final String TRANSFER_SPECIAL_MIN_AMOUNT_NOT_NULL = "转账特殊设置不能为空"; + public static final String TRANSFER_SPECIAL_MIN_AMOUNT_NOT_NULL = "转账特殊设置不能为空"; /** * 最低转账金额 -- 最低转账金额不能为空 */ -public static final String MIN_AMOUNT_MONEY_NOT_NULL = "最低转账金额不能为空"; + public static final String MIN_AMOUNT_MONEY_NOT_NULL = "最低转账金额不能为空"; /** * 结算值 注册金额/业绩不能为空 -- 注册金额/业绩不能为 */ @@ -266,123 +262,101 @@ public static final String MIN_AMOUNT_MONEY_NOT_NULL = "最低转账金额不能 /** * 拓展比例不能为空 -- 拓展比例不能为空 */ -public static final String EXPAND_RATIO_NOT_NULL = "拓展比例不能为空"; + public static final String EXPAND_RATIO_NOT_NULL = "拓展比例不能为空"; /** * 拓展封顶不能为空 -- 拓展封顶不能为空 */ -public static final String EXPAND_CAPPING_NOT_NULL = "拓展封顶不能为空"; + public static final String EXPAND_CAPPING_NOT_NULL = "拓展封顶不能为空"; /** * 复购拓展封顶不能为空 -- 复购拓展封顶不能为空 */ -public static final String REPURCHASE_CAPPING_NOT_NULL = "复购拓展封顶不能为空"; + public static final String REPURCHASE_CAPPING_NOT_NULL = "复购拓展封顶不能为空"; /** * 复购拓展比例不能为空 -- 复购拓展比例不能为空 */ -public static final String REPURCHASE_RATIO_NOT_NULL = "复购拓展比例不能为空"; - /** - * 小区考核不能为空 -- 小区考核起不能为空 - */ -public static final String COMMUNITY_CHECK_NOT_NULL = "小区考核起不能为空"; + public static final String REPURCHASE_RATIO_NOT_NULL = "复购拓展比例不能为空"; /** * 辅导代数不能为空 -- 辅导代数不能为空 */ -public static final String COACH_ALGEBRA_NOT_NULL = "辅导代数不能为空"; + public static final String COACH_ALGEBRA_NOT_NULL = "辅导代数不能为空"; /** * 辅导比例不能为空 -- 辅导比例不能为空 */ -public static final String COACH_RATIO_NOT_NULL = "辅导比例不能为空"; + public static final String COACH_RATIO_NOT_NULL = "辅导比例不能为空"; /** * 分红比例不能为空 -- 分红比例不能为空 */ -public static final String ABONUS_RATIO_NOT_NULL = "分红比例不能为空"; + public static final String ABONUS_RATIO_NOT_NULL = "分红比例不能为空"; - /** - * 复购考核不能为空 -- 复购考核不能为空 - */ -public static final String PURCHASE_CHECK_NOT_NULL = "复购考核不能为空"; - /** - * 分红考核不能为空 -- 分红考核不能为空 - */ -public static final String SHARE_CHECK_NOT_NULL = "分红考核不能为空"; /** * 环球积分不能为空 -- 环球积分不能为空 */ -public static final String GLOBAL_INTEGRAL_NOT_NULL = "环球积分不能为空"; + public static final String GLOBAL_INTEGRAL_NOT_NULL = "环球积分不能为空"; /** * 车奖积分不能为空 -- 车奖积分不能为空 */ -public static final String CAR_AWARD_POINTS_NOT_NULL = "车奖积分不能为空"; + public static final String CAR_AWARD_POINTS_NOT_NULL = "车奖积分不能为空"; /** * 真实奖衔不能为空 -- 真实奖衔不能为空 */ -public static final String AWARDS_NAME_NOT_NULL = "真实奖衔不能为空"; - - /** - * 左右区奖衔不能为空 -- 左右区奖衔不能为空 - */ -public static final String LEFT_RIGHT_AWARDS_NAME_NOT_NULL = "左右区奖衔不能为空"; + public static final String AWARDS_NAME_NOT_NULL = "真实奖衔不能为空"; /** * 颜色不能为空 -- 颜色不能为空 */ -public static final String COLOR_NOT_NULL = "颜色不能为空"; + public static final String COLOR_NOT_NULL = "颜色不能为空"; /** * 真实奖衔属性不能为空 -- 真实奖衔属性不能为空 */ -public static final String AWARDS_VALUE_NOT_NULL = "真实奖衔属性不能为空"; + public static final String AWARDS_VALUE_NOT_NULL = "真实奖衔属性不能为空"; /** * 极差名称不能为空 -- 极差名称不能为空 */ -public static final String RANGE_NAME_NOT_NULL = "极差名称不能为空"; + public static final String RANGE_NAME_NOT_NULL = "极差名称不能为空"; /** * 金额比例不能为空 -- 金额比例不能为空 */ -public static final String RANGE_MONEY_RATIO_NOT_NULL = "金额比例不能为空"; + public static final String RANGE_MONEY_RATIO_NOT_NULL = "金额比例不能为空"; /** * 业绩比例不能为空 -- 业绩比例不能为空 */ -public static final String RANGE_ACHIEVE_RATIO_NOT_NULL = "业绩比例不能为空"; + public static final String RANGE_ACHIEVE_RATIO_NOT_NULL = "业绩比例不能为空"; /** * 极差值不能为空 -- 极差值不能为空 */ -public static final String RANGE_VALUE_NOT_NULL = "极差值不能为空"; + public static final String RANGE_VALUE_NOT_NULL = "极差值不能为空"; /** * 极差值不能重复 -- 极差值不能重复 */ -public static final String RANGE_VALUE_REPEAT = "极差值不能重复"; + public static final String RANGE_VALUE_REPEAT = "极差值不能重复"; /** * 审核状态不能为空 -- 审核状态不能为空 */ -public static final String APPROVE_OPERATION_NOT_NULL = "审核状态不能为空"; + public static final String APPROVE_OPERATION_NOT_NULL = "审核状态不能为空"; /** * 等级或奖衔不能为空 -- 等级或奖衔不能为空 */ -public static final String PK_GRADE_AWARDS_NOT_NULL = "等级或奖衔不能为空"; + public static final String PK_GRADE_AWARDS_NOT_NULL = "等级或奖衔不能为空"; /** * 拓展次数不能为空 -- 拓展次数不能为空 */ -public static final String EXPAND_NUMBER_NOT_NULL = "拓展次数不能为空"; - - /** - * 4-N配置不能为空 -- 4-N配置不能为空 - */ -public static final String BONUS_EXPANDS_NOT_NULL = "4-N配置不能为空"; + public static final String EXPAND_NUMBER_NOT_NULL = "拓展次数不能为空"; /** * 区代名称不能为空 -- 区代名称不能为空 */ -public static final String AGENT_NAME_NOT_NULL = "区代名称不能为空"; + public static final String AGENT_NAME_NOT_NULL = "区代名称不能为空"; /** * 区代值不能为空 -- 区代值不能为空 */ -public static final String AGENT_VALUE_NOT_NULL = "区代值不能为空"; + public static final String AGENT_VALUE_NOT_NULL = "区代值不能为空"; /** * 等级不能为空 -- 等级不能为空 */ -public static final String PK_GRADE_NOT_NULL = "等级不能为空"; + public static final String PK_GRADE_NOT_NULL = "等级不能为空"; /** * 修改后推荐编号不能是本身或者血缘伞下 */ @@ -403,375 +377,375 @@ public static final String PK_GRADE_NOT_NULL = "等级不能为空"; /** * 注册权限不能为空 -- 注册权限不能为空 */ -public static final String REGISTER_AUTHORITY_NOT_NULL = "注册权限不能为空"; + public static final String REGISTER_AUTHORITY_NOT_NULL = "注册权限不能为空"; /** * 关系类型不能为空 -- 关系类型不能为空 */ -public static final String RELATION_TYPE_NOT_NULL = "关系类型不能为空"; + public static final String RELATION_TYPE_NOT_NULL = "关系类型不能为空"; /** * 考核奖衔不能为空 -- 考核奖衔不能为空 */ -public static final String PK_CHECK_AWARDS_NOT_NULL = "考核奖衔不能为空"; + public static final String PK_CHECK_AWARDS_NOT_NULL = "考核奖衔不能为空"; /** * 保存失败 -- 保存失败 */ -public static final String FAILED_TO_SAVE = "保存失败"; + public static final String FAILED_TO_SAVE = "保存失败"; /** * 协议标题不能为空 -- 协议标题不能为空 */ -public static final String PROTOCOL_TITLE_NOT_NULL = "协议标题不能为空"; + public static final String PROTOCOL_TITLE_NOT_NULL = "协议标题不能为空"; /** * 协议内容不能为空 -- 协议内容不能为空 */ -public static final String PROTOCOL_CONTENT_NOT_NULL = "协议内容不能为空"; + public static final String PROTOCOL_CONTENT_NOT_NULL = "协议内容不能为空"; /** * 内容不能为空 -- 内容不能为空 */ -public static final String HO_CONTENT_NOT_NULL = "内容不能为空"; + public static final String HO_CONTENT_NOT_NULL = "内容不能为空"; /** * 协议不能为空 -- 协议不能为空 */ -public static final String PK_AGREEMENT_NOT_NULL = "协议不能为空"; + public static final String PK_AGREEMENT_NOT_NULL = "协议不能为空"; /** * 店铺名称不能为空 -- 店铺名称不能为空 */ -public static final String SHOP_NAME_NOT_NULL = "店铺名称不能为空"; + public static final String SHOP_NAME_NOT_NULL = "店铺名称不能为空"; /** * 店铺等级名称不能为空 -- 店铺等级名称不能为空 */ -public static final String STORE_LEVEL_NAME_NOT_NULL = "店铺等级名称不能为空"; + public static final String STORE_LEVEL_NAME_NOT_NULL = "店铺等级名称不能为空"; /** * 店铺等级属性不能为空 -- 店铺等级属性不能为空 */ -public static final String LEVEL_VALUE_NOT_NULL = "店铺等级属性不能为空"; + public static final String LEVEL_VALUE_NOT_NULL = "店铺等级属性不能为空"; /** * 店铺等级业绩和比例不能为空 -- 店铺等级业绩和比例不能为空 */ -public static final String STORE_DETAIL_NOT_NULL = "店铺等级业绩和比例不能为空"; + public static final String STORE_DETAIL_NOT_NULL = "店铺等级业绩和比例不能为空"; /** * 店铺等级重复 -- 店铺等级重复 */ -public static final String LEVEL_VALUE_REPEAT = "店铺等级重复"; + public static final String LEVEL_VALUE_REPEAT = "店铺等级重复"; /** * 仓库编号不能为空 -- 仓库编号不能为空 */ -public static final String STOREHOUSE_CODE_NOT_NULL = "仓库编号不能为空"; + public static final String STOREHOUSE_CODE_NOT_NULL = "仓库编号不能为空"; /** * 仓库不能为空 -- 仓库不能为空 */ -public static final String STOREHOUSE_NOT_NULL = "仓库不能为空"; + public static final String STOREHOUSE_NOT_NULL = "仓库不能为空"; /** * 仓库名称不能为空 -- 仓库名称不能为空 */ -public static final String STOREHOUSE_NAME_NOT_NULL = "仓库名称不能为空"; + public static final String STOREHOUSE_NAME_NOT_NULL = "仓库名称不能为空"; /** * 仓库编号重复 -- 仓库编号重复 */ -public static final String STOREHOUSE_CODE_REPEAT = "仓库编号重复"; + public static final String STOREHOUSE_CODE_REPEAT = "仓库编号重复"; /** * 地区已绑定仓库 -- 已绑定仓库 */ -public static final String AREA_BINDING_REPEAT = "已绑定仓库"; + public static final String AREA_BINDING_REPEAT = "已绑定仓库"; /** * 配送中心名称不能为空 -- 配送中心名称不能为空 */ -public static final String DELIVERY_NAME_NOT_NULL = "配送中心名称不能为空"; + public static final String DELIVERY_NAME_NOT_NULL = "配送中心名称不能为空"; /** * 补贴比例不能为空 -- 补贴比例不能为空 */ -public static final String SUBSIDY_PROPORTION_NOT_NULL = "补贴比例不能为空"; + public static final String SUBSIDY_PROPORTION_NOT_NULL = "补贴比例不能为空"; /** * 统计值不能为空 -- 统计值不能为空 */ -public static final String CENSUS_VALUE_NOT_NULL = "统计值不能为空"; + public static final String CENSUS_VALUE_NOT_NULL = "统计值不能为空"; /** * 配送中心等级不能为空 -- 配送中心等级不能为空 */ -public static final String DELIVERY_GRADE_NOT_NULL = "配送中心等级不能为空"; + public static final String DELIVERY_GRADE_NOT_NULL = "配送中心等级不能为空"; /** * 等级属性不能为空 -- 等级属性不能为空 */ -public static final String GRADE_VALUE_NOT_NULL = "等级属性不能为空"; + public static final String GRADE_VALUE_NOT_NULL = "等级属性不能为空"; /** * 收益类型不能为空 -- 收益类型不能为空 */ -public static final String CLOUD_TYPE_NOT_NULL = "收益类型不能为空"; + public static final String CLOUD_TYPE_NOT_NULL = "收益类型不能为空"; /** * 收益比例不能为空 -- 收益比例不能为空 */ -public static final String CLOUD_RATIO_NOT_NULL = "收益比例不能为空"; + public static final String CLOUD_RATIO_NOT_NULL = "收益比例不能为空"; /** * 结算业绩不能为空 -- 结算业绩不能为空 */ -public static final String SHOP_SETTLE_VALUE_NOT_NULL = "结算业绩不能为空"; + public static final String SHOP_SETTLE_VALUE_NOT_NULL = "结算业绩不能为空"; /** * 联系人不能为空 -- 联系人不能为空 */ -public static final String CONTACTS_NOT_NULL = "联系人不能为空"; + public static final String CONTACTS_NOT_NULL = "联系人不能为空"; /** * 配送费不能为空 -- 配送费不能为空 */ -public static final String DELIVERY_FEE_NOT_NULL = "配送费不能为空"; + public static final String DELIVERY_FEE_NOT_NULL = "配送费不能为空"; /** * 联系方式不能为空 -- 联系方式不能为空 */ -public static final String MOBILEPHONE_NOT_NULL = "联系方式不能为空"; + public static final String MOBILEPHONE_NOT_NULL = "联系方式不能为空"; /** * 配送中心等级名称重复 -- 配送中心等级名称重复 */ -public static final String SHOP_NAME_REPEAT = "配送中心等级名称重复"; + public static final String SHOP_NAME_REPEAT = "配送中心等级名称重复"; /** * 配送中心名称重复 -- 配送中心名称重复 */ -public static final String DELIVERY_NAME_REPEAT = "配送中心名称重复"; + public static final String DELIVERY_NAME_REPEAT = "配送中心名称重复"; /** * 团队名称不能为空 -- 团队名称不能为空 */ -public static final String TEAM_NAME_NOT_NULL = "团队名称不能为空"; + public static final String TEAM_NAME_NOT_NULL = "团队名称不能为空"; /** * 团队编号不能为空 -- 团队编号不能为空 */ -public static final String TEAM_CODE_NOT_NULL = "团队编号不能为空"; + public static final String TEAM_CODE_NOT_NULL = "团队编号不能为空"; /** * 体系不能为空 -- 体系不能为空 */ -public static final String PK_BD_VERTEX_NOT_NULL = "体系不能为空"; + public static final String PK_BD_VERTEX_NOT_NULL = "体系不能为空"; /** * 会员已经加入团队 -- 会员已经加入团队 */ -public static final String MEMBER_CODE_REPEAT = "会员已经加入团队"; + public static final String MEMBER_CODE_REPEAT = "会员已经加入团队"; /** * 结算期间不能为空 -- 结算期间不能为空 */ -public static final String PERIOD_NOT_NULL = "结算期间不能为空"; + public static final String PERIOD_NOT_NULL = "结算期间不能为空"; /** * 直推收益不能为空 -- 推收益不能为空 */ -public static final String IS_REFERENCE_NOT_NULL = "直推收益不能为空"; + public static final String IS_REFERENCE_NOT_NULL = "直推收益不能为空"; /** * 拓展收益不能为空 -- 拓展收益不能为空 */ -public static final String IS_EXPAND_NOT_NULL = "拓展收益不能为空"; + public static final String IS_EXPAND_NOT_NULL = "拓展收益不能为空"; /** * 辅导收益不能为空 -- 辅导收益不能为空 */ -public static final String IS_COACH_NOT_NULL = "辅导收益不能为空"; + public static final String IS_COACH_NOT_NULL = "辅导收益不能为空"; /** * 分红收益不能为空 -- 分红收益不能为空 */ -public static final String IS_SHARE_NOT_NULL = "分红收益不能为空"; + public static final String IS_SHARE_NOT_NULL = "分红收益不能为空"; /** * 服务补贴不能为空 -- 服务补贴不能为空 */ -public static final String IS_SERVICE_NOT_NULL = "服务补贴不能为空"; + public static final String IS_SERVICE_NOT_NULL = "服务补贴不能为空"; /** * 复购极差收益不能为空 -- 复购极差收益不能为空 */ -public static final String IS_PURCHASE_RANGE_NOT_NULL = "复购极差收益不能为空"; + public static final String IS_PURCHASE_RANGE_NOT_NULL = "复购极差收益不能为空"; /** * 消费拓展收益不能为空 -- 消费拓展收益不能为空 */ -public static final String IS_CONSUME_EXPAND_NOT_NULL = "消费拓展收益不能为空"; + public static final String IS_CONSUME_EXPAND_NOT_NULL = "消费拓展收益不能为空"; /** * 商城重销不能为空 -- 商城重销不能为空 */ -public static final String IS_MALL_RESALE_NOT_NULL = "商城重销不能为空"; + public static final String IS_MALL_RESALE_NOT_NULL = "商城重销不能为空"; /** * 平台服务费不能为空 -- 平台服务费不能为空 */ -public static final String IS_PLATFORM_FEE_NOT_NULL = "平台服务费不能为空"; + public static final String IS_PLATFORM_FEE_NOT_NULL = "平台服务费不能为空"; /** * 复购券不能为空 -- 复购券不能为空 */ -public static final String IS_COUPONS_NOT_NULL = "复购券不能为空"; + public static final String IS_COUPONS_NOT_NULL = "复购券不能为空"; /** * 云代直推收益不能为空 -- 云代直推收益不能为空 */ -public static final String IS_CLOUD_REFERENCE_NOT_NULL = "云代直推收益不能为空"; + public static final String IS_CLOUD_REFERENCE_NOT_NULL = "云代直推收益不能为空"; /** * 云代首购收益不能为空 -- 云代首购收益不能为空 */ -public static final String IS_CLOUD_FIRST_NOT_NULL = "云代首购收益不能为空"; + public static final String IS_CLOUD_FIRST_NOT_NULL = "云代首购收益不能为空"; /** * 云代复购收益不能为空 -- 云代复购收益不能为空 */ -public static final String IS_CLOUD_REPEAT_NOT_NULL = "云代复购收益不能为空"; + public static final String IS_CLOUD_REPEAT_NOT_NULL = "云代复购收益不能为空"; /** * 全球分红不能为空 -- 全球分红不能为空 */ -public static final String IS_GLOBAL_DIVIDEND_NOT_NULL = "全球分红不能为空"; + public static final String IS_GLOBAL_DIVIDEND_NOT_NULL = "全球分红不能为空"; /** * 环球积分不能为空 -- 环球积分不能为空 */ -public static final String IS_GLOBAL_INTEGRAL_NOT_NULL = "环球积分不能为空"; + public static final String IS_GLOBAL_INTEGRAL_NOT_NULL = "环球积分不能为空"; /** * 车奖积分不能为空 -- 车奖积分不能为空 */ -public static final String IS_CAR_AWARD_POINTS_NOT_NULL = "车奖积分不能为空"; + public static final String IS_CAR_AWARD_POINTS_NOT_NULL = "车奖积分不能为空"; /** * 月份不能为空 -- 月份不能为空 */ -public static final String MONTH_NOT_NULL = "月份不能为空"; + public static final String MONTH_NOT_NULL = "月份不能为空"; /** * 期末总额不能为空 -- 期末总额不能为空 */ -public static final String TOTAL_AMOUNT_NOT_NULL = "期末总额不能为空"; + public static final String TOTAL_AMOUNT_NOT_NULL = "期末总额不能为空"; /** * 本月新增不能为空 -- 本月新增不能为空 */ -public static final String ADD_AMOUNT_NOT_NULL = "本月新增不能为空"; + public static final String ADD_AMOUNT_NOT_NULL = "本月新增不能为空"; /** * 本月发放不能为空 -- 本月发放不能为空 */ -public static final String USED_AMOUNT_NOT_NULL = "本月发放不能为空"; + public static final String USED_AMOUNT_NOT_NULL = "本月发放不能为空"; /** * 本月结余不能为空 -- 本月结余不能为空 */ -public static final String BALANCE_AMOUNT_NOT_NULL = "本月结余不能为空"; + public static final String BALANCE_AMOUNT_NOT_NULL = "本月结余不能为空"; /** * 当月标杆不能为空 -- 当月标杆不能为空 */ -public static final String BASE_AMOUNT_NOT_NULL = "当月标杆不能为空"; + public static final String BASE_AMOUNT_NOT_NULL = "当月标杆不能为空"; /** * 是否发放不能为空 -- 是否发放不能为空 */ -public static final String IS_GRANT_NOT_NULL = "是否发放不能为空"; + public static final String IS_GRANT_NOT_NULL = "是否发放不能为空"; /** * 分红配置重复 -- 分红配置重复 */ -public static final String SHARE_REPEAT = "分红配置重复"; + public static final String SHARE_REPEAT = "分红配置重复"; /** * 主键不能为空 -- 主键不能为空 */ -public static final String PKID_NOT_NULL = "主键不能为空"; + public static final String PKID_NOT_NULL = "主键不能为空"; /** * 分红配置不能为空 -- 分红配置不能为空 */ -public static final String PK_SHARE_NOT_NULL = "分红配置不能为空"; + public static final String PK_SHARE_NOT_NULL = "分红配置不能为空"; /** * 晋升人数不能为空 -- 晋升人数不能为空 */ -public static final String TOTAL_NUMBER_NOT_NULL = "晋升人数不能为空"; + public static final String TOTAL_NUMBER_NOT_NULL = "晋升人数不能为空"; /** * 达标人数不能为空 -- 达标人数不能为空 */ -public static final String REACH_NUMBER_NOT_NULL = "达标人数不能为空"; + public static final String REACH_NUMBER_NOT_NULL = "达标人数不能为空"; /** * 预发金额不能为空 -- 预发金额不能为空 */ -public static final String ADVANCE_MONEY_NOT_NULL = "预发金额不能为空"; + public static final String ADVANCE_MONEY_NOT_NULL = "预发金额不能为空"; /** * 实发金额不能为空 -- 实发金额不能为空 */ -public static final String PAY_MONEY_NOT_NULL = "实发金额不能为空"; + public static final String PAY_MONEY_NOT_NULL = "实发金额不能为空"; /** * 图片不能为空 -- 图片不能为空 */ -public static final String HO_PICTURE_NOT_NULL = "图片不能为空"; + public static final String HO_PICTURE_NOT_NULL = "图片不能为空"; /** * 发布位置不能为空 -- 发布位置不能为空 */ -public static final String HO_POSITION_NOT_NULL = "发布位置不能为空"; + public static final String HO_POSITION_NOT_NULL = "发布位置不能为空"; /** * 地区不能为空 -- 地区不能为空 */ -public static final String HO_REGION_NOT_NULL = "地区不能为空"; + public static final String HO_REGION_NOT_NULL = "地区不能为空"; /** * 国家不能为空 -- 国家不能为空 */ -public static final String HO_PKCOUNTRY_NOT_NULL = "国家不能为空"; + public static final String HO_PKCOUNTRY_NOT_NULL = "国家不能为空"; /** * 省不能为空 -- 省不能为空 */ -public static final String GLO_PROVINCE_NOT_NULL = "省不能为空"; + public static final String GLO_PROVINCE_NOT_NULL = "省不能为空"; /** * 市不能为空 -- 市不能为空 */ -public static final String GLO_CITY_NOT_NULL = "市不能为空"; + public static final String GLO_CITY_NOT_NULL = "市不能为空"; /** * 分公司不能为空 -- 分公司不能为空 */ -public static final String HO_COMPANY_NOT_NULL = "分公司不能为空"; + public static final String HO_COMPANY_NOT_NULL = "分公司不能为空"; /** * 联系人不能为空 -- 联系人不能为空 */ -public static final String HO_CONTACTS_NOT_NULL = "联系人不能为空"; + public static final String HO_CONTACTS_NOT_NULL = "联系人不能为空"; /** * 联系方式不能为空 -- 联系方式不能为空 */ -public static final String HO_PHONE_NOT_NULL = "联系方式不能为空"; + public static final String HO_PHONE_NOT_NULL = "联系方式不能为空"; /** * 详细地址不能为空 -- 详细地址不能为空 */ -public static final String HO_ADDRESS_NOT_NULL = "详细地址不能为空"; + public static final String HO_ADDRESS_NOT_NULL = "详细地址不能为空"; /** * 链接不能为空 -- 详细地址不能为空 */ -public static final String HO_LINK_ADDRESS_NOT_NULL = "链接不能为空"; + public static final String HO_LINK_ADDRESS_NOT_NULL = "链接不能为空"; /** * 排序不能为空 -- 排序不能为空 */ -public static final String HO_SORT_NOT_NULL = "排序不能为空"; + public static final String HO_SORT_NOT_NULL = "排序不能为空"; /** * 排序重复 -- 排序重复 */ -public static final String HO_SORT_NOT_REPEAT = "排序重复"; + public static final String HO_SORT_NOT_REPEAT = "排序重复"; /** * 数据不存在 -- 数据不存在 */ -public static final String HO_OBJECT_NOT_REPEAT = "数据不存在"; + public static final String HO_OBJECT_NOT_REPEAT = "数据不存在"; /** * 标题名称不能为空 -- 标题名称不能为空 */ -public static final String TITLE_NAME_NOT_NULL = "标题名称不能为空"; + public static final String TITLE_NAME_NOT_NULL = "标题名称不能为空"; /** * 副标题名称不能为空 -- 副标题名称不能为空 */ -public static final String TWO_TITLE_NAME_NOT_NULL = "副标题名称不能为空"; + public static final String TWO_TITLE_NAME_NOT_NULL = "副标题名称不能为空"; /** * 主键不能为空 -- 主键不能为空 */ -public static final String PK_ID_NOT_NULL = "主键不能为空"; + public static final String PK_ID_NOT_NULL = "主键不能为空"; /** * 时间不能为空 -- 时间不能为空 */ -public static final String TITLE_SETUP_TIME_NOT_NULL = "时间不能为空"; + public static final String TITLE_SETUP_TIME_NOT_NULL = "时间不能为空"; /** * 上传视频不能为空 -- 上传视频不能为空 */ -public static final String VIDEO_ADDRESS_NOT_NULL = "上传视频不能为空"; + public static final String VIDEO_ADDRESS_NOT_NULL = "上传视频不能为空"; /** * 封面图片不能为空 -- 封面图片不能为空 */ -public static final String COVER_ADDRESS_NOT_NULL = "封面图片不能为空"; + public static final String COVER_ADDRESS_NOT_NULL = "封面图片不能为空"; /** * 商品分类不能为空 -- 商品分类不能为空 */ -public static final String PK_HO_PRODUCT_RANGE_NOT_NULL = "商品分类不能为空"; + public static final String PK_HO_PRODUCT_RANGE_NOT_NULL = "商品分类不能为空"; /** * 产品不能为空 -- 产品不能为空 */ -public static final String PK_PRODUCT_NOT_NULL = "产品不能为空"; + public static final String PK_PRODUCT_NOT_NULL = "产品不能为空"; /** * 可提数量需大于0 -- 可提数量需大于0 */ @@ -791,362 +765,358 @@ public static final String PK_PRODUCT_NOT_NULL = "产品不能为空"; /** * 条形码前缀不能为空 -- 条形码前缀不能为空 */ -public static final String PREFIX_NOT_NULL = "条形码前缀不能为空"; + public static final String PREFIX_NOT_NULL = "条形码前缀不能为空"; /** * 条形码前缀位数不能超过两位 -- 条形码前缀位数不能超过两位 */ -public static final String PREFIX_DIGIT_ERROR = "条形码前缀位数不能超过两位"; + public static final String PREFIX_DIGIT_ERROR = "条形码前缀位数不能超过两位"; /** * 条形码是否年列不能为空 -- 条形码是否年列不能为空 */ -public static final String IS_YEAR_NOT_NULL = "条形码是否年列不能为空"; + public static final String IS_YEAR_NOT_NULL = "条形码是否年列不能为空"; /** * 条形码是否月不能为空 -- 条形码是否月不能为空 */ -public static final String IS_MONTH_NOT_NULL = "条形码是否月不能为空"; + public static final String IS_MONTH_NOT_NULL = "条形码是否月不能为空"; /** * 条形码尾号位数不能为空 -- 条形码尾号位数不能为空 */ -public static final String TAIL_NUMBER_NOT_NULL = "条形码尾号位数不能为空"; + public static final String TAIL_NUMBER_NOT_NULL = "条形码尾号位数不能为空"; /** * 条形码尾号位数长度不能大于9位 -- 条形码尾号位数长度不能大于9位 */ -public static final String TAIL_NUMBER_DIGIT_ERROR = "条形码尾号位数长度不能大于9位"; + public static final String TAIL_NUMBER_DIGIT_ERROR = "条形码尾号位数长度不能大于9位"; /** * 条形码是否初始化不能为空 -- 条形码是否初始化不能为空 */ -public static final String IS_INITIALIZE_NOT_NULL = "条形码是否初始化不能为空"; + public static final String IS_INITIALIZE_NOT_NULL = "条形码是否初始化不能为空"; /** * 条形码尾号不能为空 -- 条形码尾号不能为空 */ -public static final String END_NUMBER_NOT_NULL = "条形码尾号不能为空"; + public static final String END_NUMBER_NOT_NULL = "条形码尾号不能为空"; /** * 条形码当前尾号不能为空 -- 商品所属系列不能为空 */ -public static final String CURRENT_NUMBER_NOT_NULL = "商品所属系列不能为空"; + public static final String CURRENT_NUMBER_NOT_NULL = "商品所属系列不能为空"; /** * 是否启用不能为空 -- 是否启用不能为空 */ -public static final String ENABLE_STATE_NOT_NULL = "是否启用不能为空"; + public static final String ENABLE_STATE_NOT_NULL = "是否启用不能为空"; /** * 启用数据不能删除 -- 启用数据不能删除 */ -public static final String ENABLE_STATE_NOT_DELETE = "启用数据不能删除"; + public static final String ENABLE_STATE_NOT_DELETE = "启用数据不能删除"; /** * 条形码配置无效 -- 条形码配置无效 */ -public static final String PK_BAR_CODE_NOT_NULL = "条形码配置无效"; + public static final String PK_BAR_CODE_NOT_NULL = "条形码配置无效"; /** * 生成条形码数量不能为空 -- 生成条形码数量不能为空 */ -public static final String GENERATE_COUNT_NOT_NULL = "生成条形码数量不能为空"; + public static final String GENERATE_COUNT_NOT_NULL = "生成条形码数量不能为空"; /** * 会员礼包收货地址主键不能为空 -- 会员礼包收货地址主键不能为空 */ -public static final String CU_MEMBER_GIFT_PKID_NOT_NULL = "会员礼包收货地址主键不能为空"; + public static final String CU_MEMBER_GIFT_PKID_NOT_NULL = "会员礼包收货地址主键不能为空"; /** * 收货地址不能为空 -- 收货地址不能为空 */ -public static final String GIFT_ADDRESS_NOT_NULL = "收货地址不能为空"; + public static final String GIFT_ADDRESS_NOT_NULL = "收货地址不能为空"; /** * 收货人姓名不能为空 -- 收货人姓名不能为空 */ -public static final String GIFT_NAME_NOT_NULL = "收货人姓名不能为空"; + public static final String GIFT_NAME_NOT_NULL = "收货人姓名不能为空"; /** * 收货人手机不能为空 -- 收货人手机不能为空 */ -public static final String GIFT_PHONE_NOT_NULL = "收货人手机不能为空"; + public static final String GIFT_PHONE_NOT_NULL = "收货人手机不能为空"; /** * 收货地址省不能为空 -- 收货地址省不能为空 */ -public static final String GIFT_PROVINCE_NOT_NULL = "收货地址省不能为空"; + public static final String GIFT_PROVINCE_NOT_NULL = "收货地址省不能为空"; /** * 收货地址市不能为空 -- 收货地址市不能为空 */ -public static final String GIFT_CITY_NOT_NULL = "收货地址市不能为空"; + public static final String GIFT_CITY_NOT_NULL = "收货地址市不能为空"; /** * 收货地址县不能为空 -- 收货地址县不能为空 */ -public static final String GIFT_COUNTY_NOT_NULL = "收货地址县不能为空"; + public static final String GIFT_COUNTY_NOT_NULL = "收货地址县不能为空"; /** * 等级不能为空 -- 等级不能为空 */ -public static final String PK_SCOPE_NOT_NULL = "等级不能为空"; + public static final String PK_SCOPE_NOT_NULL = "等级不能为空"; /** * 注册金额不能为空 -- 注册金额不能为空 */ -public static final String REGISTER_VALUE_NOT_NULL = "注册金额不能为空"; + public static final String REGISTER_VALUE_NOT_NULL = "注册金额不能为空"; /** * 奖项名称不能为空 -- 奖项名称不能为空 */ -public static final String BONUS_NAME_NOT_NULL = "奖项名称不能为空"; + public static final String BONUS_NAME_NOT_NULL = "奖项名称不能为空"; /** * 结算周期不能为空 -- 结算周期不能为空 */ -public static final String SETTLE_TYPE_NOT_NULL = "结算周期不能为空"; + public static final String SETTLE_TYPE_NOT_NULL = "结算周期不能为空"; /** * 公布时间不能为空 -- 公布时间不能为空 */ -public static final String PUBLISH_TIME_NOT_NULL = "公布时间不能为空"; + public static final String PUBLISH_TIME_NOT_NULL = "公布时间不能为空"; /** * 公布日期不能为空 -- 公布日期不能为空 */ -public static final String PUBLISH_DATE_NOT_NULL = "公布日期不能为空"; + public static final String PUBLISH_DATE_NOT_NULL = "公布日期不能为空"; /** * 发布日期不能为空 -- 发布日期不能为空 */ -public static final String GRANT_DATE_NOT_NULL = "发布日期不能为空"; + public static final String GRANT_DATE_NOT_NULL = "发布日期不能为空"; /** * 可提现日期不能为空 -- 可提现日期不能为空 */ -public static final String WITHDRAWAL_DATE_NOT_NULL = "可提现日期不能为空"; + public static final String WITHDRAWAL_DATE_NOT_NULL = "可提现日期不能为空"; /** * 变更后会员编号不能为空 -- 变更后会员编号不能为空 */ -public static final String MEMBER_CODE_NEW_NOT_NULL = "变更后会员编号不能为空"; + public static final String MEMBER_CODE_NEW_NOT_NULL = "变更后会员编号不能为空"; /** * 变更后结算国不能为空 -- 变更后结算国不能为空 */ -public static final String SETTLE_COUNTRY_NEW_NOT_NULL = "变更后结算国不能为空"; + public static final String SETTLE_COUNTRY_NEW_NOT_NULL = "变更后结算国不能为空"; /** * 结算国不能为空 -- 结算国不能为空 */ -public static final String SETTLE_COUNTRY_OLD_NOT_NULL = "结算国不能为空"; + public static final String SETTLE_COUNTRY_OLD_NOT_NULL = "结算国不能为空"; /** * 存在7天内奖金结算未完成 -- 存在7天内奖金结算未完成 */ -public static final String BONUS_SETTLE_NOT_COMPLETED = "存在7天内奖金结算未完成"; + public static final String BONUS_SETTLE_NOT_COMPLETED = "存在7天内奖金结算未完成"; /** * 会员手机不能为空 -- 会员手机不能为空 */ -public static final String MEMBER_PHONE_NOT_NULL = "会员手机不能为空"; + public static final String MEMBER_PHONE_NOT_NULL = "会员手机不能为空"; /** * 签呈流程类型不能为空 -- 签呈流程类型不能为空 */ -public static final String PROCESS_TYPE_NOT_NULL = "签呈流程类型不能为空"; + public static final String PROCESS_TYPE_NOT_NULL = "签呈流程类型不能为空"; /** * 业务类型不能为空 -- 业务类型不能为空 */ -public static final String WORK_TYPE_NOT_NULL = "业务类型不能为空"; + public static final String WORK_TYPE_NOT_NULL = "业务类型不能为空"; /** * 业务单号不能为空 -- 业务单号不能为空 */ -public static final String WORK_NO_NOT_NULL = "业务单号不能为空"; + public static final String WORK_NO_NOT_NULL = "业务单号不能为空"; /** * 会员余额不足 -- 会员余额不足 */ -public static final String MEMBER_BALANCE_INSUFFICIENT = "会员余额不足"; + public static final String MEMBER_BALANCE_INSUFFICIENT = "会员余额不足"; /** * 数据不能为空 -- 数据不能为空 */ -public static final String MEMBER_DATA_NOT_NULL = "数据不能为空"; + public static final String MEMBER_DATA_NOT_NULL = "数据不能为空"; /** * 会员存在未审核数据 -- 会员存在未审核数据 */ -public static final String MEMBER_UPDATE_CODE_REPEAT = "会员存在未审核数据"; + public static final String MEMBER_UPDATE_CODE_REPEAT = "会员存在未审核数据"; /** * 订单超过24小时无法申请 -- 订单超过24小时无法申请 */ -public static final String ORDER_TIMEOUT = "订单超过24小时无法申请"; + public static final String ORDER_TIMEOUT = "订单超过24小时无法申请"; /** * 会员账户余额不为零 -- 会员账户余额不为零 */ -public static final String MEMBER_ACCOUNT_NOT_ZERO = "会员账户余额不为零"; + public static final String MEMBER_ACCOUNT_NOT_ZERO = "会员账户余额不为零"; /** * 会员有充值未审核 -- 会员有充值未审核 */ -public static final String MEMBER_CECHARGE_REPEAT = "会员有充值未审核"; + public static final String MEMBER_CECHARGE_REPEAT = "会员有充值未审核"; /** * 会员有提现未审核 -- 会员有提现未审核 */ -public static final String MEMBER_WITHDRAW_REPEAT = "会员有提现未审核"; + public static final String MEMBER_WITHDRAW_REPEAT = "会员有提现未审核"; /** * 会员有绑定的银行卡 -- 会员有绑定的银行卡 */ -public static final String MEMBER_BINDING_BANK = "会员有绑定的银行卡"; + public static final String MEMBER_BINDING_BANK = "会员有绑定的银行卡"; /** * 会员有未审核注水业绩 -- 会员有未审核注水业绩 */ -public static final String MEMBER_ACHIEVE_REPEAT = "会员有未审核注水业绩"; + public static final String MEMBER_ACHIEVE_REPEAT = "会员有未审核注水业绩"; /** * 只能注水7天以内业绩 -- 只能注水7天以内业绩 */ -public static final String ACHIEVE_WITHIN_SEVEN_DAYS = "只能注水7天以内业绩"; + public static final String ACHIEVE_WITHIN_SEVEN_DAYS = "只能注水7天以内业绩"; /** * 修改会员编号扣款失败 -- 修改会员编号扣款失败 */ -public static final String MEMBER_UPDATE_CODE_MONEY = "修改会员编号扣款失败"; + public static final String MEMBER_UPDATE_CODE_MONEY = "修改会员编号扣款失败"; /** * 变更后国家等级未配置 -- 变更后国家等级未配置 */ -public static final String UPDATE_COUNTRY_AFTER_GRADE_IS_NULL = "变更后国家等级未配置"; + public static final String UPDATE_COUNTRY_AFTER_GRADE_IS_NULL = "变更后国家等级未配置"; /** * 变更后国家奖衔未配置 -- 变更后国家奖衔未配置 */ -public static final String UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL = "变更后国家奖衔未配置"; + public static final String UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL = "变更后国家奖衔未配置"; /** * 修改安置编号扣款失败 -- 修改会员编号扣款失败 */ -public static final String MEMBER_UPDATE_PLACE_MONEY = "修改会员编号扣款失败"; + public static final String MEMBER_UPDATE_PLACE_MONEY = "修改会员编号扣款失败"; /** * 修改安置发起失败 -- 修改安置发起失败 */ -public static final String MEMBER_UPDATE_PLACE_PARENT = "修改安置发起失败"; + public static final String MEMBER_UPDATE_PLACE_PARENT = "修改安置发起失败"; /** * 修改会员编号发起签呈失败 -- 修改会员编号发起签呈失败 */ -public static final String MEMBER_UPDATE_PETITION = "修改会员编号发起签呈失败"; + public static final String MEMBER_UPDATE_PETITION = "修改会员编号发起签呈失败"; /** * 注水业绩发起签呈失败 -- 注水业绩发起签呈失败 */ -public static final String MEMBER_ACHIEVE_DEDUCT_PETITION = "注水业绩发起签呈失败"; + public static final String MEMBER_ACHIEVE_DEDUCT_PETITION = "注水业绩发起签呈失败"; /** * 添加真实奖衔控制重复 -- 添加真实奖衔控制重复 */ -public static final String AWARDS_CONTROL_SAVE_REPEAT = "添加真实奖衔控制重复"; + public static final String AWARDS_CONTROL_SAVE_REPEAT = "添加真实奖衔控制重复"; /** * 添加真实奖衔控制发起签呈失败 -- 添加真实奖衔控制发起签呈失败 */ -public static final String AWARDS_CONTROL_SAVE_PETITION = "添加真实奖衔控制发起签呈失败"; + public static final String AWARDS_CONTROL_SAVE_PETITION = "添加真实奖衔控制发起签呈失败"; /** * 修改真实奖衔控制发起签呈失败 -- 修改真实奖衔控制发起签呈失败 */ -public static final String AWARDS_CONTROL_MODIFY_PETITION = "修改真实奖衔控制发起签呈失败"; + public static final String AWARDS_CONTROL_MODIFY_PETITION = "修改真实奖衔控制发起签呈失败"; /** * 删除真实奖衔控制发起签呈失败 -- 删除真实奖衔控制发起签呈失败 */ -public static final String AWARDS_CONTROL_DELETE_PETITION = "删除真实奖衔控制发起签呈失败"; + public static final String AWARDS_CONTROL_DELETE_PETITION = "删除真实奖衔控制发起签呈失败"; /** * 修改结算国发起签呈失败 -- 修改结算国发起签呈失败 */ -public static final String UPDATE_SETTLE_PETITION = "修改结算国发起签呈失败"; + public static final String UPDATE_SETTLE_PETITION = "修改结算国发起签呈失败"; /** * 修改政策币发起签呈失败 -- 修改政策币发起签呈失败 */ -public static final String POLICY_CURRENCY_PETITION = "修改政策币发起签呈失败"; + public static final String POLICY_CURRENCY_PETITION = "修改政策币发起签呈失败"; /** * 自助服务-修改收货地址 -- 自助服务修改收货地址发起签呈失败 */ -public static final String SELF_MODIFY_ADDRESS = "自助服务修改收货地址发起签呈失败"; + public static final String SELF_MODIFY_ADDRESS = "自助服务修改收货地址发起签呈失败"; /** * 零元撤单扣款失败 -- 零元撤单扣款失败 */ -public static final String ZERO_ELEMENT_REVOKE_MONEY = "零元撤单扣款失败"; + public static final String ZERO_ELEMENT_REVOKE_MONEY = "零元撤单扣款失败"; /** * 修改结算国扣款失败 -- 修改结算国扣款失败 */ -public static final String UPDATE_SETTLE_MONEY = "修改结算国扣款失败"; + public static final String UPDATE_SETTLE_MONEY = "修改结算国扣款失败"; /** * 修改政策币扣款失败 -- 修改政策币扣款失败 */ -public static final String POLICY_CURRENCY_MONEY = "修改政策币扣款失败"; + public static final String POLICY_CURRENCY_MONEY = "修改政策币扣款失败"; /** * 注水业绩扣款失败 -- 注水业绩扣款失败 */ -public static final String MEMBER_ACHIEVE_DEDUCT_MONEY = "注水业绩扣款失败"; + public static final String MEMBER_ACHIEVE_DEDUCT_MONEY = "注水业绩扣款失败"; /** * 审批特殊业务流程出错 -- 审批特殊业务流程出错 */ -public static final String MEMBER_UPDATE_CODE_ERROR = "审批特殊业务流程出错"; + public static final String MEMBER_UPDATE_CODE_ERROR = "审批特殊业务流程出错"; /** * 签呈不存在 -- 签呈不存在 */ -public static final String PETITION_ABSENT_ERROR = "签呈不存在"; + public static final String PETITION_ABSENT_ERROR = "签呈不存在"; /** * 签呈已审核 -- 签呈已审核 */ -public static final String PETITION_AUDITED_ERROR = "签呈已审核"; + public static final String PETITION_AUDITED_ERROR = "签呈已审核"; /** * 审批流程不能为空 -- 审批流程不能为空 */ -public static final String EXAMINE_AND_APPROVE_NOT_NULL = "审批流程不能为空"; + public static final String EXAMINE_AND_APPROVE_NOT_NULL = "审批流程不能为空"; /** * 错误数据 -- 错误数据 */ -public static final String MEMBER_DATA_ERROR = "错误数据"; + public static final String MEMBER_DATA_ERROR = "错误数据"; /** * 数据重复 -- 数据重复 */ -public static final String DATA_REPEAT = "数据重复"; + public static final String DATA_REPEAT = "数据重复"; /** * 注水日期不能为空 -- 注水日期不能为空 */ -public static final String SETTLEDATE_NOT_VALID = "注水日期不能为空"; + public static final String SETTLEDATE_NOT_VALID = "注水日期不能为空"; /** * 零元撤单发起签呈失败 -- 零元撤单发起签呈失败 */ -public static final String ZERO_ELEMENT_REVOKE_PETITION = "零元撤单发起签呈失败"; + public static final String ZERO_ELEMENT_REVOKE_PETITION = "零元撤单发起签呈失败"; /** * 注水日期不能大于结束日期 -- 注水日期不能大于结束日期 */ -public static final String SETTLE_DUE_DATE_COMPARE = "注水日期不能大于结束日期"; + public static final String SETTLE_DUE_DATE_COMPARE = "注水日期不能大于结束日期"; /** * 注水业绩类型不能为空 -- 注水业绩类型不能为空 */ -public static final String INFUSING_WATER_TYPE_NOT_NULL = "注水业绩类型不能为空"; + public static final String INFUSING_WATER_TYPE_NOT_NULL = "注水业绩类型不能为空"; /** * 变更后注水业绩不能为空 -- 变更后注水业绩不能为空 */ -public static final String INFUSING_WATER_PV_NOT_NULL = "变更后注水业绩不能为空"; - /** - * 4-N配置 -- 4-N配置 - */ -public static final String FOUR_N_DISPOSE = "4-N配置"; + public static final String INFUSING_WATER_PV_NOT_NULL = "变更后注水业绩不能为空"; /** * 签呈文件类型不能为空 -- 签呈文件类型不能为空 */ -public static final String SIGN_TYPE_NOT_NULL = "签呈文件类型不能为空"; + public static final String SIGN_TYPE_NOT_NULL = "签呈文件类型不能为空"; /** * 扣款币种 （页面固定文字） -- 扣款币种 */ -public static final String DEDUCTION_CURRENCY = "扣款币种"; + public static final String DEDUCTION_CURRENCY = "扣款币种"; /** * 变更后 （页面固定文字） -- 变更后 */ -public static final String AFTER_THE_CHANGE = "变更后"; + public static final String AFTER_THE_CHANGE = "变更后"; /** * 汇率配置至少存在一条,无法禁用 -- 汇率配置至少存在一条,无法禁用 */ -public static final String CURRENCY_UNABLE_TO_FAIL = "汇率配置至少存在一条,无法禁用"; + public static final String CURRENCY_UNABLE_TO_FAIL = "汇率配置至少存在一条,无法禁用"; /** * 活动不能为空 -- 活动不能为空 */ -public static final String ACTIVITY_NOT_NULL = "活动不能为空"; + public static final String ACTIVITY_NOT_NULL = "活动不能为空"; /** * 活动已存在 -- 活动已存在 @@ -1156,55 +1126,55 @@ public static final String ACTIVITY_NOT_NULL = "活动不能为空"; /** * 左右区结余不能同时大于零 -- 左右区结余不能同时大于零 */ -public static final String BALANCE_NOT_ZERO = "左右区结余不能同时大于零"; + public static final String BALANCE_NOT_ZERO = "左右区结余不能同时大于零"; /** * 政策币启用状态不能为空 -- 政策币启用状态不能为空 */ -public static final String ENABLE_STATUS_NOT_NULL = "政策币启用状态不能为空"; + public static final String ENABLE_STATUS_NOT_NULL = "政策币启用状态不能为空"; /** * 政策币扣款比例不能为空 -- 政策币扣款比例不能为空 */ -public static final String DEDUCT_MONEY_NOT_NULL = "政策币扣款比例不能为空"; + public static final String DEDUCT_MONEY_NOT_NULL = "政策币扣款比例不能为空"; /** * 政策币转账不能为空 -- 政策币转账不能为空 */ -public static final String TRANSFER_NOT_NULL = "政策币转账不能为空"; + public static final String TRANSFER_NOT_NULL = "政策币转账不能为空"; /** * 基础业务模板 -- 基础业务模板 */ -public static final String BASIC_BUSINESS = "基础业务模板"; + public static final String BASIC_BUSINESS = "基础业务模板"; /** * 邮费模板名称必填 -- 邮费模板名称必填 */ -public static final String POSTAGE_TEMPLATE_IS_REQUIRED = "邮费模板名称必填"; + public static final String POSTAGE_TEMPLATE_IS_REQUIRED = "邮费模板名称必填"; /** * 营业执照状态 -- 营业执照状态不能为空 */ -public static final String LICENSE_STATE_NOT_EMPTY = "营业执照状态不能为空"; + public static final String LICENSE_STATE_NOT_EMPTY = "营业执照状态不能为空"; /** * 业务模块不能为空 -- 业务模块不能为空 */ -public static final String BUSINESS_MODULE = "业务模块不能为空"; + public static final String BUSINESS_MODULE = "业务模块不能为空"; /** * 会员编号不能为空 -- 会员编号不能为空 */ -public static final String MEMBER_CODE_NOT_EMPTY = "会员编号不能为空"; + public static final String MEMBER_CODE_NOT_EMPTY = "会员编号不能为空"; /** * 会员不存在 -- 会员不存在 */ -public static final String MEMBER_NOT_EXIST = "会员不存在"; + public static final String MEMBER_NOT_EXIST = "会员不存在"; /** * 提现权限或转账权限不能为空 -- 提现权限或转账权限不能为空 */ -public static final String WITHDRAWAL_NOT_EMPTY = "提现权限或转账权限不能为空"; + public static final String WITHDRAWAL_NOT_EMPTY = "提现权限或转账权限不能为空"; /** * 修改安置安置位置已被占用 -- 修改安置安置位置已被占用 */ @@ -1212,37 +1182,37 @@ public static final String WITHDRAWAL_NOT_EMPTY = "提现权限或转账权限 /** * 请填写驳回信息 -- 请填写驳回信息 */ -public static final String REJECT_MSG_NOT_NULL = "请填写驳回信息"; + public static final String REJECT_MSG_NOT_NULL = "请填写驳回信息"; /** * 统计体系不能为空 -- 联创统计 */ -public static final String LIANCHUANG_STAT_CODE = "统计体系编号不能为空"; + public static final String LIANCHUANG_STAT_CODE = "统计体系编号不能为空"; /** * 统计名称不能为空 -- 联创统计 */ -public static final String LIANCHUANG_STAT_NAME = "统计名称不能为空"; + public static final String LIANCHUANG_STAT_NAME = "统计名称不能为空"; /** * 统计加区不能为空 -- 联创统计 */ -public static final String LIANCHUANG_STAT_ADD_REGION = "统计加区不能为空"; + public static final String LIANCHUANG_STAT_ADD_REGION = "统计加区不能为空"; /** * 修改免考状态无效 -- 办理业务 */ -public static final String FREE_ASSESSMENT_STATE_INVALID = "修改免考状态无效"; + public static final String FREE_ASSESSMENT_STATE_INVALID = "修改免考状态无效"; /** * 办理业务手续费退款失败 -- 真实奖衔控制驳回签呈退费失败 */ -public static final String AWARDS_CONTROL_IS_REFUND = "真实奖衔控制驳回签呈退费失败"; + public static final String AWARDS_CONTROL_IS_REFUND = "真实奖衔控制驳回签呈退费失败"; /** * 注水业绩扣款失败 -- 注水业绩驳回签呈退款失败 */ -public static final String MEMBER_ACHIEVE_IS_REFUND = "注水业绩驳回签呈退款失败"; + public static final String MEMBER_ACHIEVE_IS_REFUND = "注水业绩驳回签呈退款失败"; /** * 请选择政策币业务 -- 请选择政策币业务 */ -public static final String POLICY_CURRENCY_NOT_NULL = "请选择政策币业务"; + public static final String POLICY_CURRENCY_NOT_NULL = "请选择政策币业务"; /** * 领用用途重复 -- 领用用途重复 */ @@ -1254,16 +1224,12 @@ public static final String POLICY_CURRENCY_NOT_NULL = "请选择政策币业务" /** * 会员控制配置重复 -- 会员控制配置重复 */ -public static final String MEMBER_AUTHORITY_CONTROL = "会员控制配置重复"; + public static final String MEMBER_AUTHORITY_CONTROL = "会员控制配置重复"; /** * 会员实名认证重复 -- 会员实名认证重复 */ -public static final String REAL_NAME_AUTHENTICATION_REPEAT = "会员实名认证重复"; - /** - * 小区考核不能为空 -- 小区考核止不能为空 - */ -public static final String COMMUNITY_CHECK_END_NOT_NULL = "小区考核止不能为空"; + public static final String REAL_NAME_AUTHENTICATION_REPEAT = "会员实名认证重复"; /** * 会员已存在 -- 会员已存在 diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java index a46162b9..1f4b0000 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java @@ -1,8 +1,6 @@ package com.hzs.common.domain.system.config; import com.baomidou.mybatisplus.annotation.*; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.web.domain.BaseEntity; @@ -31,7 +29,6 @@ public class BdAwards extends BaseEntity { /** * 奖衔名称 */ - @Excel(name = "奖衔名称", sort = 1) @TableField("AWARDS_NAME") private String awardsName; /** @@ -55,7 +52,6 @@ public class BdAwards extends BaseEntity { /** * 小区考核PV */ - @Excel(name = "小区业绩PV", sort = 2) @TableField("COMMUNITY_CHECK") private BigDecimal communityCheck; @@ -68,21 +64,18 @@ public class BdAwards extends BaseEntity { /** * 复购考核 */ - @Excel(name = "复购考核PV", sort = 3) @TableField("PURCHASE_CHECK") private BigDecimal purchaseCheck; /** * 小区考核结束PV */ - @Excel(name = "小区业绩结束PV", sort = 2) @TableField("COMMUNITY_CHECK_END") private BigDecimal communityCheckEnd; /** * 分红考核 */ - @Excel(name = "分红考核BV", sort = 4) @TableField("SHARE_CHECK") private BigDecimal shareCheck; @@ -102,7 +95,6 @@ public class BdAwards extends BaseEntity { * 左区奖衔 */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - @Excel(name = "左区奖衔", sort = 5) @TableField(value = "PK_CHECK_AWARDS_LEFT", jdbcType = JdbcType.NUMERIC, updateStrategy = FieldStrategy.IGNORED) private Integer pkCheckAwardsLeft; @@ -110,7 +102,6 @@ public class BdAwards extends BaseEntity { * 右区奖衔 */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - @Excel(name = "右区奖衔", sort = 6) @TableField(value = "PK_CHECK_AWARDS_RIGHT", jdbcType = JdbcType.NUMERIC, updateStrategy = FieldStrategy.IGNORED) private Integer pkCheckAwardsRight; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusCloud.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusCloud.java index 690ab987..b5c84320 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusCloud.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusCloud.java @@ -14,13 +14,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

- * 云代配置 - - *

- * - * @author zhangjing - * @since 2022-11-01 + * 云代配置 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusExpand.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusExpand.java deleted file mode 100644 index 489a7cb4..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusExpand.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.common.domain.system.config; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 奖金4—N配置 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("BD_BONUS_EXPAND") -@KeySequence("BD_BONUS_EXPAND_SEQ") -public class BdBonusExpand extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId("PK_ID") - private BigDecimal pkId; - - /** - * 拓展次数 - */ - @TableField("EXPAND_NUMBER") - private Integer expandNumber; - - /** - * 拓展比例 - */ - @TableField("EXPAND_RATIO") - private BigDecimal expandRatio; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusHiPink.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusHiPink.java index 2fe0418e..14bcce27 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusHiPink.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusHiPink.java @@ -12,12 +12,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

* 嗨粉直推奖励配置 - *

- * - * @author zhangjing - * @since 2022-11-03 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java index 5e77191f..aa96ce57 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java @@ -1,15 +1,10 @@ package com.hzs.common.domain.system.config.ext; -import com.baomidou.mybatisplus.annotation.TableId; import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.domain.system.config.BdAwards; -import com.hzs.common.domain.system.config.BdAwardsDetail; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; import java.util.List; /** @@ -20,10 +15,10 @@ import java.util.List; public class BdAwardsExt extends BdAwards { private static final long serialVersionUID = 1L; + /** * 关系类型名称 */ - @Excel(name = "考核", sort = 7) private String relationTypeVal; /** * 辅导分红集合 diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdBonusExpandExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdBonusExpandExt.java deleted file mode 100644 index 84fdf5af..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdBonusExpandExt.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzs.common.domain.system.config.ext; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.system.config.BdBonusExpand; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - *

- * 奖金4—N配置 - - *

- * - * @author hzs - * @since 2022-10-31 - */ -@Data -public class BdBonusExpandExt extends BdBonusExpand { - - private static final long serialVersionUID = 1L; - /** - * 拓展名称 - */ - private String expandName; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdGradeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdGradeExt.java index d14bd950..885a1e97 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdGradeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdGradeExt.java @@ -2,8 +2,6 @@ package com.hzs.common.domain.system.config.ext; import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.domain.system.config.BdBonusExpand; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.ext.BdGradeScopeExt; import lombok.Data; @@ -12,12 +10,7 @@ import lombok.EqualsAndHashCode; import java.util.List; /** - *

* 等级配置表 - *

- * - * @author zhangjing - * @since 2022-09-08 */ @EqualsAndHashCode(callSuper = true) @Data @@ -38,29 +31,29 @@ public class BdGradeExt extends BdGrade { /** * 统计值名称 EStatisticalValue */ - @Excel(name = "统计类型",sort = 2) + @Excel(name = "统计类型", sort = 2) private String censusValueVal; /** * 注册权限 ERegistrationAuthority */ - @Excel(name = "注册权限",sort = 4) + @Excel(name = "注册权限", sort = 4) private String registerAuthorityVal; /** * 奖衔权限 */ - @Excel(name = "真实奖衔",sort = 5) + @Excel(name = "真实奖衔", sort = 5) private String pkAwardsVal; /** * 等级范围（直推范围） */ - private Integer gradeRang []; + private Integer gradeRang[]; /** * 等级范围（直推范围） */ - @Excel(name = "直推范围",sort = 6) + @Excel(name = "直推范围", sort = 6) private String gradeRangVal; /** @@ -74,11 +67,6 @@ public class BdGradeExt extends BdGrade { */ private List expandList; - /** - * 奖金4—N配置拓展集合 - */ - private List bonusExpands; - /** * 首购计算 EDealerYesNo */ @@ -98,9 +86,4 @@ public class BdGradeExt extends BdGrade { */ private String repurchaseAssessVal; - - - - - }