From 3bec39e68a4924ba0c158ec332fadec39a4e0bec Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 8 Jul 2025 14:26:46 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=AD=89=E7=BA=A7=E3=80=81=E5=A4=8D?= =?UTF-8?q?=E8=B4=AD=E7=BA=A7=E5=B7=AE=E6=B7=BB=E5=8A=A0=E5=88=B07?= =?UTF-8?q?=E7=BA=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/base/mapper/BdNoticeMapper.java | 20 - .../system/base/service/IBdNoticeService.java | 16 +- .../service/impl/BdNoticeServiceImpl.java | 47 +- .../com/hzs/system/base/vo/BdNoticeVO.java | 6 +- .../manage/BdRetailRangeController.java | 141 ++--- .../config/mapper/BdRangeDetailsMapper.java | 12 +- .../service/IBdRangeDetailsService.java | 14 +- .../impl/BdRangeDetailsServiceImpl.java | 13 +- .../mapper/system/base/BdNoticeMapper.xml | 119 ++-- .../system/config/BdRangeDetailsMapper.xml | 35 +- .../core/constant/msg/ConfigMsgConstants.java | 599 ++++++++---------- .../com/hzs/common/core/enums/ERangeType.java | 6 +- .../common/domain/system/base/BdNotice.java | 3 - .../domain/system/config/BdRangeDetails.java | 6 - .../system/config/ext/BdRangeDetailsExt.java | 17 +- .../domain/system/config/ext/BdRangeExt.java | 26 +- 16 files changed, 408 insertions(+), 672 deletions(-) diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeMapper.java index 29ea92d5..355bc775 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeMapper.java @@ -9,12 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 公告表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-08-09 */ public interface BdNoticeMapper extends BaseMapper { @@ -26,7 +21,6 @@ public interface BdNoticeMapper extends BaseMapper { */ List getMemberNotice(BdNoticeVO noticeVO); - /** * 查询后台公告列表信息 * @@ -35,7 +29,6 @@ public interface BdNoticeMapper extends BaseMapper { */ List getAdminNotice(BdNoticeVO noticeVO); - /** * 后台首页显示 * @@ -44,15 +37,6 @@ public interface BdNoticeMapper extends BaseMapper { */ List getAdminIndexNotice(BdNoticeVO noticeVO); - /** - * 根据 ID删除公告信息 - * - * @param notice 参数 - * @return Boolean - */ - Integer deleteNoticeById(BdNotice notice); - - /** * 会员首页显示公告 * @@ -69,7 +53,6 @@ public interface BdNoticeMapper extends BaseMapper { */ List showIndexMailNotice(BdNoticeVO noticeVO); - /** * 会员端弹窗显示 * @@ -78,7 +61,6 @@ public interface BdNoticeMapper extends BaseMapper { */ List showIndexPopScreen(BdNoticeVO noticeVO); - /** * 会员首页公告、站内信总条数 * @@ -87,7 +69,6 @@ public interface BdNoticeMapper extends BaseMapper { */ Integer showIndexNoticeCount(BdNoticeVO noticeVO); - /** * 会员首页站内信的未读条数 * @@ -112,7 +93,6 @@ public interface BdNoticeMapper extends BaseMapper { */ List selectAdminNotice(@Param("pkCountry") Integer pkCountry); - /** * 后台根据角色弹窗显示 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java index b536683b..c0f6aab6 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java @@ -13,9 +13,6 @@ import java.util.Map; /** * 公告表 服务类 - * - * @author hzs - * @since 2022-08-09 */ public interface IBdNoticeService extends IService { @@ -104,20 +101,12 @@ public interface IBdNoticeService extends IService { /** - * @description: 获取等级的翻译KEY值 - * @author: zhang jing - * @date: 2023/3/2 12:00 - * @param: [pkId, gradeMap] - * @return: java.lang.Integer + * 获取等级的翻译KEY值 **/ Integer getGradeTranslateValue(Integer pkId, Map gradeMap); /** - * @description: 获取奖衔的翻译KEY值 - * @author: zhang jing - * @date: 2023/3/2 12:00 - * @param: [pkId, awardsMap] - * @return: java.lang.Integer + * 获取奖衔的翻译KEY值 **/ Integer getAwardsTranslateValue(Integer pkId, Map awardsMap); @@ -154,7 +143,6 @@ public interface IBdNoticeService extends IService { */ Object[] selectAdminNotice(Integer pkCountry); - /** * 会员首页公告、站内信总条数 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeServiceImpl.java index 0a749390..27550ef9 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeServiceImpl.java @@ -22,7 +22,6 @@ import com.hzs.common.domain.system.ext.BdNoticeExt; import com.hzs.common.domain.system.sys.SysRole; import com.hzs.common.service.ITransactionCommonService; import com.hzs.system.base.mapper.BdNoticeMapper; -import com.hzs.system.base.service.IBdMemberNoticeService; import com.hzs.system.base.service.IBdNoticeDetailService; import com.hzs.system.base.service.IBdNoticeService; import com.hzs.system.base.vo.*; @@ -43,19 +42,16 @@ import java.util.stream.Collectors; /** * 公告表 服务实现类 - * - * @author hzs - * @since 2022-08-09 */ @Service public class BdNoticeServiceImpl extends ServiceImpl implements IBdNoticeService { @Autowired - private ISysRoleService sysRoleService; + private ISysRoleService iSysRoleService; @Autowired - private IBdGradeService gradeService; + private IBdGradeService iBdGradeService; @Autowired - private IBdAwardsService awardsService; + private IBdAwardsService iBdAwardsService; @Autowired private IBdNoticeDetailService iBdNoticeDetailService; @Autowired @@ -64,7 +60,7 @@ public class BdNoticeServiceImpl extends ServiceImpl i private RabbitTemplate rabbitTemplate; @DubboReference - IApprovalServiceApi approvalServiceApi; + IApprovalServiceApi iApprovalServiceApi; @Override @Transactional(rollbackFor = Exception.class) @@ -93,7 +89,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i return result; } - @Override @Transactional(rollbackFor = Exception.class) public Boolean adminSaveNotice(NoticePetitionVO noticePetitionVO) { @@ -127,7 +122,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i return submitApproval(noticePetitionVO, batchCode); } - /** * 公告、站内信 操作日志 * @@ -166,7 +160,7 @@ public class BdNoticeServiceImpl extends ServiceImpl i .signType(ESignType.getEnumByValue(noticePetitionVO.getSignType())).userIdList(noticePetitionVO.getUserIdList()) .sendIdList(noticePetitionVO.getSendIdList()) .remark(noticePetitionVO.getRemark()).build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, noticeVO.getLoginUser()); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, noticeVO.getLoginUser()); if (!submit.isSuccess()) { throw new RuntimeException(submit.getMsg()); } else { @@ -200,9 +194,9 @@ public class BdNoticeServiceImpl extends ServiceImpl i if (CollUtil.isNotEmpty(noticeList)) { // 查询等级、奖衔列表 - List gradeList = gradeService.selectGradeAll(noticeVO.getPkCountry()); + List gradeList = iBdGradeService.selectGradeAll(noticeVO.getPkCountry()); Map gradeMap = gradeList.stream().collect(Collectors.toMap(BdGrade::getPkId, val -> val)); - List awardsList = awardsService.getBdAwards(noticeVO.getPkCountry(), null); + List awardsList = iBdAwardsService.getBdAwards(noticeVO.getPkCountry(), null); Map awardsMap = awardsList.stream().collect(Collectors.toMap(BdAwards::getPkId, val -> val)); for (BdNotice notice : noticeList) { @@ -258,7 +252,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i return new Object[]{noticeList, bdNoticeVOList}; } - @Override public Object[] showIndexNotice(BdNoticeVO noticeVO) { List noticeList; @@ -271,7 +264,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i } List bdNoticeVOList = BeanUtil.copyToList(noticeList, BdNoticeVO.class); return new Object[]{noticeList, bdNoticeVOList}; - } @Override @@ -280,7 +272,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i return BeanUtil.copyToList(noticeList, BdNoticeVO.class); } - @Override public BdNoticeVO showIndexNoticeDetail(Long pkId, Integer pkCountry, Long pkMember) { BdNoticeDetail noticeDetail = iBdNoticeDetailService.selectNoticeDetailByPkNoticeId(pkId, pkMember); @@ -298,20 +289,12 @@ public class BdNoticeServiceImpl extends ServiceImpl i return changeTranslate(notice, null, null); } - @Override public BdNoticeVO showNoticeDetail(Long pkId) { BdNotice notice = baseMapper.selectById(pkId); return changeTranslate(notice, null, null); } - /** - * 获取等级的翻译KEY值 - * - * @param pkId ID - * @param gradeMap 等级map - * @return Integer - */ @Override public Integer getGradeTranslateValue(Integer pkId, Map gradeMap) { BdGrade bdGrade; @@ -321,20 +304,13 @@ public class BdNoticeServiceImpl extends ServiceImpl i return bdGrade.getPkTransaction(); } } - bdGrade = gradeService.getBdGrade(pkId); + bdGrade = iBdGradeService.getBdGrade(pkId); if (null != bdGrade) { return bdGrade.getPkTransaction(); } return 0; } - /** - * 获取奖衔的翻译KEY值 - * - * @param pkId ID - * @param awardsMap 奖衔map - * @return Integer - */ @Override public Integer getAwardsTranslateValue(Integer pkId, Map awardsMap) { BdAwards bdAwards; @@ -344,7 +320,7 @@ public class BdNoticeServiceImpl extends ServiceImpl i return bdAwards.getPkTransaction(); } } - bdAwards = awardsService.getBdAwardsOne(pkId); + bdAwards = iBdAwardsService.getBdAwardsOne(pkId); if (bdAwards != null) { return bdAwards.getPkTransaction(); } @@ -410,7 +386,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i return noticeAwardList; } - /** * 发布位置翻译 * @@ -443,7 +418,7 @@ public class BdNoticeServiceImpl extends ServiceImpl i String[] roles = role.split(","); List roleNames = new ArrayList<>(); for (String roleStr : roles) { - SysRole sysRole = sysRoleService.selectRoleById(Long.parseLong(roleStr)); + SysRole sysRole = iSysRoleService.selectRoleById(Long.parseLong(roleStr)); if (null != sysRole) { roleNames.add(sysRole.getRoleName()); } @@ -481,7 +456,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i showVO.setNoticeList(bdNoticeVOList); showVO.setMonthTime(entry.getKey()); bdNoticeAdminShowVOList.add(showVO); - } } return new Object[]{bdNoticeExtList, bdNoticeAdminShowVOList}; @@ -497,7 +471,6 @@ public class BdNoticeServiceImpl extends ServiceImpl i return baseMapper.showIndexMailCount(noticeVO); } - @Override public List selectAdminNoticeByRole(BdNoticeVO noticeVO) { return baseMapper.selectAdminNoticeByRole(noticeVO); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java index b1d68d23..b7f49887 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java @@ -15,11 +15,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 公告VO - * @Author: ljc - * @Time: 2023/2/3 11:24 - * @Classname: BdNoticeVO - * @Package_name: com.hzs.system.base.vo + * 公告VO */ @Data @Builder diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailRangeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailRangeController.java index 47983f05..ebba9731 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailRangeController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdRetailRangeController.java @@ -6,25 +6,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; 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; +import com.hzs.common.domain.system.config.BdAwards; +import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdRange; import com.hzs.common.domain.system.config.ext.BdRangeDetailsExt; import com.hzs.common.domain.system.config.ext.BdRangeExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.util.TransactionUtils; -import com.hzs.system.base.ITransactionServiceApi; -import com.hzs.system.base.service.IBdNoticeService; +import com.hzs.system.config.service.IBdAwardsService; +import com.hzs.system.config.service.IBdGradeService; import com.hzs.system.config.service.IBdRangeDetailsService; import com.hzs.system.config.service.IBdRangeService; import com.hzs.system.config.vo.RangeVo; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -35,9 +35,6 @@ import java.util.List; /** * 新零售极差配置 前端控制器 - * - * @author zhangjing - * @since 2022-09-09 */ @Slf4j @RestController @@ -45,21 +42,16 @@ import java.util.List; public class BdRetailRangeController extends BaseController { @Autowired - private IBdRangeService rangeService; + private IBdRangeService iBdRangeService; @Autowired - private IBdRangeDetailsService rangeDetailsService; + private IBdRangeDetailsService iBdRangeDetailsService; @Autowired - private IBdNoticeService noticeService; - - @DubboReference - ITransactionServiceApi iTransactionServiceApi; + private IBdGradeService iBdGradeService; + @Autowired + private IBdAwardsService iBdAwardsService; /** - * @description: 查询极差配置列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [range] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询极差配置列表 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.REPURCHASE_RANGE, method = EOperationMethod.SELECT) @GetMapping("/list") @@ -71,48 +63,47 @@ public class BdRetailRangeController extends BaseController { queryWrapper.eq(BdRange::getRangeName, range.getRangeName()); } queryWrapper.orderByDesc(BdRange::getRangeValue, BdRange::getCreationTime); - List list = rangeService.list(queryWrapper); startPage(); + List list = iBdRangeService.list(queryWrapper); + List listExt = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { for (BdRange bdRange : list) { BdRangeExt rangeExt = BeanUtil.copyProperties(bdRange, BdRangeExt.class); - BdRangeDetailsExt rangeDetailsExt = new BdRangeDetailsExt(); - rangeDetailsExt.setPkRange(bdRange.getPkId()); List rangeDetailsGradeList = new ArrayList<>(); List rangeDetailsAwardList = new ArrayList<>(); - List bdRangeDetailsList = rangeDetailsService.getBdRangeDetailsList(rangeDetailsExt); + + BdRangeDetailsExt rangeDetailsExt = new BdRangeDetailsExt(); + rangeDetailsExt.setPkRange(bdRange.getPkId()); + List bdRangeDetailsList = iBdRangeDetailsService.getBdRangeDetailsList(rangeDetailsExt); if (CollectionUtil.isNotEmpty(bdRangeDetailsList)) { for (BdRangeDetailsExt brde : bdRangeDetailsList) { if (StringUtils.isNotNull(brde.getRangeType()) && brde.getRangeType() == ERangeType.GRADE.getValue()) { - //等级key - Integer pkRegisterGrade = noticeService.getGradeTranslateValue(brde.getPkLevel(), null); - brde.setPkGrade(pkRegisterGrade); + // 等级 + BdGrade bdGrade = iBdGradeService.getBdGrade(brde.getPkLevel()); + brde.setPkGrade(bdGrade.getPkId()); + brde.setPkGradeVal(bdGrade.getGradeName()); rangeDetailsGradeList.add(brde); } if (StringUtils.isNotNull(brde.getRangeType()) && brde.getRangeType() == ERangeType.AWARDS.getValue()) { - //奖衔key - Integer pkAward = noticeService.getAwardsTranslateValue(brde.getPkLevel(), null); - brde.setPkAward(pkAward); + // 奖衔 + BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(brde.getPkLevel()); + brde.setPkAward(bdAwards.getPkId()); + brde.setPkAwardVal(bdAwards.getAwardsName()); rangeDetailsAwardList.add(brde); } } } - rangeExt.setRangeDetailsAward(rangeDetailsAwardList); rangeExt.setRangeDetailsGrade(rangeDetailsGradeList); + rangeExt.setRangeDetailsAward(rangeDetailsAwardList); listExt.add(rangeExt); } } - return getDataTable(listExt); } /** - * @description: 导出复购极差 - * @author: zhang jing - * @date: 2023/3/9 15:47 - * @param: [response, range] - * @return: void + * 导出复购极差 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.REPURCHASE_RANGE, method = EOperationMethod.EXPORT) @PostMapping("/export") @@ -124,7 +115,7 @@ public class BdRetailRangeController extends BaseController { queryWrapper.eq(BdRange::getRangeName, range.getRangeName()); } queryWrapper.orderByDesc(BdRange::getCreationTime); - List list = rangeService.list(queryWrapper); + List list = iBdRangeService.list(queryWrapper); startPage(); List listExt = new ArrayList<>(); for (BdRange bdRange : list) { @@ -133,38 +124,35 @@ public class BdRetailRangeController extends BaseController { rangeDetailsExt.setPkRange(bdRange.getPkId()); List rangeDetailsGradeList = new ArrayList<>(); List rangeDetailsAwardList = new ArrayList<>(); - List bdRangeDetailsList = rangeDetailsService.getBdRangeDetailsList(rangeDetailsExt); + List bdRangeDetailsList = iBdRangeDetailsService.getBdRangeDetailsList(rangeDetailsExt); if (CollectionUtil.isNotEmpty(bdRangeDetailsList)) { for (BdRangeDetailsExt brde : bdRangeDetailsList) { if (StringUtils.isNotNull(brde.getRangeType()) && brde.getRangeType() == ERangeType.GRADE.getValue()) { - //等级key - Integer pkRegisterGrade = noticeService.getGradeTranslateValue(brde.getPkLevel(), null); - brde.setPkGrade(pkRegisterGrade); + // 等级 + BdGrade bdGrade = iBdGradeService.getBdGrade(brde.getPkLevel()); + brde.setPkGrade(bdGrade.getPkId()); + brde.setPkGradeVal(bdGrade.getGradeName()); rangeDetailsGradeList.add(brde); } if (StringUtils.isNotNull(brde.getRangeType()) && brde.getRangeType() == ERangeType.AWARDS.getValue()) { - //奖衔key - Integer pkAward = noticeService.getAwardsTranslateValue(brde.getPkLevel(), null); - brde.setPkAward(pkAward); + // 奖衔 + BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(brde.getPkLevel()); + brde.setPkAward(bdAwards.getPkId()); + brde.setPkAwardVal(bdAwards.getAwardsName()); rangeDetailsAwardList.add(brde); } } } - rangeExt.setRangeDetailsAward(rangeDetailsAwardList); rangeExt.setRangeDetailsGrade(rangeDetailsGradeList); + rangeExt.setRangeDetailsAward(rangeDetailsAwardList); listExt.add(rangeExt); } ExcelUtil util = new ExcelUtil<>(BdRangeExt.class); - util.exportExcel(response, listExt, "复购极差"); + util.exportExcel(response, listExt, "复购级差"); } - /** - * @description: 新增极差配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [range] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 新增极差配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.REPURCHASE_RANGE, method = EOperationMethod.INSERT) @PostMapping("/generate") @@ -190,7 +178,7 @@ public class BdRetailRangeController extends BaseController { queryWrapper.eq(BdRange::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdRange::getRangeValue, rangeExt.getRangeValue()); queryWrapper.eq(BdRange::getSystemType, ESystemType.DEFAULT.getValue()); - List list = rangeService.list(queryWrapper); + List list = iBdRangeService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.RANGE_VALUE_REPEAT)); } @@ -200,17 +188,13 @@ public class BdRetailRangeController extends BaseController { rangeExt.setPkCreator(SecurityUtils.getUserId()); rangeExt.setCreationTime(new Date()); rangeExt.setSystemType(ESystemType.DEFAULT.getValue()); - rangeService.saveRange(rangeExt); + iBdRangeService.saveRange(rangeExt); } return AjaxResult.success(); } /** - * @description: 修改极差配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [range] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改极差配置 **/ @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.REPURCHASE_RANGE, method = EOperationMethod.UPDATE) @PostMapping("/update") @@ -231,40 +215,25 @@ public class BdRetailRangeController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PK_GRADE_AWARDS_NOT_NULL)); } - //字段翻译保存到数据库 - if (null != rangeExt.getPkTransaction()) { - R b = iTransactionServiceApi.updateTransaction(pkCountry, - rangeExt.getRangeName(), rangeExt.getPkTransaction(), true); - } else { - //字段翻译保存到数据库 - R pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.RANGE, - rangeExt.getRangeName(), EYesNo.YES, EYesNo.NO); - rangeExt.setPkTransaction(pkTransaction.getData()); - } rangeExt.setPkModified(SecurityUtils.getUserId()); rangeExt.setPkCountry(pkCountry); rangeExt.setModifiedTime(new Date()); - return toAjax(rangeService.updateRange(rangeExt)); + return toAjax(iBdRangeService.updateRange(rangeExt)); } - /** - * @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.REPURCHASE_RANGE, method = EOperationMethod.SELECT) @GetMapping("/getOne/{pkId}") public AjaxResult getOne(@PathVariable Long pkId) { - BdRange range = rangeService.getById(pkId); + BdRange range = iBdRangeService.getById(pkId); BdRangeExt rangeExt = BeanUtil.copyProperties(range, BdRangeExt.class); BdRangeDetailsExt rangeDetailsExt = new BdRangeDetailsExt(); List gradeList = new ArrayList<>(); List awardsList = new ArrayList<>(); rangeDetailsExt.setPkRange(pkId.intValue()); - List bdRangeDetailsList = rangeDetailsService.getBdRangeDetailsList(rangeDetailsExt); + List bdRangeDetailsList = iBdRangeDetailsService.getBdRangeDetailsList(rangeDetailsExt); if (CollectionUtil.isNotEmpty(bdRangeDetailsList)) { for (BdRangeDetailsExt bdRangeDetailsExt : bdRangeDetailsList) { if (StringUtils.isNotNull(bdRangeDetailsExt.getRangeType()) && ERangeType.GRADE.getValue() == bdRangeDetailsExt.getRangeType()) { @@ -281,13 +250,8 @@ public class BdRetailRangeController extends BaseController { return AjaxResult.success(rangeExt); } - /** - * @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.REPURCHASE_RANGE, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") @@ -297,12 +261,8 @@ public class BdRetailRangeController extends BaseController { updateWrapper.set(BdRange::getDelFlag, EDelFlag.DELETE.getValue()); updateWrapper.set(BdRange::getPkModified, SecurityUtils.getUserId()); updateWrapper.set(BdRange::getModifiedTime, new Date()); - BdRange bdRange = rangeService.getById(pkId); - //删除翻译 - List pkIdList = new ArrayList<>(); - pkIdList.add(bdRange.getPkTransaction().longValue()); - R b = iTransactionServiceApi.removeTransactionByPkId(pkIdList); - return toAjax(rangeService.update(updateWrapper)); + BdRange bdRange = iBdRangeService.getById(pkId); + return toAjax(iBdRangeService.update(updateWrapper)); } /** @@ -317,11 +277,12 @@ public class BdRetailRangeController extends BaseController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdRange::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdRange::getSystemType, ESystemType.DEFAULT.getValue()); - for (BdRange range : rangeService.list(queryWrapper)) { + for (BdRange range : iBdRangeService.list(queryWrapper)) { RangeVo rangeVo = BeanUtil.copyProperties(range, RangeVo.class); rangeVo.setPkRange(range.getPkId()); resultList.add(rangeVo); } return AjaxResult.success(resultList); } + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeDetailsMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeDetailsMapper.java index a2f6f681..122d34d2 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeDetailsMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeDetailsMapper.java @@ -1,6 +1,5 @@ package com.hzs.system.config.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdRangeDetails; import com.hzs.common.domain.system.config.ext.BdRangeDetailsExt; @@ -8,21 +7,12 @@ import com.hzs.common.domain.system.config.ext.BdRangeDetailsExt; import java.util.List; /** - *

* 极差详细表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-10-28 */ public interface BdRangeDetailsMapper extends BaseMapper { /** - * @description: 查询极差详情 - * @author: zhang jing - * @date: 2022/10/28 11:34 - * @param: [rangeDetailsExt] - * @return: java.util.List + * 查询极差详情 **/ List getBdRangeDetailsList(BdRangeDetailsExt rangeDetailsExt); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeDetailsService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeDetailsService.java index 488e2825..2f45284f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeDetailsService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeDetailsService.java @@ -1,6 +1,5 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdRangeDetails; import com.hzs.common.domain.system.config.ext.BdRangeDetailsExt; @@ -8,20 +7,13 @@ import com.hzs.common.domain.system.config.ext.BdRangeDetailsExt; import java.util.List; /** - *

* 极差详细表 服务类 - *

- * - * @author hzs - * @since 2022-10-28 */ public interface IBdRangeDetailsService extends IService { + /** - * @description: 查询极差详情 - * @author: zhang jing - * @date: 2022/10/28 11:36 - * @param: [rangeDetailsExt] - * @return: java.util.List + * 查询极差详情 **/ List getBdRangeDetailsList(BdRangeDetailsExt rangeDetailsExt); + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeDetailsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeDetailsServiceImpl.java index 2714815b..18d2f128 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeDetailsServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeDetailsServiceImpl.java @@ -10,25 +10,14 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 极差详细表 服务实现类 - *

- * - * @author hzs - * @since 2022-10-28 */ @Service public class BdRangeDetailsServiceImpl extends ServiceImpl implements IBdRangeDetailsService { - /** - * @description: 查询极差详情 - * @author: zhang jing - * @date: 2022/10/28 11:35 - * @param: [rangeDetailsExt] - * @return: java.util.List - **/ @Override public List getBdRangeDetailsList(BdRangeDetailsExt rangeDetailsExt) { return baseMapper.getBdRangeDetailsList(rangeDetailsExt); } + } diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml index 2e64843b..f1b04794 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml @@ -78,11 +78,12 @@ order by t.creation_time desc + t.del_flag = 0 and t.mail_type = 1 - and t.system_type in (#{systemType}, 9) + and t.system_type in (#{systemType}, 9) and t.pk_country = #{pkCountry} @@ -130,6 +131,7 @@ + - - update bd_notice n - set n.del_flag = 1, - PK_MODIFIED=#{pkModified}, - MODIFIED_TIME = sysdate - where PK_ID = #{pkId} - - - select * - from (select n.pk_id pkId, - n.title, - n.content, - n.creation_time creationTime, - nvl(d.read_state, 1) readState - from bd_notice n - left join bd_notice_detail d - on n.pk_id = d.pk_notice - and d.pk_member = #{pkMember} - and d.del_flag = 0 - where n.del_flag = 0 - and n.mail_type = 1 - and n.approve_state = 2 - and n.pk_country = #{pkCountry} - and n.function_type = 2 - and n.website_type = 1 - and sysdate >= n.start_time - and sysdate <= n.end_time - - and n.system_type in - - #{item} - - - union all - select n.pk_id pkId, - n.title, - n.content, - n.creation_time creationTime, - nvl(d.read_state, 1) readState - from bd_notice n - inner join bd_member_notice mn - on n.pk_id = mn.pk_notice - and mn.pk_member = #{pkMember} - left join bd_notice_detail d - on n.pk_id = d.pk_notice - and d.pk_member = #{pkMember} - and d.del_flag = 0 - where n.del_flag = 0 - and n.mail_type = 2 - and n.approve_state = 2 - and n.pk_country = #{pkCountry} - and n.function_type = 2 - and n.website_type = 1 - and sysdate >= n.start_time - and sysdate <= n.end_time - - and n.system_type in - - #{item} - - - ) + from (select n.pk_id pkId, + n.title, + n.content, + n.creation_time creationTime, + nvl(d.read_state, 1) readState + from bd_notice n + left join bd_notice_detail d + on n.pk_id = d.pk_notice + and d.pk_member = #{pkMember} + and d.del_flag = 0 + where n.del_flag = 0 + and n.mail_type = 1 + and n.approve_state = 2 + and n.pk_country = #{pkCountry} + and n.function_type = 2 + and n.website_type = 1 + and sysdate >= n.start_time + and sysdate <= n.end_time + + and n.system_type in + + #{item} + + + union all + select n.pk_id pkId, + n.title, + n.content, + n.creation_time creationTime, + nvl(d.read_state, 1) readState + from bd_notice n + inner join bd_member_notice mn + on n.pk_id = mn.pk_notice + and mn.pk_member = #{pkMember} + left join bd_notice_detail d + on n.pk_id = d.pk_notice + and d.pk_member = #{pkMember} + and d.del_flag = 0 + where n.del_flag = 0 + and n.mail_type = 2 + and n.approve_state = 2 + and n.pk_country = #{pkCountry} + and n.function_type = 2 + and n.website_type = 1 + and sysdate >= n.start_time + and sysdate <= n.end_time + + and n.system_type in + + #{item} + + + ) order by creationTime desc diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdRangeDetailsMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdRangeDetailsMapper.xml index 11f9b951..c2432e6a 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdRangeDetailsMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdRangeDetailsMapper.xml @@ -4,28 +4,17 @@ - - - - - - - - - + + + + + + + + + - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_RANGE, PK_LEVEL - - 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..5193ff2f 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,123 @@ 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 REPURCHASE_RATIO_NOT_NULL = "复购拓展比例不能为空"; /** * 小区考核不能为空 -- 小区考核起不能为空 */ -public static final String COMMUNITY_CHECK_NOT_NULL = "小区考核起不能为空"; + public static final String COMMUNITY_CHECK_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 PURCHASE_CHECK_NOT_NULL = "复购考核不能为空"; /** * 分红考核不能为空 -- 分红考核不能为空 */ -public static final String SHARE_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 AWARDS_NAME_NOT_NULL = "真实奖衔不能为空"; /** * 左右区奖衔不能为空 -- 左右区奖衔不能为空 */ -public static final String LEFT_RIGHT_AWARDS_NAME_NOT_NULL = "左右区奖衔不能为空"; + public static final String LEFT_RIGHT_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 = "拓展次数不能为空"; + 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 BONUS_EXPANDS_NOT_NULL = "4-N配置不能为空"; /** * 区代名称不能为空 -- 区代名称不能为空 */ -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 +399,324 @@ 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 HO_CONTENT_NOT_NULL = "内容不能为空"; + public static final String PROTOCOL_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_PKCOUNTRY_NOT_NULL = "国家不能为空"; + public static final String HO_REGION_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_CONTACTS_NOT_NULL = "联系人不能为空"; - /** - * 联系方式不能为空 -- 联系方式不能为空 - */ -public static final String HO_PHONE_NOT_NULL = "联系方式不能为空"; /** * 详细地址不能为空 -- 详细地址不能为空 */ -public static final String HO_ADDRESS_NOT_NULL = "详细地址不能为空"; - - /** - * 链接不能为空 -- 详细地址不能为空 - */ -public static final String HO_LINK_ADDRESS_NOT_NULL = "链接不能为空"; + public static final String HO_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 TITLE_NAME_NOT_NULL = "标题名称不能为空"; - /** - * 副标题名称不能为空 -- 副标题名称不能为空 - */ -public static final String TWO_TITLE_NAME_NOT_NULL = "副标题名称不能为空"; + public static final String HO_OBJECT_NOT_REPEAT = "数据不存在"; /** * 主键不能为空 -- 主键不能为空 */ -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 VIDEO_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_PRODUCT_NOT_NULL = "产品不能为空"; + public static final String PK_PRODUCT_NOT_NULL = "产品不能为空"; /** * 可提数量需大于0 -- 可提数量需大于0 */ @@ -791,362 +736,346 @@ 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 AWARDS_CONTROL_SAVE_REPEAT = "添加真实奖衔控制重复"; - /** - * 添加真实奖衔控制发起签呈失败 -- 添加真实奖衔控制发起签呈失败 - */ -public static final String AWARDS_CONTROL_SAVE_PETITION = "添加真实奖衔控制发起签呈失败"; - /** - * 修改真实奖衔控制发起签呈失败 -- 修改真实奖衔控制发起签呈失败 - */ -public static final String AWARDS_CONTROL_MODIFY_PETITION = "修改真实奖衔控制发起签呈失败"; - /** - * 删除真实奖衔控制发起签呈失败 -- 删除真实奖衔控制发起签呈失败 - */ -public static final String AWARDS_CONTROL_DELETE_PETITION = "删除真实奖衔控制发起签呈失败"; + public static final String MEMBER_ACHIEVE_DEDUCT_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 = "变更后注水业绩不能为空"; + 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 FOUR_N_DISPOSE = "4-N配置"; /** * 签呈文件类型不能为空 -- 签呈文件类型不能为空 */ -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 +1085,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 +1141,33 @@ 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 AWARDS_CONTROL_IS_REFUND = "真实奖衔控制驳回签呈退费失败"; + public static final String FREE_ASSESSMENT_STATE_INVALID = "修改免考状态无效"; /** * 注水业绩扣款失败 -- 注水业绩驳回签呈退款失败 */ -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 +1179,16 @@ 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 REAL_NAME_AUTHENTICATION_REPEAT = "会员实名认证重复"; /** * 小区考核不能为空 -- 小区考核止不能为空 */ -public static final String COMMUNITY_CHECK_END_NOT_NULL = "小区考核止不能为空"; + public static final String COMMUNITY_CHECK_END_NOT_NULL = "小区考核止不能为空"; /** * 会员已存在 -- 会员已存在 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERangeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERangeType.java index c449cad4..13ede5a2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERangeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERangeType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @author: sui q - * @time: 2022/8/27 10:35 - * @description: 极差类型枚举 - * @classname: ERangeType - * @package_name: com.hzs.common.core.enums + * 极差类型枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNotice.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNotice.java index 4abed85a..8002f46f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNotice.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNotice.java @@ -13,9 +13,6 @@ import java.util.Date; /** * 公告表 - * - * @author hzs - * @since 2023-02-03 */ @Data @Builder diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRangeDetails.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRangeDetails.java index 55d16690..c4a6490a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRangeDetails.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRangeDetails.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 极差详细表 - *

- * - * @author hzs - * @since 2022-10-28 */ @Data @EqualsAndHashCode(callSuper = true) @@ -51,5 +46,4 @@ public class BdRangeDetails extends BaseEntity { private Integer rangeType; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeDetailsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeDetailsExt.java index 4213a6a9..70495fa4 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeDetailsExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeDetailsExt.java @@ -1,23 +1,11 @@ package com.hzs.common.domain.system.config.ext; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseEntity; import com.hzs.common.domain.system.config.BdRangeDetails; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; /** - *

* 极差详细表 - *

- * - * @author hzs - * @since 2022-10-28 */ @EqualsAndHashCode(callSuper = true) @Data @@ -30,14 +18,13 @@ public class BdRangeDetailsExt extends BdRangeDetails { */ private String rangeTypeVal; - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) private Integer pkGrade; - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAward; /** * 等级翻译 */ private String pkGradeVal; + + private Integer pkAward; /** * 奖衔翻译 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeExt.java index 9bd829ca..d5aac1a6 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdRangeExt.java @@ -1,27 +1,14 @@ 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.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.web.domain.BaseEntity; import com.hzs.common.domain.system.config.BdRange; -import com.hzs.common.domain.system.config.BdRangeDetails; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import java.util.List; /** - *

* 极差配置 - *

- * - * @author zhangjing - * @since 2022-09-09 */ @EqualsAndHashCode(callSuper = true) @Data @@ -32,22 +19,21 @@ public class BdRangeExt extends BdRange { /** * 等级极差详情集合 */ - @Transaction private List rangeDetailsGrade; - @Excel(name = "等级",sort=2) - private String rangeDetailsGradeVal; - /** * 奖衔极差详情集合 */ - @Transaction private List rangeDetailsAward; - private List rangeDetails; - @Excel(name = "奖衔",sort=3) + @Excel(name = "等级", sort = 2) + private String rangeDetailsGradeVal; + + @Excel(name = "奖衔", sort = 3) private String rangeDetailsAwardVal; + private List rangeDetails; + /** * 等级集合 */